Changeset 22486 for branches

Timestamp:

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

Author:

Seasoft

Message:

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

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

Location:

branches/version-2_12-dev/data

Files:

• Smarty/templates/sphone/mypage/favorite.tpl (modified) (1 diff)
• Smarty/templates/sphone/products/list.tpl (modified) (1 diff)
• class/SC_Product.php (modified) (1 diff)
• class/api/operations/ItemSearch.php (modified) (1 diff)
• class/pages/mypage/LC_Page_Mypage_Favorite.php (modified) (3 diffs)
• class/pages/products/LC_Page_Products_List.php (modified) (1 diff)

branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl

@@ -159 +159 @@
                         //販売価格が範囲か判定
                         if (product.price02_min == product.price02_max) {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_tax_format + '円';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_inctax_format + '円';
                         } else {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_tax_format + '～' + product.price02_max_tax_format + '円';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_inctax_format + '～' + product.price02_max_inctax_format + '円';
                         }
                         price.append(priceVale);

branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl

@@ -207 +207 @@
                     //販売価格が範囲か判定
                     if (product.price02_min == product.price02_max) {
-                        priceVale = product.price02_min_tax_format + '円';
+                        priceVale = product.price02_min_inctax_format + '円';
                     } else {
-                        priceVale = product.price02_min_tax_format + '～' + product.price02_max_tax_format + '円';
+                        priceVale = product.price02_min_inctax_format + '～' + product.price02_max_inctax_format + '円';
                     }
                     price.append(priceVale);

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;
     }

branches/version-2_12-dev/data/class/api/operations/ItemSearch.php

@@ -68 +68 @@
             if (!SC_Utils_Ex::isBlank($arrProducts)) {
                 $arrProducts = $this->setStatusDataTo($arrProducts, $arrSTATUS, $arrSTATUS_IMAGE);
-                $arrProducts = $objProduct->setPriceTaxTo($arrProducts);
+                SC_Product_Ex::setPriceTaxTo($arrProducts);
                 foreach ($arrProducts as $key=>$val) {
                     $arrProducts[$key]['main_list_image'] = SC_Utils_Ex::sfNoImageMainList($val['main_list_image']);

branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php

@@ -68 +68 @@
      */
     function action() {
+        $objCustomer = new SC_Customer_Ex();
 
-        $objProduct  = new SC_Product_Ex();
-        $objCustomer = new SC_Customer_Ex();
         $customer_id = $objCustomer->getValue('customer_id');
 
@@ -78 +77 @@
                 $this->lfDeleteFavoriteProduct($customer_id, intval($_POST['product_id']));
                 break;
+
             case 'getList':
                 // スマートフォン版のもっと見るボタン用
@@ -85 +85 @@
                 }
                 $this->arrFavorite = $this->lfGetFavoriteProduct($customer_id, $this);
-                $this->arrFavorite = $objProduct->setPriceTaxTo($this->arrFavorite);
-
+                SC_Product_Ex::setPriceTaxTo($this->arrFavorite);
 
                 echo SC_Utils_Ex::jsonEncode($this->arrFavorite);
                 SC_Response_Ex::actionExit();
+                break;
+
+            default:
                 break;
         }

branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -446 +446 @@
     /**
      *
-     * @param type $objProduct 
-     * @return void
-     */
-    function doJson(&$objProduct) {
+     * @return void
+     */
+    function doJson() {
         $this->arrProducts = $this->setStatusDataTo($this->arrProducts, $this->arrSTATUS, $this->arrSTATUS_IMAGE);
-        $this->arrProducts = $objProduct->setPriceTaxTo($this->arrProducts);
+        SC_Product_Ex::setPriceTaxTo($this->arrProducts);
 
         // 一覧メイン画像の指定が無い商品のための処理