Index: branches/version-2_12-dev/data/class/SC_Product.php =================================================================== --- branches/version-2_12-dev/data/class/SC_Product.php (revision 22484) +++ branches/version-2_12-dev/data/class/SC_Product.php (revision 22486) @@ -545,23 +545,31 @@ * * @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; } Index: branches/version-2_12-dev/data/class/api/operations/ItemSearch.php =================================================================== --- branches/version-2_12-dev/data/class/api/operations/ItemSearch.php (revision 22206) +++ branches/version-2_12-dev/data/class/api/operations/ItemSearch.php (revision 22486) @@ -68,5 +68,5 @@ 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']); Index: branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php =================================================================== --- branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 22313) +++ branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php (revision 22486) @@ -446,10 +446,9 @@ /** * - * @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); // 一覧メイン画像の指定が無い商品のための処理 Index: branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php =================================================================== --- branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 22232) +++ branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php (revision 22486) @@ -68,7 +68,6 @@ */ function action() { + $objCustomer = new SC_Customer_Ex(); - $objProduct = new SC_Product_Ex(); - $objCustomer = new SC_Customer_Ex(); $customer_id = $objCustomer->getValue('customer_id'); @@ -78,4 +77,5 @@ $this->lfDeleteFavoriteProduct($customer_id, intval($_POST['product_id'])); break; + case 'getList': // スマートフォン版のもっと見るボタン用 @@ -85,9 +85,11 @@ } $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; } Index: branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl =================================================================== --- branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl (revision 22206) +++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl (revision 22486) @@ -207,7 +207,7 @@ //販売価格が範囲か判定 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); Index: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl =================================================================== --- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl (revision 22206) +++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl (revision 22486) @@ -159,7 +159,7 @@ //販売価格が範囲か判定 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);