[Svn-src-all:3582] [version-2_12-dev 22494] #2098 (パラメーター SALE_PRICE_TITLE が無視される箇所がある)

[Seasoft]

Subversion committed to /home/svn/open 22494
http://svn.ec-cube.net/open_trac/changeset/22494
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2013-02-02 20:43:04 +0900 (土, 02  2月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2098 (パラメーター SALE_PRICE_TITLE が無視される箇所がある)
#2043 (typo修正・ソース整形・ソースコメントの改善 for 2.12.4)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
U   branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl
U   branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

変更: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	2013-02-02 10:25:52 UTC (rev 22493)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	2013-02-02 11:43:04 UTC (rev 22494)
@@ -33,7 +33,7 @@
                             <h3><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a></h3>
                             <p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
                             <p class="sale_price">
-                                <span class="mini">販売価格(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> 円</span>
+                                <span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> 円</span>
                             </p>
                         </div>
                     </div>

変更: branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	2013-02-02 10:25:52 UTC (rev 22493)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	2013-02-02 11:43:04 UTC (rev 22494)
@@ -94,7 +94,7 @@
 
                 <!--★商品価格★-->
                 <p>
-                    <span class="pricebox sale_price"><span class="mini">販売価格(税込):</span></span>
+                    <span class="pricebox sale_price"><span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span></span>
                     <span class="price">
                         <span id="price02_default_<!--{$id}-->">
                             <!--{if $arrProduct.price02_min_inctax == $arrProduct.price02_max_inctax}-->

変更: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	2013-02-02 10:25:52 UTC (rev 22493)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php	2013-02-02 11:43:04 UTC (rev 22494)
@@ -64,7 +64,6 @@
      * @return void
      */
     function action() {
-
         $objSiteSess = new SC_SiteSession_Ex();
         $objCartSess = new SC_CartSession_Ex();
         $objPurchase = new SC_Helper_Purchase_Ex();
@@ -114,8 +113,6 @@
             $objFormParam->setParam($_SESSION['multiple_temp']);
         }
         $this->arrForm = $objFormParam->getFormParamList();
-
-
     }
 
     /**
@@ -142,7 +139,7 @@
         $objFormParam->addParam('規格分類2', 'classcategory_name2');
         $objFormParam->addParam('メイン画像', 'main_image');
         $objFormParam->addParam('メイン一覧画像', 'main_list_image');
-        $objFormParam->addParam('販売価格', 'price');
+        $objFormParam->addParam(SALE_PRICE_TITLE, 'price');
         $objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
         $objFormParam->addParam('お届け先', 'shipping', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('カート番号', 'cart_no', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -228,6 +225,7 @@
                     . $val['shipping_addr01'] . $val['shipping_addr02'];
             }
         }
+
         return $arrResults;
     }
 
@@ -283,6 +281,7 @@
                 }
             }
         }
+
         return $arrErr;
     }