Changeset 20007 for branches/version-2_5-dev/data
- Timestamp:
- 2011/01/20 11:28:19 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20006
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
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/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-20110120022631-sp9lew4pa03rzpnp- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20110120022802-itn2aco6dudae8sd
- bzr:revno:
- 2736
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/default/frontparts/bloc/cart.tpl ohkouchi@loop-az.jp-20110120022631-sp9lew4pa03rzpnp
data/class/SC_CartSession.php ohkouchi@loop-az.jp-20110120022631-sp9lew4pa03rzpnp
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php ohkouchi@loop-az.jp-20110120022631-sp9lew4pa03rzpnp- bzr:timestamp:
- 2011-01-20 11:28:02.069999933 +0900
- bzr:user-agent:
- bzr2.2.1+bzr-svn1.0.4
- svn:original-date:
- 2011-01-20T02:28:02.070000Z
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl
r19983 r20007 26 26 <p class="item">商品数:<!--{$arrCartList.0.TotalQuantity|number_format|default:0}-->点</p> 27 27 <p>合計:<span class="price"><!--{$arrCartList.0.ProductsTotal|number_format|default:0}-->円</span><br /> 28 <!--{* カゴの中に商品がある場合にのみ表示 *}--> 29 <!--{if $arrCartList.0.TotalQuantity > 0 and $arrCartList.0.free_rule > 0}--> 28 <!--{************************************* 29 カゴの中に商品がある場合にのみ表示 30 複数の商品種別が存在する場合は非表示 31 *************************************}--> 32 <!--{if $arrCartList.0.TotalQuantity > 0 and $arrCartList.0.free_rule > 0 and !$isMultiple}--> 30 33 <!--{if $arrCartList.0.deliv_free > 0}--> 31 34 送料手数料無料まであと<!--{$arrCartList.0.deliv_free|number_format|default:0}-->円(税込)です。 -
branches/version-2_5-dev/data/class/SC_CartSession.php
r19928 r20007 587 587 return $_SESSION['cartKey']; 588 588 } 589 590 function isMultiple() { 591 return count($this->getKeys()) > 1; 592 } 589 593 } 590 594 ?> -
branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
r19815 r20007 94 94 $arrCartList[0]['ProductsTotal'] = $ProductsTotal; 95 95 $arrCartList[0]['TotalQuantity'] = $TotalQuantity; 96 /* 97 * FIXME 98 * 商品種別ごとに送料無料までの金額を計算するよう要修正 99 */ 96 100 97 $deliv_free = $arrInfo['free_rule'] - $ProductsTotal; 101 98 $arrCartList[0]['free_rule'] = $arrInfo['free_rule']; 102 99 $arrCartList[0]['deliv_free'] = $deliv_free; 103 100 101 $this->isMultiple = $objCart->isMultiple(); 104 102 $this->arrCartList = $arrCartList; 105 103 }
Note: See TracChangeset
for help on using the changeset viewer.