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

Timestamp:

2013/01/30 21:12:01 (11 years ago)

Author:

Seasoft

Message:

#2043 (typo修正・ソース整形・ソースコメントの改善 for 2.12.4)
#2044 (無駄な処理を改善する for 2.12.4)

• 不必要なインスタンス化
• 不必要な値渡し

File:

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

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

@@ -545 +545 @@
      *
      * @param array $arrProducts 商品情報の配列
-     * @return array 税込金額を設定した商品情報の配列
-     */
-    function setPriceTaxTo($arrProducts) {
-        foreach ($arrProducts as $key => $value) {
-            $arrProducts[$key]['price01_min_format'] = number_format($arrProducts[$key]['price01_min']);
-            $arrProducts[$key]['price01_max_format'] = number_format($arrProducts[$key]['price01_max']);
-            $arrProducts[$key]['price02_min_format'] = number_format($arrProducts[$key]['price02_min']);
-            $arrProducts[$key]['price02_max_format'] = number_format($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']);
-            $arrProducts[$key]['price01_max_tax_format'] = number_format($arrProducts[$key]['price01_max_tax']);
-            $arrProducts[$key]['price02_min_tax_format'] = number_format($arrProducts[$key]['price02_min_tax']);
-            $arrProducts[$key]['price02_max_tax_format'] = number_format($arrProducts[$key]['price02_max_tax']);
-        }
+     * @return array 旧バージョン互換用のデータ
+     */
+    static function setPriceTaxTo(&$arrProducts) {
+        foreach ($arrProducts as &$arrProduct) {
+            $arrProduct['price01_min_format'] = number_format($arrProduct['price01_min']);
+            $arrProduct['price01_max_format'] = number_format($arrProduct['price01_max']);
+            $arrProduct['price02_min_format'] = number_format($arrProduct['price02_min']);
+            $arrProduct['price02_max_format'] = number_format($arrProduct['price02_max']);
+
+            SC_Product_Ex::setIncTaxToProduct($arrProduct);
+
+            $arrProduct['price01_min_inctax_format'] = number_format($arrProduct['price01_min_inctax']);
+            $arrProduct['price01_max_inctax_format'] = number_format($arrProduct['price01_max_inctax']);
+            $arrProduct['price02_min_inctax_format'] = number_format($arrProduct['price02_min_inctax']);
+            $arrProduct['price02_max_inctax_format'] = number_format($arrProduct['price02_max_inctax']);
+
+            // @deprecated 2.12.4
+            // 旧バージョン互換用
+            // 本来は、税額の代入で使用すべきキー名。
+            $arrProduct['price01_min_tax_format'] =& $arrProduct['price01_min_inctax_format'];
+            $arrProduct['price01_max_tax_format'] =& $arrProduct['price01_max_inctax_format'];
+            $arrProduct['price02_min_tax_format'] =& $arrProduct['price02_min_inctax_format'];
+            $arrProduct['price02_max_tax_format'] =& $arrProduct['price02_max_inctax_format'];
+        }
+        // @deprecated 2.12.4
+        // 旧バージョン互換用
+        // 現在は参照渡しで戻せる
         return $arrProducts;
     }