Ignore:
Timestamp:
2011/01/18 04:38:42 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19948
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/admin/main_frame.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmain_frame.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/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:

nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110117193838-vgfohrkdiaqqbdxo
bzr:revno:
2678
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/main_frame.tpl nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
data/Smarty/templates/admin/order/edit.tpl nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
bzr:timestamp:
2011-01-18 04:38:38.407999992 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-17T19:38:38.408000Z
Message:

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

  • 受注管理を修正
File:
1 edited

Legend:

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

    r19946 r19949  
    5656 
    5757    function fnMultiple() { 
     58        win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/multiple.php', 'multiple', '600', '500'); 
     59        document.form1.anchor_key.value = "shipping"; 
    5860        document.form1.mode.value = "multiple"; 
    5961        document.form1.submit(); 
     
    8183        <tr> 
    8284            <th>帳票出力</th> 
    83             <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票出力</a></td> 
     85            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','615','800'); return false;">帳票出力</a></td> 
    8486        </tr> 
    8587        <!--{/if}--> 
    8688        <tr> 
    8789            <th>注文番号</th> 
    88             <td><!--{$tpl_order_id|h}--></td> 
     90            <td><!--{$arrForm.order_id.value|h}--></td> 
    8991        </tr> 
    9092        <tr> 
    9193            <th>受注日</th> 
    92             <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td> 
    93             <input type="hidden" name="create_date" value="<!--{$arrForm.create_date.value}-->" /> 
     94            <td><!--{$arrForm.create_date.value|sfDispDBDate}--><input type="hidden" name="create_date" value="<!--{$arrForm.create_date.value}-->" /></td> 
    9495        </tr> 
    9596        <tr> 
     
    353354        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お客様情報へお届けする</a> 
    354355        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お届け先を新規追加</a> 
    355         <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnModeSubmit('multiple','anchor_key','shipping');">複数のお届け先を指定する</a> 
     356        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnMultiple();">複数のお届け先を指定する</a> 
    356357    </h2> 
    357358 
     
    536537                <!--{assign var=key value="note"}--> 
    537538                <span class="attention"><!--{$arrErr[$key]}--></span> 
    538                 <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea></td> 
     539                <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea> 
    539540            </td> 
    540541        </tr> 
Note: See TracChangeset for help on using the changeset viewer.