[Svn-src-all:1196] [version-2_5-dev 20084] #985 リファクタリング
yomoro
admin ＠ mail.ec-cube.net
2011年 2月 4日 (金) 11:52:48 JST
Subversion committed to /home/svn/open 20084
http://svn.ec-cube.net/open_trac/changeset/20084
┌────────────────────────────┐
│更新者 : yomoro │
│更新日時: 2011-02-04 11:52:48 +0900 (金, 04 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#985 リファクタリング
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/default/order/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/mobile/order/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl
U branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
変更: branches/version-2_5-dev/data/Smarty/templates/default/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/order/index.tpl 2011-02-04 02:48:46 UTC (rev 20083)
+++ branches/version-2_5-dev/data/Smarty/templates/default/order/index.tpl 2011-02-04 02:52:48 UTC (rev 20084)
@@ -26,55 +26,55 @@
<table summary="特定商取引に関する法律に基づく表記">
<tr>
<th>販売業者</th>
- <td><!--{$arrRet.law_company|h}--></td>
+ <td><!--{$arrOrder.law_company|h}--></td>
</tr>
<tr>
<th>運営責任者</th>
- <td><!--{$arrRet.law_manager|h}--></td>
+ <td><!--{$arrOrder.law_manager|h}--></td>
</tr>
<tr>
<th>住所</th>
- <td>〒<!--{$arrRet.law_zip01|h}-->-<!--{$arrRet.law_zip02|h}--><br /><!--{$arrPref[$arrRet.law_pref]|h}--><!--{$arrRet.law_addr01|h}--><!--{$arrRet.law_addr02|h}--></td>
+ <td>〒<!--{$arrOrder.law_zip01|h}-->-<!--{$arrOrder.law_zip02|h}--><br /><!--{$arrPref[$arrOrder.law_pref]|h}--><!--{$arrOrder.law_addr01|h}--><!--{$arrOrder.law_addr02|h}--></td>
</tr>
<tr>
<th>電話番号</th>
- <td><!--{$arrRet.law_tel01|h}-->-<!--{$arrRet.law_tel02|h}-->-<!--{$arrRet.law_tel03|h}--></td>
+ <td><!--{$arrOrder.law_tel01|h}-->-<!--{$arrOrder.law_tel02|h}-->-<!--{$arrOrder.law_tel03|h}--></td>
</tr>
<tr>
<th>FAX番号</th>
- <td><!--{$arrRet.law_fax01|h}-->-<!--{$arrRet.law_fax02|h}-->-<!--{$arrRet.law_fax03|h}--></td>
+ <td><!--{$arrOrder.law_fax01|h}-->-<!--{$arrOrder.law_fax02|h}-->-<!--{$arrOrder.law_fax03|h}--></td>
</tr>
<tr>
<th>メールアドレス</th>
- <td><a href="mailto:<!--{$arrRet.law_email|escape:'hex'}-->"><!--{$arrRet.law_email|escape:'hexentity'}--></a></td>
+ <td><a href="mailto:<!--{$arrOrder.law_email|escape:'hex'}-->"><!--{$arrOrder.law_email|escape:'hexentity'}--></a></td>
</tr>
<tr>
<th>URL</th>
- <td><a href="<!--{$arrRet.law_url|h}-->"><!--{$arrRet.law_url|h}--></a></td>
+ <td><a href="<!--{$arrOrder.law_url|h}-->"><!--{$arrOrder.law_url|h}--></a></td>
</tr>
<tr>
<th>商品以外の必要代金</th>
- <td><!--{$arrRet.law_term01|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term01|h|nl2br}--></td>
</tr>
<tr>
<th>注文方法</th>
- <td><!--{$arrRet.law_term02|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term02|h|nl2br}--></td>
</tr>
<tr>
<th>支払方法</th>
- <td><!--{$arrRet.law_term03|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term03|h|nl2br}--></td>
</tr>
<tr>
<th>支払期限</th>
- <td><!--{$arrRet.law_term04|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term04|h|nl2br}--></td>
</tr>
<tr>
<th>引渡し時期</th>
- <td><!--{$arrRet.law_term05|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term05|h|nl2br}--></td>
</tr>
<tr>
<th>返品・交換について</th>
- <td><!--{$arrRet.law_term06|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term06|h|nl2br}--></td>
</tr>
</table>
</div>
変更: branches/version-2_5-dev/data/Smarty/templates/mobile/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/order/index.tpl 2011-02-04 02:48:46 UTC (rev 20083)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/order/index.tpl 2011-02-04 02:52:48 UTC (rev 20084)
@@ -22,55 +22,55 @@
*/
*}-->
[emoji:39]<font color="#800000">販売業者</font><br>
-<!--{$arrRet.law_company|h}--><br>
+<!--{$arrOrder.law_company|h}--><br>
<hr>
[emoji:170]<font color="#800000">運営責任者</font><br>
-<!--{$arrRet.law_manager|h}--><br>
+<!--{$arrOrder.law_manager|h}--><br>
<hr>
[emoji:38]<font color="#800000">住所</font><br>
-〒<!--{$arrRet.law_zip01|h}-->-<!--{$arrRet.law_zip02|h}--><br>
-<!--{$arrPref[$arrRet.law_pref]|h}--><!--{$arrRet.law_addr01|h}--><br>
-<!--{$arrRet.law_addr02|h}--><br>
+〒<!--{$arrOrder.law_zip01|h}-->-<!--{$arrOrder.law_zip02|h}--><br>
+<!--{$arrPref[$arrOrder.law_pref]|h}--><!--{$arrOrder.law_addr01|h}--><br>
+<!--{$arrOrder.law_addr02|h}--><br>
<hr>
[emoji:74]<font color="#800000">電話番号</font><br>
-<a href="tel:<!--{$arrRet.law_tel01|h}-->-<!--{$arrRet.law_tel02|h}-->-<!--{$arrRet.law_tel03|h}-->"><!--{$arrRet.law_tel01|h}-->-<!--{$arrRet.law_tel02|h}-->-<!--{$arrRet.law_tel03|h}--></a><br>
+<a href="tel:<!--{$arrOrder.law_tel01|h}-->-<!--{$arrOrder.law_tel02|h}-->-<!--{$arrOrder.law_tel03|h}-->"><!--{$arrOrder.law_tel01|h}-->-<!--{$arrOrder.law_tel02|h}-->-<!--{$arrOrder.law_tel03|h}--></a><br>
<hr>
[emoji:107]<font color="#800000">FAX番号</font><br>
-<!--{$arrRet.law_fax01|h}-->-<!--{$arrRet.law_fax02|h}-->-<!--{$arrRet.law_fax03|h}--><br>
+<!--{$arrOrder.law_fax01|h}-->-<!--{$arrOrder.law_fax02|h}-->-<!--{$arrOrder.law_fax03|h}--><br>
<hr>
[emoji:110]<font color="#800000">メールアドレス</font><br>
-<a href="mailto:<!--{$arrRet.law_email|escape:'hex'}-->"><!--{$arrRet.law_email|escape:'hexentity'}--></a><br>
+<a href="mailto:<!--{$arrOrder.law_email|escape:'hex'}-->"><!--{$arrOrder.law_email|escape:'hexentity'}--></a><br>
<hr>
[emoji:e11]<font color="#800000">サイトURL</font><br>
-<a href="<!--{$arrRet.law_url|h}-->"><!--{$arrRet.law_url|h}--></a><br>
+<a href="<!--{$arrOrder.law_url|h}-->"><!--{$arrOrder.law_url|h}--></a><br>
<hr>
[emoji:113]<font color="#800000">商品以外の必要代金</font><br>
-<!--{$arrRet.law_term01|h|nl2br}--><br>
+<!--{$arrOrder.law_term01|h|nl2br}--><br>
<hr>
[emoji:146]<font color="#800000">注文方法</font><br>
-<!--{$arrRet.law_term02|h|nl2br}--><br>
+<!--{$arrOrder.law_term02|h|nl2br}--><br>
<hr>
[emoji:42]<font color="#800000">支払方法</font><br>
-<!--{$arrRet.law_term03|h|nl2br}--><br>
+<!--{$arrOrder.law_term03|h|nl2br}--><br>
<hr>
[emoji:176]<font color="#800000">支払期限</font><br>
-<!--{$arrRet.law_term04|h|nl2br}--><br>
+<!--{$arrOrder.law_term04|h|nl2br}--><br>
<hr>
[emoji:72]<font color="#800000">引渡し時期</font><br>
-<!--{$arrRet.law_term05|h|nl2br}--><br>
+<!--{$arrOrder.law_term05|h|nl2br}--><br>
<hr>
[emoji:e42]<font color="#800000">返品・交換について</font><br>
-<!--{$arrRet.law_term06|h|nl2br}--><br>
+<!--{$arrOrder.law_term06|h|nl2br}--><br>
<br>
変更: branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl 2011-02-04 02:48:46 UTC (rev 20083)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl 2011-02-04 02:52:48 UTC (rev 20084)
@@ -26,55 +26,55 @@
<table summary="特定商取引に関する法律に基づく表記">
<tr>
<th>販売業者</th>
- <td><!--{$arrRet.law_company|h}--></td>
+ <td><!--{$arrOrder.law_company|h}--></td>
</tr>
<tr>
<th>運営責任者</th>
- <td><!--{$arrRet.law_manager|h}--></td>
+ <td><!--{$arrOrder.law_manager|h}--></td>
</tr>
<tr>
<th>住所</th>
- <td>〒<!--{$arrRet.law_zip01|h}-->-<!--{$arrRet.law_zip02|h}--><br /><!--{$arrPref[$arrRet.law_pref]|h}--><!--{$arrRet.law_addr01|h}--><!--{$arrRet.law_addr02|h}--></td>
+ <td>〒<!--{$arrOrder.law_zip01|h}-->-<!--{$arrOrder.law_zip02|h}--><br /><!--{$arrPref[$arrOrder.law_pref]|h}--><!--{$arrOrder.law_addr01|h}--><!--{$arrOrder.law_addr02|h}--></td>
</tr>
<tr>
<th>電話番号</th>
- <td><!--{$arrRet.law_tel01|h}-->-<!--{$arrRet.law_tel02|h}-->-<!--{$arrRet.law_tel03|h}--></td>
+ <td><!--{$arrOrder.law_tel01|h}-->-<!--{$arrOrder.law_tel02|h}-->-<!--{$arrOrder.law_tel03|h}--></td>
</tr>
<tr>
<th>FAX番号</th>
- <td><!--{$arrRet.law_fax01|h}-->-<!--{$arrRet.law_fax02|h}-->-<!--{$arrRet.law_fax03|h}--></td>
+ <td><!--{$arrOrder.law_fax01|h}-->-<!--{$arrOrder.law_fax02|h}-->-<!--{$arrOrder.law_fax03|h}--></td>
</tr>
<tr>
<th>メールアドレス</th>
- <td><a href="mailto:<!--{$arrRet.law_email|escape:'hex'}-->"><!--{$arrRet.law_email|escape:'hexentity'}--></a></td>
+ <td><a href="mailto:<!--{$arrOrder.law_email|escape:'hex'}-->"><!--{$arrOrder.law_email|escape:'hexentity'}--></a></td>
</tr>
<tr>
<th>URL</th>
- <td><a href="<!--{$arrRet.law_url|h}-->"><!--{$arrRet.law_url|h}--></a></td>
+ <td><a href="<!--{$arrOrder.law_url|h}-->"><!--{$arrOrder.law_url|h}--></a></td>
</tr>
<tr>
<th>商品以外の必要代金</th>
- <td><!--{$arrRet.law_term01|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term01|h|nl2br}--></td>
</tr>
<tr>
<th>注文方法</th>
- <td><!--{$arrRet.law_term02|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term02|h|nl2br}--></td>
</tr>
<tr>
<th>支払方法</th>
- <td><!--{$arrRet.law_term03|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term03|h|nl2br}--></td>
</tr>
<tr>
<th>支払期限</th>
- <td><!--{$arrRet.law_term04|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term04|h|nl2br}--></td>
</tr>
<tr>
<th>引渡し時期</th>
- <td><!--{$arrRet.law_term05|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term05|h|nl2br}--></td>
</tr>
<tr>
<th>返品・交換について</th>
- <td><!--{$arrRet.law_term06|h|nl2br}--></td>
+ <td><!--{$arrOrder.law_term06|h|nl2br}--></td>
</tr>
</table>
</div>
変更: branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php 2011-02-04 02:48:46 UTC (rev 20083)
+++ branches/version-2_5-dev/data/class/pages/order/LC_Page_Order.php 2011-02-04 02:52:48 UTC (rev 20084)
@@ -45,7 +45,6 @@
parent::init();
$this->tpl_page_category = 'order';
$this->tpl_title = '特定商取引に関する法律に基づく表記';
-
$masterData = new SC_DB_MasterData_Ex();
$this->arrPref = $masterData->getMasterData('mtb_pref');
}
@@ -67,10 +66,10 @@
* @return void
*/
function action() {
- $objQuery = new SC_Query();
+ $objQuery =& SC_Query::getSingletonInstance();
$layout = new SC_Helper_PageLayout_Ex();
$objDb = new SC_Helper_DB_Ex();
- $this->arrRet = $objDb->sfGetBasisData();
+ $this->arrOrder = $objDb->sfGetBasisData();
}
/**
Svn-src-all メーリングリストの案内