Changeset 23394

Timestamp:

2014/05/03 15:19:51 (10 years ago)

Author:

kimoto

Message:

#2430 sfGetBasisDataをgetTaxRuleに変更
sfGetBasisDataに税関係は含まれなくなっているので要注意

File:

• branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (3 diffs)

branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -121 +121 @@
         $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList();
 
-        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
-
         $this->httpCacheControl('nocache');
     }
@@ -1228 +1226 @@
         if (!$arrProductClassIds || !in_array($insert_product_class_id, $arrProductClassIds)) {
             $arrAddProducts = array();
+            $arrTax = SC_Helper_TaxRule_Ex::getTaxRule(0, $insert_product_class_id);
 
             $arrAddProductInfo['product_name'] = ($arrAddProductInfo['product_name'])
@@ -1239 +1238 @@
             $arrAddProductInfo['quantity'] = 1;
             $arrAddProductInfo['tax_rate'] = ($objFormParam->getValue('order_tax_rate') == '')
-                ? $this->arrInfo['tax']
+                ? $arrTax['tax_rate']
                 : $objFormParam->getValue('order_tax_rate');
 
             $arrAddProductInfo['tax_rule'] = ($objFormParam->getValue('order_tax_rule') == '')
-                ? $this->arrInfo['tax_rule']
+                ? $arrTax['tax_rule']
                 : $objFormParam->getValue('order_tax_rule');