Ignore:
Timestamp:
2011/01/14 16:05:27 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19911
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php 18068@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_SearchCustomer.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/mypage/LC_Page_Mypage_History.php 16102@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_History.php
data/class/pages/mypage/LC_Page_Mypage_Refusal.php 16107@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Refusal.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php lc_page_shopping_loa-20101025071457-rpmc2g2y1ik9lyow-1
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110114063808-90bwct1e4vvp4pdu
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110114070511-vucf02g46heeopxz
bzr:revno:
2641
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110114063808-90bwct1e4vvp4pdu
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php ohkouchi@loop-az.jp-20110114061729-r20usn45dk4uljeh
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php ohkouchi@loop-az.jp-20110113110615-xq0xjwnwnak96yv2
data/class/pages/mypage/LC_Page_Mypage_History.php ohkouchi@loop-az.jp-20110113110615-xq0xjwnwnak96yv2
data/class/pages/mypage/LC_Page_Mypage_Refusal.php ohkouchi@loop-az.jp-20110114063808-90bwct1e4vvp4pdu
data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110114061729-r20usn45dk4uljeh
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20110114063808-90bwct1e4vvp4pdu
data/class/pages/shopping/LC_Page_Shopping_Deliv.php ohkouchi@loop-az.jp-20110114061729-r20usn45dk4uljeh
data/class/pages/shopping/LC_Page_Shopping_LoadPaymentModule.php ohkouchi@loop-az.jp-20110114063808-90bwct1e4vvp4pdu
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20110114063808-90bwct1e4vvp4pdu
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110113073131-bpy2g7dthqxzv4ys
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110113073131-bpy2g7dthqxzv4ys
bzr:timestamp:
2011-01-14 16:05:11.578999996 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-14T07:05:11.579000Z
Message:

#628(未使用処理・定義などの削除)

  • モジュール連携用のコードを削除

#843(複数配送先の指定)

  • 受注編集画面を修正

#642(共通ロジックの機能向上)

  • SC_Utils::sfIsPrePage(), SC_Utils::sfCheckNormalAccess() を削除

#631(テーブル定義の改良)

  • データ型を大文字に統一
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl

    r19909 r19912  
    6969 
    7070<div id="order" class="contents-main"> 
    71     <!--{* ペイジェントモジュール連携用 *}--> 
    72     <!--{assign var=path value=`$smarty.const.MODULE_REALDIR`mdl_paygent/paygent_order.tpl}--> 
    73     <!--{if file_exists($path)}--> 
    74         <!--{include file=$path}--> 
    75     <!--{/if}--> 
    76  
    77                         <!--{* GMOPG連携用 *}--> 
    78                         <!--{assign var=path value=`$smarty.const.MODULE_REALDIR`mdl_gmopg/templates/order_edit.tpl}--> 
    79                         <!--{if file_exists($path)}--> 
    80                             <!--{include file=$path}--> 
    81                         <!--{/if}--> 
    82  
    83                         <!--{* SPS連携用 *}--> 
    84                         <!--{assign var=sps_path value=`$smarty.const.MODULE_REALDIR`mdl_sps/templates/sps_request.tpl}--> 
    85                         <!--{if file_exists($sps_path) && $paymentType[0].module_code == $smarty.const.MDL_SPS_CODE}--> 
    86                             <!--{include file=$sps_path}--> 
    87                         <!--{/if}--> 
    88  
    89                         <!--{* ペイジェントモジュール連携用 *}--> 
    90                         <!--{assign var=path value=`$smarty.const.MODULE_REALDIR`mdl_paygent/paygent_order.tpl}--> 
    91                         <!--{if file_exists($path)}--> 
    92                             <!--{include file=$path}--> 
    93                         <!--{/if}--> 
    9471 
    9572    <!--▼お客様情報ここから--> 
    … …  
    9875        <tr> 
    9976            <th>帳票出力</th> 
    100             <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','600','800'); return false;">帳票出力</a></td> 
     77            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票出力</a></td> 
    10178        </tr> 
    10279        <!--{/if}--> 
    … …  
    139116    <h2>お客様情報 
    140117        <!--{if $tpl_mode == 'add'}--> 
    141             <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnOpenWindow('<!--{$smarty.const.HTTP_URL}--><!--{$smarty.const.ADMIN_DIR}-->customer/search_customer.php','search','500','650'); return false;">顧客検索</a> 
     118            <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnOpenWindow('<!--{$smarty.const.HTTP_URL}--><!--{$smarty.const.ADMIN_DIR}-->customer/search_customer.php','search','600','650'); return false;">顧客検索</a> 
    142119        <!--{/if}--> 
    143120    </h2> 
    … …  
    218195                <!--{assign var=key value="order_addr02"}--> 
    219196                <span class="attention"><!--{$arrErr[$key]}--></span> 
    220                 <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60 addbox" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /> 
     197                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /> 
    221198            </td> 
    222199        </tr> 
    … …  
    241218    <!--▼受注商品情報ここから--> 
    242219    <h2 id="order_products"> 
    243         <a name="order_products"></a> 
    244         受注商品情報 
     220        <a name="order_products">受注商品情報</a> 
    245221        <a class="btn-normal" href="javascript:;" name="cheek" onclick="fnModeSubmit('cheek','anchor_key','order_products');">計算結果の確認</a> 
    246222        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '600', '500'); ">商品の追加</a> 
    … …  
    290266        <!--{/section}--> 
    291267        <tr> 
    292             <th class="column right" colspan="5"">小計</th> 
     268            <th colspan="5" class="column right">小計</th> 
    293269            <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td> 
    294270        </tr> 
    295271        <tr> 
    296             <th class="column right" colspan="5"">値引</th> 
     272            <th colspan="5" class="column right">値引</th> 
    297273            <td class="right"> 
    298274                <!--{assign var=key value="discount"}--> 
    … …  
    303279        </tr> 
    304280        <tr> 
    305             <th class="column right" colspan="5"">送料</th> 
     281            <th colspan="5" class="column right">送料</th> 
    306282            <td class="right"> 
    307283                <!--{assign var=key value="deliv_fee"}--> 
    … …  
    312288        </tr> 
    313289        <tr> 
    314             <th class="column right" colspan="5"">手数料</th> 
     290            <th colspan="5" class="column right">手数料</th> 
    315291            <td class="right"> 
    316292                <!--{assign var=key value="charge"}--> 
    … …  
    321297        </tr> 
    322298        <tr> 
    323             <th class="column right" colspan="5"">合計</th> 
     299            <th colspan="5" class="column right">合計</th> 
    324300            <td class="right"> 
    325301                <span class="attention"><!--{$arrErr.total}--></span> 
    … …  
    328304        </tr> 
    329305        <tr> 
    330             <th class="column right" colspan="5"">お支払い合計</th> 
     306            <th colspan="5" class="column right">お支払い合計</th> 
    331307            <td class="right"> 
    332308                <span class="attention"><!--{$arrErr.payment_total}--></span> 
    … …  
    337313        <!--{if $smarty.const.USE_POINT !== false}--> 
    338314            <tr> 
    339                 <th class="column right" colspan="5"">使用ポイント</th> 
     315                <th colspan="5" class="column right">使用ポイント</th> 
    340316                <td class="right"> 
    341317                    <!--{assign var=key value="use_point"}--> 
    … …  
    347323            <!--{if $arrForm.birth_point.value > 0}--> 
    348324            <tr> 
    349                 <th class="column" colspan="5"">お誕生日ポイント</th> 
    350                 <td class="right right"> 
     325                <th colspan="5" class="column right">お誕生日ポイント</th> 
     326                <td class="right"> 
    351327                    <!--{$arrForm.birth_point.value|number_format}--> 
    352328                     pt 
    … …  
    355331            <!--{/if}--> 
    356332            <tr> 
    357                 <th class="column right" colspan="5"">加算ポイント</th> 
     333                <th colspan="5" class="column right">加算ポイント</th> 
    358334                <td class="right"> 
    359335                    <!--{$arrForm.add_point.value|number_format|default:0}--> 
    … …  
    368344        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お客様情報へお届けする</a> 
    369345        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お届け先を新規追加</a> 
    370         <a class="btn-normal" href="javascript:;" name="add_product">複数のお届け先を指定する</a> 
     346        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">複数のお届け先を指定する</a> 
    371347    </h2> 
    372348 
    … …  
    396372      </tr> 
    397373      <!--{/foreach}--> 
     374 
    398375    <table class="form"> 
    399376        <tr> 
    … …  
    486463    <!--▲お届け先情報ここまで--> 
    487464 
    488  
    489465    <table class="form"> 
    490466        <tr> 
    … …  
    530506      </ul> 
    531507    </div> 
    532  
    533 </div> 
     508  </div> 
    534509</form> 
Note: See TracChangeset for help on using the changeset viewer.