Ignore:
Timestamp:
2011/01/10 13:59:23 (16 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19859
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/Smarty/templates/default/shopping/deliv.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fdeliv.tpl
data/Smarty/templates/default/shopping/multiple.tpl multiple.tpl-20110109122547-u3fq5xmi1b4jn5n4-1
data/Smarty/templates/default/shopping/nonmember_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fnonmember_input.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Customer.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Customer.php
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/error/LC_Page_Error.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ferror%2FLC_Page_Error.php
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 16093@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DeliveryAddr.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_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-3
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
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/js/site.js site.js-20101208110316-7ungq6kj49bhw4d1-7
html/shopping/multiple.php multiple.php-20110109122547-u3fq5xmi1b4jn5n4-4
html/user_data/packages/default/css/under02.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Funder02.css
bzr:mapping-version:
v4
bzr:merge:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2589
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/default/shopping/deliv.tpl [email protected]
data/Smarty/templates/default/shopping/multiple.tpl [email protected]
data/Smarty/templates/default/shopping/nonmember_input.tpl [email protected]
data/Smarty/templates/default/shopping/payment.tpl [email protected]
data/class/SC_CartSession.php [email protected]
data/class/SC_Customer.php [email protected]
data/class/helper/SC_Helper_DB.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/error/LC_Page_Error.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php [email protected]
data/class/pages/shopping/LC_Page_Shopping.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Confirm.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Deliv.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Multiple.php [email protected]
data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]
data/class/util/SC_Utils.php [email protected]
data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/drop_table.sql [email protected]
html/install/sql/insert_data.sql [email protected]
html/js/site.js [email protected]
html/shopping/multiple.php [email protected]
html/user_data/packages/default/css/under02.css [email protected]
bzr:timestamp:
2011-01-10 13:59:15.388999939 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-10T04:59:15.389000Z
Message:

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

  • とりあえず通常配送が通るように修正
Location:
branches/version-2_5-dev/data/Smarty/templates/default/shopping
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl

    r19833 r19860  
    9090            <!--{/section}--> 
    9191        </table> 
    92  
     92        <p><a href="javascript:;" onclick="fnModeSubmit('multiple', '', ''); return false">お届け先を複数指定する</a></p> 
    9393            <div class="tblareabtn"> 
    9494                <a href="<!--{$smarty.const.CART_URL_PATH}-->" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back.gif',back03)"> 

  • branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl

    r19833 r19860  
    175175          <th>お名前<span class="attention">※</span></th> 
    176176          <td> 
    177             <!--{assign var=key1 value="deliv_name01"}--> 
    178             <!--{assign var=key2 value="deliv_name02"}--> 
     177            <!--{assign var=key1 value="shipping_name01"}--> 
     178            <!--{assign var=key2 value="shipping_name02"}--> 
    179179            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span> 
    180180            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp; 
    … …  
    185185          <th>お名前(フリガナ)<span class="attention">※</span></th> 
    186186          <td> 
    187             <!--{assign var=key1 value="deliv_kana01"}--> 
    188             <!--{assign var=key2 value="deliv_kana02"}--> 
     187            <!--{assign var=key1 value="shipping_kana01"}--> 
     188            <!--{assign var=key2 value="shipping_kana02"}--> 
    189189            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span> 
    190190            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp; 
    … …  
    195195          <th>郵便番号<span class="attention">※</span></th> 
    196196          <td> 
    197            <!--{assign var=key1 value="deliv_zip01"}--> 
    198            <!--{assign var=key2 value="deliv_zip02"}--> 
     197           <!--{assign var=key1 value="shipping_zip01"}--> 
     198           <!--{assign var=key2 value="shipping_zip02"}--> 
    199199            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span> 
    200200            <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" />　 
    201201              <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p> 
    202202 
    203             <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URL_PATH}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a> 
     203            <p class="zipimg"><a href="<!--{$smarty.const.URL_PATH}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URL_PATH}-->', 'shipping_zip01', 'shipping_zip02', 'shipping_pref', 'shipping_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a> 
    204204              <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p> 
    205205          </td> 
    … …  
    208208          <th>住所<span class="attention">※</span></th> 
    209209          <td> 
    210             <!--{assign var=key value="deliv_pref"}--> 
    211             <span class="attention"><!--{$arrErr.deliv_pref}--><!--{$arrErr.deliv_addr01}--><!--{$arrErr.deliv_addr02}--></span> 
     210            <!--{assign var=key value="shipping_pref"}--> 
     211            <span class="attention"><!--{$arrErr.shipping_pref}--><!--{$arrErr.shipping_addr01}--><!--{$arrErr.shipping_addr02}--></span> 
    212212            <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
    213213              <option value="">都道府県を選択</option> 
    … …  
    215215            </select> 
    216216            <p class="mini"> 
    217               <!--{assign var=key value="deliv_addr01"}--> 
     217              <!--{assign var=key value="shipping_addr01"}--> 
    218218              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="40" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br /> 
    219219              <!--{$smarty.const.SAMPLE_ADDRESS1}--></p> 
    220220            <p class="mini"> 
    221               <!--{assign var=key value="deliv_addr02"}--> 
     221              <!--{assign var=key value="shipping_addr02"}--> 
    222222              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="40"  maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br /> 
    223223              <!--{$smarty.const.SAMPLE_ADDRESS2}--></p> 
    … …  
    229229          <th>電話番号<span class="attention">※</span></th> 
    230230          <td> 
    231             <!--{assign var=key1 value="deliv_tel01"}--> 
    232             <!--{assign var=key2 value="deliv_tel02"}--> 
    233             <!--{assign var=key3 value="deliv_tel03"}--> 
     231            <!--{assign var=key1 value="shipping_tel01"}--> 
     232            <!--{assign var=key2 value="shipping_tel02"}--> 
     233            <!--{assign var=key3 value="shipping_tel03"}--> 
    234234            <span class="attention"><!--{$arrErr[$key1]}--></span> 
    235235            <span class="attention"><!--{$arrErr[$key2]}--></span> 
    … …  
    241241        </tr> 
    242242      </table> 
     243      <p><a href="javascript:;" onclick="fnModeSubmit('multiple', '', ''); return false">お届け先を複数指定する</a></p> 
    243244 
    244245      <div class="tblareabtn"> 

  • branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl

    r19833 r19860  
    4646                    <!--{section name=cnt loop=$arrPayment}--> 
    4747                    <tr> 
    48                         <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->" onclick="fnSetDelivTime('payment','<!--{$key}-->','deliv_time_id');" value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> /> 
     48                        <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->" value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> /> 
    4949                        </td> 
    5050                        <td> 
    … …  
    6363            </div> 
    6464 
    65             <!--{if $cartdown != 2}--> 
     65            <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 
    6666            <div class="payarea02"> 
    6767                <h3>お届け時間の指定</h3> 
Note: See TracChangeset for help on using the changeset viewer.