Changeset 20816

Timestamp:

2011/04/05 23:21:03 (11 years ago)

Author:

shutta

Message:

refs #1235 (「現在のカゴの中」ページで送料無料条件未満なのに送料無料と表示されている)
「かごの中」ブロックの送料無料の判別が他のページの判別と異なっていたのを修正。
(送料無料購入数量[DELIV_FREE_AMOUNT]を無視していた。)

File:

• branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (modified) (1 diff)

branches/version-2_11-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php

@@ -101 +101 @@
             // 合計数量
             $total_quantity += $objCart->getTotalQuantity($cart_key);
+
+            // 送料無料チェック
+            if (!$this->isMultiple && !$this->hasDownload) {
+                $is_deliv_free = $objCart->isDelivFree($cart_key);
+            }
         }
+
+        $arrCartList[0]['ProductsTotal'] = $products_total;
+        $arrCartList[0]['TotalQuantity'] = $total_quantity;
 
         // 店舗情報の取得
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
+        $arrCartList[0]['free_rule'] = $arrInfo['free_rule'];
 
         // 送料無料までの金額
-        $arrCartList[0]['ProductsTotal'] = $products_total;
-        $arrCartList[0]['TotalQuantity'] = $total_quantity;
-
-        $deliv_free = $arrInfo['free_rule'] - $products_total;
-        $arrCartList[0]['free_rule'] = $arrInfo['free_rule'];
-        $arrCartList[0]['deliv_free'] = $deliv_free;
+        if ($is_deliv_free) {
+            $arrCartList[0]['deliv_free'] = 0;
+        } else {
+            $deliv_free = $arrInfo['free_rule'] - $products_total;
+            $arrCartList[0]['deliv_free'] = $deliv_free;
+        }
 
         return $arrCartList;