Changeset 18731
- Timestamp:
- 2010/06/22 16:22:44 (14 years ago)
- 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
- Location:
- branches/version-2_4/data
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_4/data/Smarty/templates/default/mobile/mail_templates/order_mail.tpl
r16988 r18731 53 53 54 54 <!--{/section}--> 55 --------------- 56 小 計 ¥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ¥<!--{$arrOrder.tax|number_format|default:0}-->) 57 値引き ¥ <!--{$arrOrder.use_point+$arrOrder.discount|number_format|default:0}--> 58 送 料 ¥ <!--{$arrOrder.deliv_fee|number_format|default:0}--> 59 手数料 ¥ <!--{$arrOrder.charge|number_format|default:0}--> 60 --------------- 61 合 計 ¥ <!--{$arrOrder.payment_total|number_format|default:0}--> 62 <!--{if $arrOrder.customer_id && $smarty.const.USE_POINT === true}--> 63 --------------- 64 <!--{* ご注文前のポイント {$tpl_user_point} pt *}--> 65 ご使用ポイント <!--{$arrOrder.use_point|default:0}--> pt 66 今回加算される加算ポイント <!--{$arrOrder.add_point|default:0}--> pt 67 保持ポイント <!--{$arrCustomer.point|default:0}--> pt 68 <!--{/if}--> 69 -
branches/version-2_4/data/Smarty/templates/default/mobile/mypage/index.tpl
r16582 r18731 27 27 <!--{$CustomerName1|escape}--> <!--{$CustomerName2|escape}-->様<br> 28 28 いつもご利用いただきありがとうございます。<br> 29 <!--{if $smarty.const.USE_POINT !== false}--> 30 現在の所持ポイントは<em><!--{$CustomerPoint|number_format|escape|default:"0"}-->pt</em> です。<br> 31 <!--{/if}--> 32 29 33 <br> 30 34 <a href="history.php" accesskey="1"><!--{1|numeric_emoji}-->購入履歴</a><br> -
branches/version-2_4/data/Smarty/templates/default/mobile/shopping/confirm.tpl
r18521 r18731 67 67 68 68 【購入金額】<br> 69 商品合計:<!--{$tpl_total_pretax|number_format}--><br> 70 送料:<!--{$arrData.deliv_fee|number_format}--><br> 71 <!--{if $arrData.charge > 0}-->手数料:<!--{$arrData.charge|number_format}--><br><!--{/if}--> 72 合計:<!--{$arrData.payment_total|number_format}--><br> 73 (内消費税:<!--{$arrData.tax|number_format}-->)<br> 69 商品合計:<!--{$tpl_total_pretax|number_format}-->円<br> 70 71 <!--{if $smarty.const.USE_POINT === true}--> 72 ポイント値引き:<!--{assign var=discount value=`$arrData.use_point*$smarty.const.POINT_VALUE`}--> 73 -<!--{$discount|number_format|default:0}-->円<br> 74 <!--{/if}--> 75 76 送料:<!--{$arrData.deliv_fee|number_format}-->円<br> 77 <!--{if $arrData.charge > 0}-->手数料:<!--{$arrData.charge|number_format}-->円<br><!--{/if}--> 78 合計:<!--{$arrData.payment_total|number_format}-->円<br> 79 (内消費税:<!--{$arrData.tax|number_format}-->円)<br> 74 80 75 81 <br> … … 81 87 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->"> 82 88 <input type="hidden" name="payment_id" value="<!--{$arrData.payment_id}-->"> 89 <input type="hidden" name="use_point" value="<!--{$arrData.use_point}-->"> 90 <input type="hidden" name="point_check" value="<!--{$arrData.point_check}-->"> 83 91 <input type="hidden" name="deliv_date" value="<!--{$arrData.deliv_date}-->"> 84 92 <input type="hidden" name="deliv_time_id" value="<!--{$arrData.deliv_time_id}-->"> -
branches/version-2_4/data/Smarty/templates/default/mobile/shopping/deliv_date.tpl
r18521 r18731 30 30 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->"> 31 31 <input type="hidden" name="payment_id" value="<!--{$arrForm.payment_id.value}-->"> 32 < !--<input type="hidden" name="message" value="">-->33 < !--{if $tpl_login == 1}-->34 <!--<input type="hidden" name="point_check" value="2">--> 35 < !--{/if}-->32 <input type="hidden" name="use_point" value="<!--{$arrForm.use_point.value}-->"> 33 <input type="hidden" name="point_check" value="<!--{$arrForm.point_check.value}-->"> 34 35 <font color="red"><!--{$arrErr.use_point}--></font> 36 36 37 37 ■お届け日<br> -
branches/version-2_4/data/Smarty/templates/default/mobile/shopping/payment.tpl
r17847 r18731 31 31 <input type="hidden" name="deliv_date" value="<!--{$arrForm.deliv_date.value}-->"> 32 32 <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}-->37 33 38 34 <!--{assign var=key value="payment_id"}--> … … 45 41 <br> 46 42 <!--{/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" /> ポイントを使用する。<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 <!-- ▲ポイント使用 ここまで --> 47 55 48 56 <center><input type="submit" value="次へ"></center> -
branches/version-2_4/data/class/pages/mypage/LC_Page_Mypage.php
r17653 r18731 209 209 $this->CustomerName1 = $objCustomer->getvalue('name01'); 210 210 $this->CustomerName2 = $objCustomer->getvalue('name02'); 211 $this->CustomerPoint = $objCustomer->getvalue('point'); 211 212 } 212 213
Note: See TracChangeset
for help on using the changeset viewer.