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

Timestamp:

2013/09/19 11:49:03 (11 years ago)

Author:

m_uehara

Message:

#2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ

File:

• branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (modified) (4 diffs)

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

@@ -199 +199 @@
         $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('NUM_CHECK', 'MAX_LENGTH_CHECK'));
-        $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        if(OPTION_PRODUCT_TAX_RULE) {
+            $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+        }
         $objFormParam->addParam('商品種別', 'product_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('削除フラグ', 'del_flg', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -279 +281 @@
 
             // 税情報登録/更新
-            SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'][$i], $arrPC['product_id'], $arrPC['product_class_id']);
+            if (OPTION_PRODUCT_TAX_RULE) {
+                SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'][$i], $arrPC['product_id'], $arrPC['product_class_id']);
+            }
         }
 
@@ -350 +354 @@
                  * 消費税率の必須チェック
                  */
-                if (SC_Utils_Ex::isBlank($arrValues['tax_rate'][$i])) {
+                if (OPTION_PRODUCT_TAX_RULE && SC_Utils_Ex::isBlank($arrValues['tax_rate'][$i])) {
                     $arrErr['tax_rate'][$i] = '※ 消費税率が入力されていません。<br />';
                 }
@@ -498 +502 @@
                     $arrValues['del_flg'] = '0';
                 }
+
                 // 消費税率を設定
-                $arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrValues['product_id'], $arrValues['product_class_id']);
-                $arrValues['tax_rate'] = $arrRet['tax_rate'];
+                if (OPTION_PRODUCT_TAX_RULE) {
+                    $arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrValues['product_id'], $arrValues['product_class_id']);
+                    $arrValues['tax_rate'] = $arrRet['tax_rate'];
+                }
 
                 $arrMergeProductsClass[] = $arrValues;