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

data/Smarty/templates/admin/customer/search_customer.tpl 18068@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcustomer%2Fsearch_customer.tpl
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/Smarty/templates/admin/order/multiple.tpl multiple.tpl-20110116173102-7dtlp9lt15miha2l-1
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110118191310-c3ybk9px2xg63hkd
bzr:revno:
2692
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/customer/search_customer.tpl ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
data/Smarty/templates/admin/order/edit.tpl ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
data/Smarty/templates/admin/order/multiple.tpl ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php ohkouchi@loop-az.jp-20110118191202-tmjlvrfe8ftnjeak
bzr:timestamp:
2011-01-19 04:13:10.059999943 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-18T19:13:10.060000Z
Message:

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

  • 更新処理を修正
Location:
branches/version-2_5-dev/data/Smarty/templates/admin
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl

    r19954 r19963  
    7979<!--{if $smarty.post.mode == 'search' }--> 
    8080    <!--▼検索結果表示--> 
    81     <table width="420" border="0" cellspacing="0" cellpadding="0" summary=" " bgcolor="#FFFFFF"> 
    8281        <!--{if $tpl_linemax > 0}--> 
    83             <tr class="fs12"> 
    84                 <td align="left"><!--{$tpl_linemax}-->件が該当しました。 </td> 
    85             </tr> 
     82        <p><!--{$tpl_linemax}-->件が該当しました。<!--{$tpl_strnavi}--></p> 
    8683        <!--{/if}--> 
    87         <tr class="fs12"> 
    88             <td align="center"> 
    89             <!--▼ページナビ--> 
    90             <!--{$tpl_strnavi}--> 
    91             <!--▲ページナビ--> 
    92             </td> 
    93         </tr> 
    94         <tr><td height="10"></td></tr> 
    95     </table> 
    9684 
    9785    <!--▼検索後表示部分--> 
    98     <table width="420" border="0" cellspacing="1" cellpadding="5" bgcolor="#cccccc"> 
    99         <tr bgcolor="#f0f0f0" align="center" class="fs12"> 
    100             <td>顧客ID</td> 
    101             <td>顧客名(カナ)</td> 
    102             <td>TEL</td> 
    103             <td>決定</td> 
     86    <table class="list"> 
     87        <tr> 
     88            <th>顧客ID</th> 
     89            <th>顧客名(カナ)</th> 
     90            <th>TEL</th> 
     91            <th>決定</th> 
    10492        </tr> 
    10593        <!--{section name=cnt loop=$arrCustomer}--> 
    10694        <!--▼顧客<!--{$smarty.section.cnt.iteration}-->--> 
    107         <tr bgcolor="#FFFFFF" class="fs12n"> 
    108             <td width="90" align="center"> 
     95        <tr> 
     96            <td> 
    10997            <!--{$arrCustomer[cnt].customer_id|h}--> 
    11098            </td> 
    … …  
    115103        <!--▲商品<!--{$smarty.section.cnt.iteration}-->--> 
    116104        <!--{sectionelse}--> 
    117         <tr bgcolor="#FFFFFF" class="fs10n"> 
     105        <tr> 
    118106            <td colspan="4">会員情報が存在しません。</td> 
    119107        </tr> 

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

    r19954 r19963  
    3535        df = document.form1; 
    3636 
    37         df.deliv_name01.value = df.order_name01.value; 
    38         df.deliv_name02.value = df.order_name02.value; 
    39         df.deliv_kana01.value = df.order_kana01.value; 
    40         df.deliv_kana02.value = df.order_kana02.value; 
    41         df.deliv_zip01.value = df.order_zip01.value; 
    42         df.deliv_zip02.value = df.order_zip02.value; 
    43         df.deliv_tel01.value = df.order_tel01.value; 
    44         df.deliv_tel02.value = df.order_tel02.value; 
    45         df.deliv_tel03.value = df.order_tel03.value; 
    46         df.deliv_pref.value = df.order_pref.value; 
    47         df.deliv_addr01.value = df.order_addr01.value; 
    48         df.deliv_addr02.value = df.order_addr02.value; 
     37        df.shipping_name01_0.value = df.order_name01.value; 
     38        df.shipping_name02_0.value = df.order_name02.value; 
     39        df.shipping_kana01_0.value = df.order_kana01.value; 
     40        df.shipping_kana02_0.value = df.order_kana02.value; 
     41        df.shipping_zip01_0.value = df.order_zip01.value; 
     42        df.shipping_zip02_0.value = df.order_zip02.value; 
     43        df.shipping_tel01_0.value = df.order_tel01.value; 
     44        df.shipping_tel02_0.value = df.order_tel02.value; 
     45        df.shipping_tel03_0.value = df.order_tel03.value; 
     46        df.shipping_pref_0.value = df.order_pref.value; 
     47        df.shipping_addr01_0.value = df.order_addr01.value; 
     48        df.shipping_addr02_0.value = df.order_addr02.value; 
    4949    } 
    5050 
    … …  
    6262        return false; 
    6363    } 
     64 
     65    function fnAppendShipping() { 
     66        document.form1.anchor_key.value = "shipping"; 
     67        document.form1.mode.value = "append_shipping"; 
     68        document.form1.submit(); 
     69        return false; 
     70    } 
     71 
    6472//--> 
    6573</script> 
    … …  
    348356        <!--{/if}--> 
    349357    </table> 
    350  
     358    <!--{assign var=key value="shipping_quantity"}--> 
     359    <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" /> 
    351360    <!--▼お届け先情報ここから--> 
    352361    <a name="shipping"></a> 
    353362    <h2>お届け先情報 
     363    <!--{if $arrForm.shipping_quantity.value <= 1}--> 
    354364        <a class="btn-normal" href="javascript:;" onclick="fnCopyFromOrderData();">お客様情報へお届けする</a> 
    355         <a class="btn-normal" href="javascript:;"  onclick="fnCopyFromOrderData();">お届け先を新規追加</a> 
     365    <!--{/if}--> 
     366        <a class="btn-normal" href="javascript:;"  onclick="fnAppendShipping();">お届け先を新規追加</a> 
    356367        <a class="btn-normal" href="javascript:;" onclick="fnMultiple();">複数のお届け先を指定する</a> 
    357368    </h2> 
    358  
    359     <!--{assign var=key value="shipping_quantity"}--> 
    360     <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" /> 
    361369 
    362370    <!--{section name=shipping loop=$arrForm.shipping_quantity.value}--> 
    … …  
    367375    <h3>お届け先<!--{$smarty.section.shipping.iteration}--></h3> 
    368376    <!--{/if}--> 
    369  
     377    <input type="hidden" name="shipping_id_<!--{$shipping_id}-->" value="<!--{$shipping_id}-->" id="shipping_id_<!--{$shipping_id}-->" /> 
    370378    <!--{if $arrForm.shipping_quantity.value > 1}--> 
    371379    <!--{assign var=product_quantity value="shipping_product_quantity_`$shipping_id`"}--> 
    372380    <input type="hidden" name="<!--{$product_quantity}-->" value="<!--{$arrForm[$product_quantity].value|h}-->" /> 
    373     <input type="hidden" name="shipping_id_<!--{$shipping_id}-->" value="<!--{$shipping_id}-->" id="shipping_id_<!--{$shipping_id}-->" /> 
     381 
     382    <!--{if $arrForm[$product_quantity].value > 0}--> 
    374383    <table class="list" id="order-edit-products"> 
    375384      <tr> 
    … …  
    382391      <!--{assign var=item_index value="`$smarty.section.item.index`"}--> 
    383392      <!--{assign var=product_class_id value=$arrProductClassIds[$shipping_index][$item_index]}--> 
     393 
    384394      <tr> 
    385395        <td> 
     396          <!--{assign var=key value="product_class_id_`$shipping_id`_`$product_class_id`"}--> 
     397          <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" /> 
    386398          <!--{assign var=key value="product_code_`$shipping_id`_`$product_class_id`"}--> 
    387399          <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" /> 
    … …  
    411423    </table> 
    412424    <!--{/if}--> 
     425    <!--{/if}--> 
    413426 
    414427    <table class="form"> 

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

    r19954 r19963  
    8888            var q = $('<td />').addClass('center') 
    8989                .append(idfield) 
     90                .append(codefield) 
    9091                .append(namefield) 
    9192                .append(class1field) 
    … …  
    132133    $('input[name^=multiple_], select[name^=multiple_]').each(function() { 
    133134        // TODO タグをベタ書きにしないと, innerHTML で value が空になってしまう 
    134         $(div).append('<input type="hidden" name="' 
     135        $(div).append('<input type="text" name="' 
    135136                      + $(this).attr('name') 
    136137                      + '" value="' + $(this).val() + '" />'); 
Note: See TracChangeset for help on using the changeset viewer.