Ignore:
Timestamp:
2010/06/22 16:22:44 (14 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100622065616-4er7u9byyrttl3jj
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/default/mobile/mail_templates/order_mail.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmail_templates%2Forder_mail.tpl
data/Smarty/templates/default/mobile/mypage/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fmypage%2Findex.tpl
data/Smarty/templates/default/mobile/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/default/mobile/shopping/deliv_date.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fdeliv_date.tpl
data/Smarty/templates/default/mobile/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fpayment.tpl
data/class/pages/mypage/LC_Page_Mypage.php 16066@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage.php
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100622072240-w9zg6a1f0241mjkg
bzr:revno:
1938
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/Smarty/templates/default/mobile/mail_templates/order_mail.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16988
data/Smarty/templates/default/mobile/mypage/index.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16582
data/Smarty/templates/default/mobile/shopping/confirm.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521
data/Smarty/templates/default/mobile/shopping/deliv_date.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521
data/Smarty/templates/default/mobile/shopping/payment.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:17847
data/class/pages/mypage/LC_Page_Mypage.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2:17653
bzr:timestamp:
2010-06-22 16:22:40.676000118 +0900
bzr:user-agent:
bzr2.1.1+bzr-svn1.0.2
svn:original-date:
2010-06-22T07:22:40.676000Z
Message:

merged r18688, r18715

  • モバイルでポイントが使用できるように修正(#754)
  • モバイルの注文確認メールで送料等を表示するよう修正(#761)
  • モバイルMYページで所持ポイントを表示するよう修正(#754)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/Smarty/templates/default/mobile/shopping/payment.tpl

    r17847 r18731  
    3131<input type="hidden" name="deliv_date" value="<!--{$arrForm.deliv_date.value}-->"> 
    3232<input type="hidden" name="deliv_time_id" value="<!--{$arrForm.deliv_time_id.value}-->"> 
    33 <!--<input type="hidden" name="message" value="">--> 
    34 <!--{if $tpl_login == 1}--> 
    35 <!--<input type="hidden" name="point_check" value="2">--> 
    36 <!--{/if}--> 
    3733 
    3834<!--{assign var=key value="payment_id"}--> 
     
    4541<br> 
    4642<!--{/section}--> 
     43 
     44<!-- ▼ポイント使用 ここから --> 
     45<!--{if $tpl_login == 1 && $smarty.const.USE_POINT == true}--> 
     46<p><!--{$objCustomer->getValue('name01')|escape}--> <!--{$objCustomer->getValue('name02')|escape}-->様の、現在の所持ポイントは「<!--{$tpl_user_point|default:0}-->ポイント」です。</p> 
     47<p>今回ご購入合計金額:<span class="price"><!--{$arrData.subtotal|number_format}-->円</span><span class="attention">(送料、手数料を含みません。)</p> 
     48<input type="radio" id="point_on" name="point_check" value="1" <!--{$arrForm.point_check.value|sfGetChecked:1}--> />ポイントを使用する<br> 
     49<!--{assign var=key value="use_point"}--> 
     50今回のお買い物で、<input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|default:$tpl_user_point}-->" maxlength="<!--{$arrForm[$key].length}-->" size="6" />&nbsp;ポイントを使用する。<br> 
     51<span class="attention"><!--{$arrErr[$key]}--></span> 
     52<input type="radio" id="point_off" name="point_check" value="2" <!--{$arrForm.point_check.value|sfGetChecked:2}--> />ポイントを使用しない 
     53<!--{/if}--> 
     54<!-- ▲ポイント使用 ここまで --> 
    4755 
    4856<center><input type="submit" value="次へ"></center> 
Note: See TracChangeset for help on using the changeset viewer.