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

Timestamp:

2013/01/09 12:42:43 (14 years ago)

Author:

kim

Message:

#1730 r22197 を r22215 で差し戻したものを、逆マージ。

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();
-
-        return SC_Utils_Ex::sfCalcIncTax($price, $CONF['tax'], $CONF['tax_rule']);
+        $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);
     }