Changeset 19815 for branches/version-2_5-dev/data/class

Timestamp:

2011/01/04 15:49:20 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19814

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.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/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
html/user_data/packages/default/css/under02.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Funder02.css

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2544

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 [email protected]
data/class/SC_CartSession.php [email protected]
data/class/pages/cart/LC_Page_Cart.php [email protected]
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php [email protected]
html/user_data/packages/default/css/under02.css [email protected]

bzr:timestamp:

2011-01-04 15:49:12.770999908 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-04T06:49:12.771000Z

Message:

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

• 「現在のカゴの中」の表示を修正

Location:

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

Files:

• SC_CartSession.php (modified) (1 diff)
• pages/cart/LC_Page_Cart.php (modified) (2 diffs)
• pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_CartSession.php

@@ -565 +565 @@
 
     function getKeys() {
+        $keys = array_keys($this->cartSession);
+        // 数量が 0 の商品種別は削除する
+        foreach ($keys as $key) {
+            $quantity = $this->getTotalQuantity($key);
+            if ($quantity < 1) {
+                unset($this->cartSession[$key]);
+            }
+        }
         return array_keys($this->cartSession);
     }

branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php

@@ -59 +59 @@
         parent::init();
         $this->tpl_title = "現在のカゴの中";
+        $masterData = new SC_DB_MasterData_Ex();
+        $this->arrProductType = $masterData->getMasterData("mtb_product_type");
+
     }
 
@@ -150 +153 @@
             // ポイント合計
             $this->tpl_total_point[$key] = $objCartSess->getAllProductsPoint($key);
-            $this->arrData = $objCartSess->calculate($key, $objCustomer);
-
+
+            $this->arrData[$key] = $objCartSess->calculate($key, $objCustomer);
             // 送料無料までの金額を計算
             $this->tpl_deliv_free[$key] = $this->arrInfo['free_rule'] - $this->tpl_total_inctax[$key];

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

@@ -81 +81 @@
                 }
             }
-            // 店舗情報の取得
-            $arrInfo = $objSiteInfo->data;
             // 購入金額合計
-            $ProductsTotal = $objCart->getAllProductsTotal($cartKey);
+            $ProductsTotal += $objCart->getAllProductsTotal($cartKey);
+            // 合計数量
+            $TotalQuantity += $objCart->getTotalQuantity($cartKey);
 
-            // 合計数量
-            $TotalQuantity = $objCart->getTotalQuantity($cartKey);
+        }
 
-            // 送料無料までの金額
-            $arrCartList[0]['ProductsTotal'] = $ProductsTotal;
-            $arrCartList[0]['TotalQuantity'] = $TotalQuantity;
-            $deliv_free = $arrInfo['free_rule'] - $ProductsTotal;
-            $arrCartList[0]['free_rule'] = $arrInfo['free_rule'];
-            $arrCartList[0]['deliv_free'] = $deliv_free;
+        // 店舗情報の取得
+        $arrInfo = $objSiteInfo->data;
 
-            $this->arrCartList = $arrCartList;
-        }
+        // 送料無料までの金額
+        $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->arrCartList = $arrCartList;
     }