Changeset 23026 for branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php

Timestamp:

2013/08/05 06:22:14 (8 years ago)

Author:

AMUAMU

Message:

#2323 (税率対応)
#2235 (越境ECを想定した機能の追加)
#2234 (非会員お客様情報入力テンプレートと機能の共通化)
#2324 (会員登録、注文フォームに「会社名」フィールドを足す)
#2233 (購入手続きのログイン画面でログイン出来ないユーザーがいる)
などの修正

File:

• branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php (modified) (2 diffs)

branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php

@@ -48 +48 @@
         $this->arrMAILTEMPLATE  = $masterData->getMasterData('mtb_mail_template');
         $this->arrPref          = $masterData->getMasterData('mtb_pref');
+        $this->arrCountry       = $masterData->getMasterData('mtb_country');
         $this->arrWDAY          = $masterData->getMasterData('mtb_wday');
         $this->arrProductType   = $masterData->getMasterData('mtb_product_type');
@@ -98 +99 @@
             //必要なのは商品の販売金額のみなので、遅い場合は、別途SQL作成した方が良い
             $arrTempProductDetail = $objProduct->getProductsClass($arrOrderProductDetail['product_class_id']);
-            if($this->tpl_arrOrderDetail[$product_index]['price'] != $arrTempProductDetail['price02']) {
+            // 税計算
+            $this->tpl_arrOrderDetail[$product_index]['price_inctax'] = $this->tpl_arrOrderDetail[$product_index]['price']  +
+                SC_Helper_TaxRule_Ex::calcTax (
+                    $this->tpl_arrOrderDetail[$product_index]['price'],
+                    $this->tpl_arrOrderDetail[$product_index]['tax_rate'],
+                    $this->tpl_arrOrderDetail[$product_index]['tax_rule']
+                    );
+            $arrTempProductDetail['price02_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax(
+                    $arrTempProductDetail['price02'],
+                    $arrTempProductDetail['product_id'],
+                    $arrTempProductDetail['product_class_id']
+                    );
+            if($this->tpl_arrOrderDetail[$product_index]['price_inctax'] != $arrTempProductDetail['price02_inctax']) {
                 $this->is_price_change = true;
             }
-            $this->tpl_arrOrderDetail[$product_index]['product_price'] = ($arrTempProductDetail['price02'])?$arrTempProductDetail['price02']:0;
+            $this->tpl_arrOrderDetail[$product_index]['product_price_inctax'] = ($arrTempProductDetail['price02_inctax']) ? $arrTempProductDetail['price02_inctax'] : 0 ;
         }