Changeset 22736 for branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

Timestamp:

2013/03/15 19:12:17 (11 years ago)

Author:

h_yoshimoto

Message:

#2193 税率チームのコミットをマージ(from camp/camp-2_13-tax)

Location:

branches/version-2_13-dev

Files:

• . (modified) (1 prop)
• data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (modified) (3 diffs)

branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

@@ -343 +343 @@
             $objFormParam->addParam(NORMAL_PRICE_TITLE, 'price01', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
             $objFormParam->addParam(SALE_PRICE_TITLE, 'price02', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
+            $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
             $objFormParam->addParam('在庫数', 'stock', AMOUNT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
             $objFormParam->addParam('在庫無制限', 'stock_unlimited', INT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -609 +610 @@
             $arrForm['product_type_id'] = DEFAULT_PRODUCT_DOWN;
         }
+        // 編集の場合は設定された税率、新規の場合はデフォルトの税率を取得
+        if ($arrForm['product_id'] == '') {
+            $arrRet = SC_Helper_TaxRule_Ex::getTaxRule();
+        } else {
+            $arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrForm['product_id'], $arrForm['product_class_id']);
+        }
+        $arrForm['tax_rate'] = $arrRet['tax_rate'];
         // アップロードファイル情報取得(Hidden用)
         $arrHidden = $objUpFile->getHiddenFileList();
@@ -1133 +1141 @@
         $objProduct = new SC_Product_Ex();
         $objProduct->setProductStatus($product_id, $arrList['product_status']);
+        
+        // 税情報設定
+        SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'], $arrList['product_id'], $arrList['product_class_id']);
 
         // 関連商品登録