Changeset 22976 for branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php

Timestamp:

2013/07/20 16:19:43 (11 years ago)

Author:

AMUAMU

Message:

#1730 (税率変更に対応できない)
#2191　(税率対応に向けて、税率管理画面を作成する)
#2235 (越境ECを想定した機能の追加)
関係の修正一部

File:

• branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php (modified) (3 diffs)

branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php

@@ -34 +34 @@
 class SC_Helper_Purchase
 {
+
     var $arrShippingKey = array(
         'name01', 'name02', 'kana01', 'kana02',
-        'sex', 'zip01', 'zip02', 'country_id','pref', 'addr01', 'addr02',
+        'sex', 'zip01', 'zip02', 'country_id', 'zipcode', 'pref', 'addr01', 'addr02',
         'tel01', 'tel02', 'tel03', 'fax01', 'fax02', 'fax03',
     );
@@ -771 +772 @@
 
         // 詳細情報を取得
-        $cartItems = $objCartSession->getCartList($cartKey);
+        $cartItems = $objCartSession->getCartList($cartKey, $orderParams['order_pref'], $orderParams['order_country_id']);
 
         // 詳細情報を生成
@@ -789 +790 @@
             $arrDetail[$i]['price'] = $item['price'];
             $arrDetail[$i]['quantity'] = $item['quantity'];
-            $arrDetail[$i]['tax_rate'] = $orderParams['order_tax_rate'];
-            $arrDetail[$i]['tax_rule'] = $orderParams['order_tax_rule'];
+            $arrDetail[$i]['tax_rate'] = $item['tax_rate'];
+            $arrDetail[$i]['tax_rule'] = $item['tax_rule'];
+            $arrDetail[$i]['tax_adjuts'] = $item['tax_adjust'];
 
             // 在庫の減少処理