[Svn-src-all:1234] [version-2_5-dev 20123] #984([フロント]商品購入 リファクタリング)

[nanasess]

Subversion committed to /home/svn/open 20123
http://svn.ec-cube.net/open_trac/changeset/20123
┌────────────────────────────┐
│更新者　:  nanasess                                     │
│更新日時:  2011-02-09 17:30:51 +0900 (水, 09  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#984([フロント]商品購入 リファクタリング)
 * /shopping/complete.php


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl
U   branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl
U   branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php

変更: branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	2011-02-09 07:59:25 UTC (rev 20122)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	2011-02-09 08:30:51 UTC (rev 20123)
@@ -55,11 +55,7 @@
     </div>
 
     <div class="tblareabtn">
-      <!--{if $is_campaign}-->
-        <a href="<!--{$smarty.const.CAMPAIGN_URL}--><!--{$campaign_dir}-->/<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
-      <!--{else}-->
         <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
-      <!--{/if}-->
     </div>
   </div>
 </div>

変更: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl	2011-02-09 07:59:25 UTC (rev 20122)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl	2011-02-09 08:30:51 UTC (rev 20123)
@@ -53,11 +53,7 @@
     </div>
 
     <div class="tblareabtn">
-      <!--{if $is_campaign}-->
-        <a href="<!--{$smarty.const.CAMPAIGN_URL}--><!--{$campaign_dir}-->/<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
-      <!--{else}-->
         <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
-      <!--{/if}-->
     </div>
   </div>
 </div>

変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	2011-02-09 07:59:25 UTC (rev 20122)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	2011-02-09 08:30:51 UTC (rev 20123)
@@ -44,10 +44,6 @@
     function init() {
         parent::init();
         $this->tpl_title = "ご注文完了";
-
-        $masterData = new SC_DB_MasterData_Ex();
-        $this->arrCONVENIENCE = $masterData->getMasterData("mtb_convenience");
-        $this->arrCONVENIMESSAGE = $masterData->getMasterData("mtb_conveni_message");
     }
 
     /**
@@ -67,9 +63,7 @@
      * @return void
      */
     function action() {
-        $objView = new SC_SiteView();
-        $objSiteInfo = $objView->objSiteInfo;
-        $this->arrInfo = $objSiteInfo->data;
+        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
     }
 
     /**