[Svn-src-all:2765] [version-2_12-dev 21664] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin @ mail.ec-cube.net
2012年 3月 20日 (火) 01:48:10 JST
Subversion committed to /home/svn/open 21664
http://svn.ec-cube.net/open_trac/changeset/21664
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-20 01:48:10 +0900 (火, 20 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正,A:追加,D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/class/SC_Display.php
U branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
変更: branches/version-2_12-dev/data/class/SC_Display.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_Display.php 2012-03-19 16:42:36 UTC (rev 21663)
+++ branches/version-2_12-dev/data/class/SC_Display.php 2012-03-19 16:48:10 UTC (rev 21664)
@@ -103,11 +103,11 @@
switch ($device) {
case DEVICE_TYPE_MOBILE:
- if (USE_MOBILE === false) {
- exit;
+ if (USE_MOBILE === false) {
+ exit;
}
- $this->response->setContentType('text/html');
- $this->setView(new SC_MobileView_Ex());
+ $this->response->setContentType('text/html');
+ $this->setView(new SC_MobileView_Ex());
break;
case DEVICE_TYPE_SMARTPHONE:
$this->setView(new SC_SmartphoneView_Ex());
変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php 2012-03-19 16:42:36 UTC (rev 21663)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php 2012-03-19 16:48:10 UTC (rev 21664)
@@ -574,7 +574,7 @@
* @return array 支払方法詳細の配列
*/
function getPaymentsByPaymentsId($payment_id) {
- $objQuery =& SC_Query_Ex::getSingletonInstance();
+ $objQuery =& SC_Query_Ex::getSingletonInstance();
$where = 'payment_id = ? AND del_flg = 0';
$arrValues = array($payment_id);
return $objQuery->getRow('*', 'dtb_payment', $where, $arrValues);
変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2012-03-19 16:42:36 UTC (rev 21663)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2012-03-19 16:48:10 UTC (rev 21664)
@@ -316,7 +316,7 @@
* @return array 入力チェック結果の配列
*/
function lfCheckError(&$objFormParam, $subtotal, $max_point) {
- $objPurchase = new SC_Helper_Purchase_Ex();
+ $objPurchase = new SC_Helper_Purchase_Ex();
// 入力データを渡す。
$arrForm = $objFormParam->getHashArray();
$objErr = new SC_CheckError_Ex($arrForm);
@@ -339,12 +339,11 @@
if (($arrForm['use_point'] * POINT_VALUE) > $subtotal) {
$objErr->arrErr['use_point'] = '※ ご利用ポイントがご購入金額を超えています。<br>';
}
- // ポイント差し引き後の決済方法チェック
- $arrPayments = $objPurchase->getPaymentsByPaymentsId($arrForm['payment_id']);
- if ($arrPayments['rule'] > $subtotal - $arrForm['use_point'] * POINT_VALUE){
+ // ポイント差し引き後の決済方法チェック
+ $arrPayments = $objPurchase->getPaymentsByPaymentsId($arrForm['payment_id']);
+ if ($arrPayments['rule'] > $subtotal - $arrForm['use_point'] * POINT_VALUE) {
$objErr->arrErr['use_point'] = '※ 選択した支払方法では、ポイントは'.($subtotal - $arrPayments['rule']).'ポイントまでご利用いただけます。<br>';
}
-
}
return $objErr->arrErr;
}
Svn-src-all メーリングリストの案内