Changeset 22001 for branches/version-2_12-dev/data

Timestamp:

2012/08/14 16:59:19 (11 years ago)

Author:

h_yoshimoto

Message:

#1916 注文状況を表示する様に修正(devへmerge)

Location:

branches/version-2_12-dev/data/Smarty/templates

Files:

• mobile/mypage/index.tpl (modified) (1 diff)
• sphone/mypage/index.tpl (modified) (1 diff)

branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/index.tpl

@@ -54 +54 @@
             ▽合計金額<br>
             <font color="#ff0000"><!--{$arrOrder[cnt].payment_total|number_format}-->円</font><br>
+            ▽ご注文状況<br>
+            <!--{if $smarty.const.MYPAGE_ORDER_STATUS_DISP_FLAG }-->
+                <!--{assign var=order_status_id value="`$arrOrder[cnt].status`"}-->
+                <!--{if $order_status_id != $smarty.const.ORDER_PENDING }-->
+                    <!--{$arrCustomerOrderStatus[$order_status_id]|h}--><br>
+                <!--{else}-->
+                    <font color="#ff0000"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></font><br>
+                <!--{/if}-->
+            <!--{/if}-->
+            
             <div align="right"><a href="./history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">→詳細を見る</a></div><br>
         <!--{/section}-->

branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl

@@ -56 +56 @@
                                     <em>購入日時：</em><span class="create_date"><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></span><br />
                                     <em>お支払い方法：</em><span class="payment_id"><!--{$arrPayment[$payment_id]|h}--></span><br />
-                                    <em>合計金額：</em><span class="payment_total"><!--{$arrOrder[cnt].payment_total|number_format}--></span>円
+                                    <em>合計金額：</em><span class="payment_total"><!--{$arrOrder[cnt].payment_total|number_format}--></span>円<br />
+                                    <em>ご注文状況：</em>
+                                    <!--{if $smarty.const.MYPAGE_ORDER_STATUS_DISP_FLAG }-->
+                                        <!--{assign var=order_status_id value="`$arrOrder[cnt].status`"}-->
+                                        <!--{if $order_status_id != $smarty.const.ORDER_PENDING }-->
+                                        <span class="order_status"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></span><br />
+                                        <!--{else}-->
+                                        <span class="order_status attention"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></span><br />
+                                        <!--{/if}-->
+                                    <!--{/if}-->
                                 </p>
                                 <a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->" rel="external"></a>