Changeset 18044 for branches/comu-ver2/data/class/helper/SC_Helper_DB.php

Timestamp:

2009/06/04 18:24:24 (14 years ago)

Author:

Seasoft

Message:

merge r17785
・取得元: version-2_4
・一部のロジックは改訂を行う
【取得元のログメッセージ】

• EC-CUBE2.4改修 #376

File:

• branches/comu-ver2/data/class/helper/SC_Helper_DB.php (modified) (4 diffs)

branches/comu-ver2/data/class/helper/SC_Helper_DB.php

@@ -398 +398 @@
         $objPage->tpl_total_tax = $objCartSess->getAllProductsTax($arrInfo);
         // 全商品合計ポイント
-        $objPage->tpl_total_point = $objCartSess->getAllProductsPoint();
+        if (USE_POINT !== false) {
+            $objPage->tpl_total_point = $objCartSess->getAllProductsPoint();
+        }
 
         return $objPage;
@@ -1488 +1490 @@
         if (!isset($arrData['charge'])) $arrData['charge'] = "";
         if (!isset($arrData['use_point'])) $arrData['use_point'] = "";
+        if (!isset($arrData['add_point'])) $arrData['add_point'] = 0;
 
         // 税金の取得
@@ -1534 +1537 @@
         $arrData['payment_total'] = $arrData['total'] - ($arrData['use_point'] * POINT_VALUE);
         // 加算ポイントの計算
-        $arrData['add_point'] = SC_Utils::sfGetAddPoint($objPage->tpl_total_point, $arrData['use_point'], $arrInfo);
-            
+        if (USE_POINT !== false) {
+            $arrData['add_point'] = SC_Utils::sfGetAddPoint($objPage->tpl_total_point, $arrData['use_point'], $arrInfo);
+                
             if($objCustomer != "") {
                 // 誕生日月であった場合
@@ -1541 +1545 @@
                     $arrData['birth_point'] = BIRTH_MONTH_POINT;
                     $arrData['add_point'] += $arrData['birth_point'];
+                }
             }
         }