Changeset 21942


Ignore:
Timestamp:
2012/06/26 21:28:06 (9 years ago)
Author:
h_yoshimoto
Message:

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

Location:
branches/version-2_12-dev
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/data/Smarty/templates/default/mypage/index.tpl

    r21867 r21942  
    5252                    <th class="alignC">お支払い方法</th> 
    5353                    <th class="alignC">合計金額</th> 
     54                    <th class="alignC">ご注文状況</th> 
    5455                    <th class="alignC">詳細</th> 
    5556                </tr> 
     
    6162                        <td class="alignC"><!--{$arrPayment[$payment_id]|h}--></td> 
    6263                        <td class="alignR"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td> 
     64                        <!--{assign var=order_status_id value="`$arrOrder[cnt].status`"}--> 
     65                        <!--{if $order_status_id != $smarty.const.ORDER_PENDING }--> 
     66                        <td class="alignC"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></td> 
     67                        <!--{else}--> 
     68                        <td class="alignC attention"><!--{$arrCustomerOrderStatus[$order_status_id]|h}--></td> 
     69                        <!--{/if}--> 
    6370                        <td class="alignC"><a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td> 
    6471                    </tr> 
  • branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage.php

    r21867 r21942  
    5555            $this->tpl_subtitle = '購入履歴一覧'; 
    5656        } 
     57        $masterData = new SC_DB_MasterData(); 
     58        $this->arrCustomerOrderStatus = $masterData->getMasterData('mtb_customer_order_status'); 
     59         
    5760        $this->httpCacheControl('nocache'); 
    5861    } 
     
    100103        // 1ページあたりの件数 
    101104        $this->dispNumber = SEARCH_PMAX; 
    102  
    103  
     105         
     106         
    104107    } 
    105108 
     
    124127        $objQuery   = SC_Query_Ex::getSingletonInstance(); 
    125128 
    126         $col        = 'order_id, create_date, payment_id, payment_total'; 
     129        $col        = 'order_id, create_date, payment_id, payment_total, status'; 
    127130        $from       = 'dtb_order'; 
    128131        $where      = 'del_flg = 0 AND customer_id = ?'; 
  • branches/version-2_12-dev/html/install/sql/create_table_mysql.sql

    r21908 r21942  
    998998); 
    999999 
     1000CREATE TABLE mtb_customer_order_status ( 
     1001    id smallint, 
     1002    name text, 
     1003    rank smallint NOT NULL DEFAULT 0, 
     1004    PRIMARY KEY (id) 
     1005); 
     1006 
    10001007CREATE TABLE mtb_order_status_color ( 
    10011008    id smallint, 
  • branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql

    r21908 r21942  
    998998); 
    999999 
     1000CREATE TABLE mtb_customer_order_status ( 
     1001    id smallint, 
     1002    name text, 
     1003    rank smallint NOT NULL DEFAULT 0, 
     1004    PRIMARY KEY (id) 
     1005); 
     1006 
    10001007CREATE TABLE mtb_order_status_color ( 
    10011008    id smallint, 
  • branches/version-2_12-dev/html/install/sql/drop_table.sql

    r21713 r21942  
    5959DROP TABLE mtb_order_status_color; 
    6060DROP TABLE mtb_order_status; 
     61DROP TABLE mtb_customer_order_status; 
    6162DROP TABLE mtb_mail_type; 
    6263DROP TABLE mtb_mail_tpl_path; 
  • branches/version-2_12-dev/html/install/sql/insert_data.sql

    r21920 r21942  
    845845INSERT INTO mtb_order_status_color (id, name, rank) VALUES (6, '#FFFFAB', 5); 
    846846INSERT INTO mtb_order_status_color (id, name, rank) VALUES (7, '#FFCCCC', 6); 
     847 
     848INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (7, '注文未完了', 0); 
     849INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (1, '注文受付', 1); 
     850INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (2, '入金待ち', 2); 
     851INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (6, '注文受付', 3); 
     852INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (3, 'キャンセル', 4); 
     853INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (4, '注文受付', 5); 
     854INSERT INTO mtb_customer_order_status (id, name, rank) VALUES (5, '発送済み', 6); 
    847855 
    848856INSERT INTO mtb_ownersstore_err (id, name, rank) VALUES ('1000', '不明なエラーが発生しました。', 0); 
Note: See TracChangeset for help on using the changeset viewer.