Changeset 20007 for branches/version-2_5-dev/data/class/pages/frontparts

Timestamp:

2011/01/20 11:28:19 (13 years ago)

Author:

nanasess

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

Message:

#823(商品種別によってカートを分ける)

• カートの表示を修正

File:

• branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php

@@ -94 +94 @@
         $arrCartList[0]['ProductsTotal'] = $ProductsTotal;
         $arrCartList[0]['TotalQuantity'] = $TotalQuantity;
-        /*
-         * FIXME
-         * 商品種別ごとに送料無料までの金額を計算するよう要修正
-         */
+
         $deliv_free = $arrInfo['free_rule'] - $ProductsTotal;
         $arrCartList[0]['free_rule'] = $arrInfo['free_rule'];
         $arrCartList[0]['deliv_free'] = $deliv_free;
 
+        $this->isMultiple = $objCart->isMultiple();
         $this->arrCartList = $arrCartList;
     }