Changeset 22702

Timestamp:

2013/03/10 10:26:06 (11 years ago)

Author:

AMUAMU

Message:

税設定選択ルーチンを修正

File:

• branches/camp/camp-2_13-tax/data/class/helper/SC_Helper_TaxRule.php (modified) (4 diffs)

branches/camp/camp-2_13-tax/data/class/helper/SC_Helper_TaxRule.php

@@ -123 +123 @@
     function getTaxRule ($product_id = 0, $product_class_id = 0, $pref_id = 0, $country_id = 0)
     {
+        // 初期化
+        $product_id = $product_id > 0 ? $product_id : 0;
+        $product_class_id = $product_class_id > 0 ? $product_class_id : 0;
+        $pref_id = $pref_id > 0 ? $pref_id : 0;
+        $country_id = $country_id > 0 ? $country_id : 0;
+
+        $objCustomer = new SC_Customer_Ex();
+        if ($objCustomer->isLoginSuccess(true)) {
+            if ($country_id == 0) {
+                $objCustomer->getValue('country_id');
+            }
+            if ($pref_id == 0) {
+                $objCustomer->getValue('pref');
+            }
+        }
+
         // リクエストの配列化
         $arrRequest = array('product_id' => $product_id,
@@ -144 +160 @@
             $table = 'dtb_tax_rule';
             $cols = '*, CASE WHEN apply_date IS NULL THEN 1 ELSE 0 END as nullorder';
-            $where = '(product_id = 0 OR product_id = ?)'
-                        . ' AND (product_class_id = 0 OR product_class_id = ?)'
+            $where = '((product_id = 0 OR product_id = ?)'
+                        . ' OR (product_class_id = 0 OR product_class_id = ?))'
                         . ' AND (pref_id = 0 OR pref_id = ?)'
                         . ' AND (country_id = 0 OR country_id = ?)'
@@ -183 +199 @@
         }
 
-        GC_Utils_Ex::gfDebugLog('tax_key=' . $cache_key . ' result_tax=' . print_r($data_c[$cache_key],true));
+        GC_Utils_Ex::gfPrintLog('tax_key=' . $cache_key . ' result_tax=' . print_r($data_c[$cache_key],true));
         return $data_c[$cache_key];
     }
@@ -208 +224 @@
             // 税情報を設定
             SC_Helper_TaxRule_Ex::setTaxRule($calc_rule, $tax_rate, $apply_date, $tax_rule_id=NULL, $tax_adjust=0, $product_id, $product_class_id, $pref_id, $country_id);
-    
+
         }
     }