Changeset 22215 for branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php

Timestamp:

2013/01/08 21:31:00 (11 years ago)

Author:

h_yoshimoto

Message:

#1730 税率変更対応の差し戻し

File:

• branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php (modified) (1 diff)

branches/version-2_12-dev/data/class/helper/SC_Helper_DB.php

@@ -1410 +1410 @@
         // 店舗基本情報を取得
         $CONF = SC_Helper_DB_Ex::sfGetBasisData();
-        $tax      = $tax      === null ? $CONF['tax']      : $tax;
-        $tax_rule = $tax_rule === null ? $CONF['tax_rule'] : $tax_rule;
-
-        return SC_Utils_Ex::sfCalcIncTax($price, $tax, $tax_rule);
+
+        return SC_Utils_Ex::sfCalcIncTax($price, $CONF['tax'], $CONF['tax_rule']);
     }