Changeset 22484

Timestamp:

2013/01/30 20:14:31 (11 years ago)

Author:

Seasoft

Message:

#2091 (拡張クラスを使っていない)

Location:

branches/version-2_12-dev

Files:

• data/class/SC_Product.php (modified) (2 diffs)
• tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php (modified) (1 diff)
• tests/class/SC_Product/SC_Product_getDetailTest.php (modified) (1 diff)
• tests/class/SC_Product/SC_Product_getListByProductIdsTest.php (modified) (1 diff)

branches/version-2_12-dev/data/class/SC_Product.php

@@ -554 +554 @@
             $arrProducts[$key]['price02_max_format'] = number_format($arrProducts[$key]['price02_max']);
 
-            $arrProducts[$key]['price01_min_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price01_min']);
-            $arrProducts[$key]['price01_max_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price01_max']);
-            $arrProducts[$key]['price02_min_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price02_min']);
-            $arrProducts[$key]['price02_max_tax'] = SC_Helper_DB::sfCalcIncTax($arrProducts[$key]['price02_max']);
+            $arrProducts[$key]['price01_min_tax'] = SC_Helper_DB_Ex::sfCalcIncTax($arrProducts[$key]['price01_min']);
+            $arrProducts[$key]['price01_max_tax'] = SC_Helper_DB_Ex::sfCalcIncTax($arrProducts[$key]['price01_max']);
+            $arrProducts[$key]['price02_min_tax'] = SC_Helper_DB_Ex::sfCalcIncTax($arrProducts[$key]['price02_min']);
+            $arrProducts[$key]['price02_max_tax'] = SC_Helper_DB_Ex::sfCalcIncTax($arrProducts[$key]['price02_max']);
 
             $arrProducts[$key]['price01_min_tax_format'] = number_format($arrProducts[$key]['price01_min_tax']);
@@ -586 +586 @@
      */
     static function setIncTaxToProduct(&$arrProduct) {
-        $arrProduct['price01_min_inctax'] = isset($arrProduct['price01_min']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price01_min']) : null;
-        $arrProduct['price01_max_inctax'] = isset($arrProduct['price01_max']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price01_max']) : null;
-        $arrProduct['price02_min_inctax'] = isset($arrProduct['price02_min']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price02_min']) : null;
-        $arrProduct['price02_max_inctax'] = isset($arrProduct['price02_max']) ? SC_Helper_DB::sfCalcIncTax($arrProduct['price02_max']) : null;
+        $arrProduct['price01_min_inctax'] = isset($arrProduct['price01_min']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price01_min']) : null;
+        $arrProduct['price01_max_inctax'] = isset($arrProduct['price01_max']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price01_max']) : null;
+        $arrProduct['price02_min_inctax'] = isset($arrProduct['price02_min']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price02_min']) : null;
+        $arrProduct['price02_max_inctax'] = isset($arrProduct['price02_max']) ? SC_Helper_DB_Ex::sfCalcIncTax($arrProduct['price02_max']) : null;
     }
 

branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php

@@ -50 +50 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
                 ,'maker_id' => null
                 ,'comment4' => null

branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getDetailTest.php

@@ -50 +50 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
                 ,'maker_id' => null
                 ,'comment4' => null

branches/version-2_12-dev/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php

@@ -64 +64 @@
                 ,'del_flg' => '0'
                 ,'update_date' => $arrRet[0]
-                ,'price01_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price01_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price02_min_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
-                ,'price02_max_inctax' => SC_Helper_DB::sfCalcIncTax('1500')
+                ,'price01_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price01_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price02_min_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
+                ,'price02_max_inctax' => SC_Helper_DB_Ex::sfCalcIncTax('1500')
             )
         );