Ignore:
Timestamp:
2010/10/13 18:03:46 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18851
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/list.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Flist.tpl
data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/cart/LC_Page_Cart.php 15179@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcart%2FLC_Page_Cart.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
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
data/class/pages/shopping/LC_Page_Shopping_Complete.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Complete.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20101013090342-ipwymntv4wfnpwcf
bzr:revno:
2332
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-20101013090124-oqet9229jtkdpn09
data/Smarty/templates/default/list.tpl ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/Smarty/templates/default/shopping/confirm.tpl ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/SC_CartSession.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/SC_Product.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/pages/cart/LC_Page_Cart.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
data/class/pages/products/LC_Page_Products_List.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
data/class/pages/shopping/LC_Page_Shopping_Complete.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20101013090124-oqet9229jtkdpn09
data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20101013084914-tqtme0o2qlpunxyz
bzr:timestamp:
2010-10-13 18:03:42.963999987 +0900
bzr:user-agent:
bzr2.2.0+bzr-svn1.0.3
svn:original-date:
2010-10-13T09:03:42.964000Z
Message:

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

  • SC_CartSession をリファクタリング
  • 商品情報を SC_CartSession で取得するように変更
  • SC_Helper_DB::sfTotalCart() の実装を SC_CartSession へ移動
  • SC_Product で, 規格分類名を name に格納していたのを classcategory_name へ変更
  • カート関連の処理を修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

    r18833 r18852  
    8585        // カート集計処理 
    8686        $this->cartKey = $_SESSION['cartKey']; 
    87         $objDb->sfTotalCart($this, $objCartSess, $this->cartKey); 
     87        $cartItems = $objCartSess->getCartList($this->cartKey); 
     88        $i = 0; 
     89        foreach (array_keys($cartItems) as $itemKey) { 
     90            $cartItem =& $cartItems[$itemKey]; 
     91            if (!SC_Utils_Ex::isBlank($cartItem)) { 
     92                $this->cartItems[$i] =& $cartItem; 
     93                $i++; 
     94            } 
     95        } 
     96        $this->tpl_message = $objCartSess->checkProducts($this->cartKey); 
     97        $this->tpl_total_pretax[$this->cartKey] = $objCartSess->getAllProductsTotal($this->cartKey); 
     98        $this->tpl_total_tax[$this->cartKey] = $objCartSess->getAllProductsTax($this->cartKey); 
     99        // ポイント合計 
     100        $this->tpl_total_point[$this->cartKey] = $objCartSess->getAllProductsPoint($this->cartKey); 
     101 
    88102        if (strlen($this->tpl_message) >= 1) { 
    89103            SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true); 
    90104        } 
     105 
     106        // TODO リファクタリング 
    91107        // 一時受注テーブルの読込 
    92         $arrData = $objDb->sfGetOrderTemp($uniqid); 
     108        $tmpData = $objDb->sfGetOrderTemp($uniqid); 
     109 
    93110        // カート集計を元に最終計算 
    94         $arrData = $objDb->sfTotalConfirm($arrData, $this, $objCartSess, null, $objCustomer); 
     111        $arrData = $objDb->sfTotalConfirm($this->cartItems, $this, $objCartSess, null, $objCustomer, $this->cartKey); 
     112        $arrData = array_merge($tmpData, $arrData); 
    95113        // キャンペーンからの遷移で送料が無料だった場合の処理 
    96114        if($objCampaignSess->getIsCampaign()) { 
     
    137155 
    138156            // 集計結果を受注一時テーブルに反映 
     157            unset($arrData[0]); // TODO 
     158            unset($arrData[1]); 
    139159            $objDb->sfRegistTempOrder($uniqid, $arrData); 
    140160            // 正常に登録されたことを記録しておく 
Note: See TracChangeset for help on using the changeset viewer.