[Svn-src-all:2701] [version-2_12-dev 21600] #1688 (注文メール 「配送情報」が無い場合もタイトルが表示される)

[Seasoft]

Subversion committed to /home/svn/open 21600
http://svn.ec-cube.net/open_trac/changeset/21600
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-07 15:46:48 +0900 (水, 07  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1688 (注文メール 「配送情報」が無い場合もタイトルが表示される)

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

変更: branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	2012-03-07 06:43:26 UTC (rev 21599)
+++ branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	2012-03-07 06:46:48 UTC (rev 21600)
@@ -64,11 +64,10 @@
 ============================================
 合　計 ￥ <!--{$arrOrder.payment_total|number_format|default:0}-->
 
-<!--{if count($arrShipping) > 0 }-->
+<!--{if count($arrShipping) >= 1}-->
 ************************************************
 　配送情報
 ************************************************
-<!--{/if}-->
 
 <!--{foreach item=shipping name=shipping from=$arrShipping}-->
 ◎お届け先<!--{if count($arrShipping) > 1}--><!--{$smarty.foreach.shipping.iteration}--><!--{/if}-->
@@ -88,6 +87,7 @@
 
 <!--{/foreach}-->
 <!--{/foreach}-->
+<!--{/if}-->
 <!--{if $arrOrder.customer_id && $smarty.const.USE_POINT !== false}-->
 ============================================
 <!--{* ご注文前のポイント {$tpl_user_point} pt *}-->

変更: branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2012-03-07 06:43:26 UTC (rev 21599)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	2012-03-07 06:46:48 UTC (rev 21600)
@@ -57,6 +57,7 @@
 ===============================================================
 合　計 ￥ <!--{$arrOrder.payment_total|number_format|default:0}-->
 
+<!--{if count($arrShipping) >= 1}-->
 ■配送情報
 
 <!--{foreach item=shipping name=shipping from=$arrShipping}-->
@@ -77,6 +78,7 @@
 
 <!--{/foreach}-->
 <!--{/foreach}-->
+<!--{/if}-->
 <!--{if $arrOrder.customer_id && $smarty.const.USE_POINT !== false}-->
 ■ポイント情報
 <!--{* ご注文前のポイント {$tpl_user_point} pt *}-->