[Svn-src-all:877] [version-2_5-dev 19764] #593(注文メールのテンプレート変数 都道府県のデータ形式が異なる)

[Seasoft]

Subversion committed to /home/svn/open 19764
http://svn.ec-cube.net/open_trac/changeset/19764
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2010-12-25 17:23:10 +0900 (土, 25 12月 2010)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#593(注文メールのテンプレート変数 都道府県のデータ形式が異なる)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
U   branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
U   branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

変更: branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	2010-12-25 08:20:37 UTC (rev 19763)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	2010-12-25 08:23:10 UTC (rev 19764)
@@ -36,7 +36,7 @@
 ◎お届け先
 　お名前　：<!--{$arrOrder.deliv_name01}--> <!--{$arrOrder.deliv_name02}-->　様
 　郵便番号：〒<!--{$arrOrder.deliv_zip01}-->-<!--{$arrOrder.deliv_zip02}-->
-　住所　　：<!--{$arrOrder.deliv_pref}--><!--{$arrOrder.deliv_addr01}--><!--{$arrOrder.deliv_addr02}-->
+　住所　　：<!--{$arrOrder.deliv_pref_name}--><!--{$arrOrder.deliv_addr01}--><!--{$arrOrder.deliv_addr02}-->
 　電話番号：<!--{$arrOrder.deliv_tel01}-->-<!--{$arrOrder.deliv_tel02}-->-<!--{$arrOrder.deliv_tel03}-->
 
 <!--{if $arrOther.title.value }-->

変更: branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2010-12-25 08:20:37 UTC (rev 19763)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2010-12-25 08:23:10 UTC (rev 19764)
@@ -33,7 +33,7 @@
 ◎お届け先
 お名前　：<!--{$arrOrder.deliv_name01}--> <!--{$arrOrder.deliv_name02}-->　様
 郵便番号：〒<!--{$arrOrder.deliv_zip01}-->-<!--{$arrOrder.deliv_zip02}-->
-住所　　：<!--{$arrOrder.deliv_pref}--><!--{$arrOrder.deliv_addr01}--><!--{$arrOrder.deliv_addr02}-->
+住所　　：<!--{$arrOrder.deliv_pref_name}--><!--{$arrOrder.deliv_addr01}--><!--{$arrOrder.deliv_addr02}-->
 電話番号：<!--{$arrOrder.deliv_tel01}-->-<!--{$arrOrder.deliv_tel02}-->-<!--{$arrOrder.deliv_tel03}-->
 
 <!--{if $arrOther.title.value }-->

変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	2010-12-25 08:20:37 UTC (rev 19763)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	2010-12-25 08:23:10 UTC (rev 19764)
@@ -128,7 +128,8 @@
         }
 
         // 都道府県変換
-        $arrTplVar->arrOrder['deliv_pref'] = $this->arrPref[$arrTplVar->arrOrder['deliv_pref']];
+        $arrTplVar->arrOrder['deliv_pref_name'] = $this->arrPref[$arrTplVar->arrOrder['deliv_pref']];
+        $arrTplVar->arrOrder['order_pref_name'] = $this->arrPref[$arrTplVar->arrOrder['order_pref']];
 
         $arrTplVar->arrOrderDetail = $arrOrderDetail;