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

Timestamp:

2012/06/26 21:28:06 (14 years ago)

Author:

h_yoshimoto

Message:

#1409 Myページに決済中のステータス表記を入れる

Location:

branches/version-2_12-dev/data

Files:

• Smarty/templates/default/mypage/index.tpl (modified) (2 diffs)
• class/pages/mypage/LC_Page_Mypage.php (modified) (3 diffs)

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

@@ -52 +52 @@
                     <th class="alignC">お支払い方法</th>
                     <th class="alignC">合計金額</th>
+                    <th class="alignC">ご注文状況</th>
                     <th class="alignC">詳細</th>
                 </tr>
@@ -61 +62 @@
                         <td class="alignC"><!--{$arrPayment[$payment_id]|h}--></td>
                         <td class="alignR"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
+                        <!--{assign var=order_status_id value="`$arrOrder[cnt].status`"}-->
+                        <!--{if $order_status_id != $smarty.const.ORDER_PENDING }-->
+                        <td class="alignC"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></td>
+                        <!--{else}-->
+                        <td class="alignC attention"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></td>
+                        <!--{/if}-->
                         <td class="alignC"><a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
                     </tr>

branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php

@@ -55 +55 @@
             $this->tpl_subtitle = '購入履歴一覧';
         }
+        $masterData = new SC_DB_MasterData();
+        $this->arrCustomerOrderStatus = $masterData->getMasterData('mtb_customer_order_status');
+        
         $this->httpCacheControl('nocache');
     }
@@ -100 +103 @@
         // 1ページあたりの件数
         $this->dispNumber = SEARCH_PMAX;
-
-
+        
+        
     }
 
@@ -124 +127 @@
         $objQuery   = SC_Query_Ex::getSingletonInstance();
 
-        $col        = 'order_id, create_date, payment_id, payment_total';
+        $col        = 'order_id, create_date, payment_id, payment_total, status';
         $from       = 'dtb_order';
         $where      = 'del_flg = 0 AND customer_id = ?';