Changeset 20663
- Timestamp:
- 2011/03/16 11:31:02 (13 years ago)
- bzr:base-revision:
- ohkouchi@loop-az.jp-20110316015501-x1fqvmay077xgiyc
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/default/cart/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fcart%2Findex.tpl
data/Smarty/templates/default/frontparts/bloc/cart.tpl 19795@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Ffrontparts%2Fbloc%2Fcart.tpl
data/Smarty/templates/mobile/cart/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fcart%2Findex.tpl
data/Smarty/templates/sphone/cart/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-2
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Cart.php- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20110316023048-zgmzkjx2n491v38u
- bzr:revno:
- 3383
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/default/cart/index.tpl ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5
data/Smarty/templates/default/frontparts/bloc/cart.tpl ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5
data/Smarty/templates/mobile/cart/index.tpl ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5
data/Smarty/templates/sphone/cart/index.tpl ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5
data/class/SC_CartSession.php ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php ohkouchi@loop-az.jp-20110316022947-4ykxlchbpvu1bvl5- bzr:timestamp:
- 2011-03-16 11:30:48.121999979 +0900
- bzr:user-agent:
- bzr2.2.1+bzr-svn1.0.4
- svn:original-date:
- 2011-03-16T02:30:48.122000Z
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
r20661 r20663 80 80 <p> 81 81 <!--{$arrProductType[$key]}-->の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。 82 <!--{if $arrInfo.free_rule > 0}--> 83 <!--{if $arrData[$key].deliv_fee > 0}--> 84 あと「<span class="price"<!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です!! 85 <!--{else}--> 86 現在、「<span class="attention">送料無料</span>」です!! 82 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 83 <!--{if $arrInfo.free_rule > 0}--> 84 <!--{if $arrData[$key].deliv_fee > 0}--> 85 あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です!! 86 <!--{else}--> 87 88 現在、「<span class="attention">送料無料</span>」です!! 89 <!--{/if}--> 87 90 <!--{/if}--> 88 91 <!--{/if}--> … … 91 94 <p> 92 95 お買い上げ商品の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。 93 <!--{if $arrInfo.free_rule > 0}--> 94 <!--{if $arrData[$key].deliv_fee > 0}--> 95 あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です!! 96 <!--{else}--> 97 現在、「<span class="attention">送料無料</span>」です!! 96 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 97 <!--{if $arrInfo.free_rule > 0}--> 98 <!--{if $arrData[$key].deliv_fee > 0}--> 99 あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です!! 100 <!--{else}--> 101 現在、「<span class="attention">送料無料</span>」です!! 102 <!--{/if}--> 98 103 <!--{/if}--> 99 104 <!--{/if}--> -
branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl
r20520 r20663 31 31 * 複数の商品種別が存在する場合は非表示 32 32 *************************************}--> 33 <!--{if $arrCartList.0.TotalQuantity > 0 and $arrCartList.0.free_rule > 0 and !$isMultiple }-->33 <!--{if $arrCartList.0.TotalQuantity > 0 and $arrCartList.0.free_rule > 0 and !$isMultiple and !$hasDownload}--> 34 34 <p class="postage"> 35 35 <!--{if $arrCartList.0.deliv_free > 0}--> -
branches/version-2_5-dev/data/Smarty/templates/mobile/cart/index.tpl
r20614 r20663 73 73 </font> 74 74 <br> 75 75 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 76 76 <!--{if $arrInfo.free_rule > 0}--> 77 77 <!--{if $arrData[$key].deliv_fee > 0}--> … … 81 81 <!--{/if}--> 82 82 <br> 83 <!--{/if}--> 83 84 <!--{/if}--> 84 85 -
branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
r20614 r20663 77 77 <p> 78 78 <!--{$arrProductType[$key]}-->の合計金額は「<em><!--{$tpl_total_inctax[$key]|number_format}-->円</em>」です。 79 <!--{if $arrInfo.free_rule > 0}--> 80 <!--{if $arrData[$key].deliv_fee > 0}--> 81 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 82 <!--{else}--> 83 現在、「<em>送料無料</em>」です!! 79 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 80 <!--{if $arrInfo.free_rule > 0}--> 81 <!--{if $arrData[$key].deliv_fee > 0}--> 82 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 83 <!--{else}--> 84 現在、「<em>送料無料</em>」です!! 85 <!--{/if}--> 84 86 <!--{/if}--> 85 87 <!--{/if}--> … … 88 90 <p> 89 91 お買い上げ商品の合計金額は「<em><!--{$tpl_total_inctax[$key]|number_format}-->円</em>」です。 90 <!--{if $arrInfo.free_rule > 0}--> 91 <!--{if $arrData[$key].deliv_fee > 0}--> 92 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 93 <!--{else}--> 94 現在、「<em>送料無料</em>」です!! 95 <!--{/if}--> 96 <!--{/if}--> 92 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 93 <!--{if $arrInfo.free_rule > 0}--> 94 <!--{if $arrData[$key].deliv_fee > 0}--> 95 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 96 <!--{else}--> 97 現在、「<em>送料無料</em>」です!! 98 <!--{/if}--> 99 <!--{/if}--> 100 <!--{/if}--> 97 101 </p> 98 102 <!--{/if}--> -
branches/version-2_5-dev/data/class/SC_CartSession.php
r20581 r20663 602 602 } 603 603 604 /** 605 * 複数配送扱いかどうか. 606 * 607 * @return boolean カートが複数配送扱いの場合 true 608 */ 604 609 function isMultiple() { 605 610 return count($this->getKeys()) > 1; 606 611 } 612 613 /** 614 * 引数の商品種別の商品がカートに含まれるかどうか. 615 * 616 * @param integer $product_type_id 商品種別ID 617 * @return boolean 指定の商品種別がカートに含まれる場合 true 618 */ 619 function hasProductType($product_type_id) { 620 return in_array($product_type_id, $this->getKeys()); 621 } 607 622 } 608 623 ?> -
branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
r20540 r20663 65 65 $objCart = new SC_CartSession_Ex(); 66 66 $this->isMultiple = $objCart->isMultiple(); 67 $this->hasDownload = $objCart->hasProductType(PRODUCT_TYPE_DOWNLOAD); 67 68 $this->arrCartList = $this->lfGetCartData($objCart); 68 69 }
Note: See TracChangeset
for help on using the changeset viewer.