Changeset 18729


Ignore:
Timestamp:
2010/06/22 15:43:42 (10 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100622063206-gth1n3w4ppkb7o7a
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/default/admin/order/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Findex.tpl
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100622064338-ekasobzhpbj6s62d
bzr:revno:
1936
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/Smarty/templates/default/admin/order/index.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18656
bzr:timestamp:
2010-06-22 15:43:38.630000114 +0900
bzr:user-agent:
bzr2.1.1+bzr-svn1.0.2
svn:original-date:
2010-06-22T06:43:38.630000Z
Message:

merged r18682

  • 受注一覧の「購入金額」を「お支払い合計」に統一(#701)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/Smarty/templates/default/admin/order/index.tpl

    r18656 r18729  
    285285                            </tr> 
    286286                            <tr class="fs12n"> 
    287                                 <td bgcolor="#f2f1ec" width="110">購入金額</td> 
     287                                <td bgcolor="#f2f1ec" width="110">お支払い合計</td> 
    288288                                <td bgcolor="#ffffff" width="499" colspan="3"> 
    289289                                    <!--{assign var=key1 value="search_total1"}--> 
     
    425425                            <td width="110"><span class="white">顧客名</span></td> 
    426426                            <td width="90"><span class="white">支払方法</span></td> 
    427                             <td width="70"><span class="white">購入金額(円)</span></td> 
     427                            <td width="70"><span class="white">お支払い<br />合計(円)</span></td> 
    428428                            <td width="100"><span class="white">全商品発送日</span></td> 
    429429                            <td width="75"><span class="white">対応状況</span></td> 
     
    443443                            <!--{assign var=payment_id value="`$arrResults[cnt].payment_id`"}--> 
    444444                            <td align="center"><!--{$arrPayment[$payment_id]}--></td> 
    445                             <td align="right"><!--{$arrResults[cnt].total|number_format}--></td> 
     445                            <td align="right"><!--{$arrResults[cnt].payment_total|number_format}--></td> 
    446446                            <td align="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default:"未発送"}--></td> 
    447447                            <td align="center"><!--{$arrORDERSTATUS[$status]}--></td> 
Note: See TracChangeset for help on using the changeset viewer.