Changeset 18731 for branches/version-2_4/data/Smarty/templates/default/mobile/shopping/confirm.tpl

Timestamp:

2010/06/22 16:22:44 (13 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:

• branches/version-2_4/data/Smarty/templates/default/mobile/shopping/confirm.tpl (modified) (2 diffs)

branches/version-2_4/data/Smarty/templates/default/mobile/shopping/confirm.tpl

@@ -67 +67 @@
 
 【購入金額】<br>
-商品合計：<!--{$tpl_total_pretax|number_format}--><br>
-送料：<!--{$arrData.deliv_fee|number_format}--><br>
-<!--{if $arrData.charge > 0}-->手数料：<!--{$arrData.charge|number_format}--><br><!--{/if}-->
-合計：<!--{$arrData.payment_total|number_format}--><br>
-(内消費税：<!--{$arrData.tax|number_format}-->)<br>
+商品合計：<!--{$tpl_total_pretax|number_format}-->円<br>
+
+<!--{if $smarty.const.USE_POINT === true}-->
+ポイント値引き：<!--{assign var=discount value=`$arrData.use_point*$smarty.const.POINT_VALUE`}-->
+-<!--{$discount|number_format|default:0}-->円<br>
+<!--{/if}-->
+
+送料：<!--{$arrData.deliv_fee|number_format}-->円<br>
+<!--{if $arrData.charge > 0}-->手数料：<!--{$arrData.charge|number_format}-->円<br><!--{/if}-->
+合計：<!--{$arrData.payment_total|number_format}-->円<br>
+(内消費税：<!--{$arrData.tax|number_format}-->円)<br>
 
 <br>
@@ -81 +87 @@
 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
 <input type="hidden" name="payment_id" value="<!--{$arrData.payment_id}-->">
+<input type="hidden" name="use_point" value="<!--{$arrData.use_point}-->">
+<input type="hidden" name="point_check" value="<!--{$arrData.point_check}-->">
 <input type="hidden" name="deliv_date" value="<!--{$arrData.deliv_date}-->">
 <input type="hidden" name="deliv_time_id" value="<!--{$arrData.deliv_time_id}-->">