Changeset 18859 for branches/version-2_5-dev/data/class/pages/shopping

Timestamp:

2010/10/19 15:02:14 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.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/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/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2339

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-10-19 15:02:10.290999889 +0900

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-10-19T06:02:10.291000Z

Message:

ページ間の遷移方法の改善(#783)

• カート内集計の関数が VIEW に依存しないように修正
• SC_Helper_DB::sfTotalCart(), SC_Helper_DB::sfTotalConfirm() を SC_CartSession に移動

Location:

branches/version-2_5-dev/data/class/pages/shopping

Files:

• LC_Page_Shopping_Confirm.php (modified) (2 diffs)
• LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

@@ -87 +87 @@
         $cartItems = $objCartSess->getCartList($this->cartKey);
         $i = 0;
+        // TODO リファクタリング
         foreach (array_keys($cartItems) as $itemKey) {
             $cartItem =& $cartItems[$itemKey];
@@ -109 +110 @@
 
         // カート集計を元に最終計算
-        $arrData = $objDb->sfTotalConfirm($this->cartItems, $this, $objCartSess, null, $objCustomer, $this->cartKey);
-        $arrData = array_merge($tmpData, $arrData);
-        // キャンペーンからの遷移で送料が無料だった場合の処理
-        if($objCampaignSess->getIsCampaign()) {
-            $deliv_free_flg = $objQuery->get("dtb_campaign", "deliv_free_flg", "campaign_id = ?", array($objCampaignSess->getCampaignId()));
-            // 送料無料が設定されていた場合
-            if($deliv_free_flg) {
-                $arrData['payment_total'] -= $arrData['deliv_fee'];
-                $arrData['deliv_fee'] = 0;
-            }
-        }
+        // FIXME 使用ポイント, 配送都道府県, 支払い方法, 手数料の扱い
+        $arrData = array_merge($tmpData, $objCartSess->calculate($this->cartKey, $objCustomer));
 
         // 会員ログインチェック

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -113 +113 @@
 
         // カート内商品の集計処理を行う
-        $objDb->sfTotalCart($this, $objCartSess);
+        $this->cartKey = $_SESSION['cartKey'];
+        $cartItems = $objCartSess->getCartList($this->cartKey);
+        $i = 0;
+        // TODO リファクタリング
+        foreach (array_keys($cartItems) as $itemKey) {
+            $cartItem =& $cartItems[$itemKey];
+            if (!SC_Utils_Ex::isBlank($cartItem)) {
+                $this->cartItems[$i] =& $cartItem;
+                $i++;
+            }
+        }
+        $this->tpl_message = $objCartSess->checkProducts($this->cartKey);
+
         if (strlen($this->tpl_message) >= 1) {
             SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true);
         }
-
-        $this->arrData = $objDb->sfTotalConfirm(array(), $this, $objCartSess);
+        // FIXME 使用ポイント, 配送都道府県, 支払い方法, 手数料の扱い
+        $this->arrData = $objCartSess->calculate($this->cartKey, $objCustomer);
 
         if (!isset($_POST['mode'])) $_POST['mode'] = "";