Changeset 18830 for branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

Timestamp:

2010/09/29 18:03:38 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100927103023-gxi8k3mun5ajq1th

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/detail.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fdetail.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/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/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.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

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100929090334-re3rzc4b55n2u27e

bzr:revno:

2313

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-09-29 18:03:34.467999935 +0900

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-09-29T09:03:34.468000Z

Message:

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

• dtb_products_class.down を使用した暫定的な対応

File:

• branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php (modified) (9 diffs)

branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

@@ -245 +245 @@
      * @return LC_Page 集計処理後のページクラスインスタンス
      */
-    function sfTotalCart(&$objPage, $objCartSess, $dummy1 = null) {
-
-        // 規格名一覧
-        $arrClassName = $this->sfGetIDValueList("dtb_class", "class_id", "name");
-        // 規格分類名一覧
-        $arrClassCatName = $this->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
-
-        $objPage->tpl_total_pretax = 0;     // 費用合計(税込み)
-        $objPage->tpl_total_tax = 0;        // 消費税合計
-        $objPage->tpl_total_point = 0;      // ポイント合計
+    function sfTotalCart(&$objPage, $objCartSess, $dummy1 = null, $key = "") {
+
+        $objPage->tpl_total_pretax[$key] = 0;     // 費用合計(税込み)
+        $objPage->tpl_total_tax[$key] = 0;        // 消費税合計
+        $objPage->tpl_total_point[$key] = 0;      // ポイント合計
 
         $objProduct = new SC_Product();
@@ -298 +293 @@
                 $arrQuantityInfo_by_product[$product_id]['name'] = $arrData['name'];
 
-                $objPage->arrProductsClass[$cnt] = $arrData;
-                $objPage->arrProductsClass[$cnt]['quantity'] = $quantity;
-                $objPage->arrProductsClass[$cnt]['cart_no'] = $arrCart['cart_no'];
-                $objPage->arrProductsClass[$cnt]['class_name1'] =
+                $objPage->arrProductsClass[$cnt][$key] = $arrData;
+                $objPage->arrProductsClass[$cnt]['quantity'][$key] = $quantity;
+                $objPage->arrProductsClass[$cnt]['cart_no'][$key] = $arrCart['cart_no'];
+                $objPage->arrProductsClass[$cnt]['class_name1'][$key] =
                     isset($arrData['class_name1'])
                         ? $arrData['class_name1'] : "";
 
-                $objPage->arrProductsClass[$cnt]['class_name2'] =
+                $objPage->arrProductsClass[$cnt]['class_name2'][$key] =
                     isset($arrData['class_name2'])
                         ? $arrData['class_name2'] : "";
 
-                $objPage->arrProductsClass[$cnt]['classcategory_name1'] = $arrData['name1'];
-
-                $objPage->arrProductsClass[$cnt]['classcategory_name2'] = $arrData['name2'];
+                $objPage->arrProductsClass[$cnt]['classcategory_name1'][$key] = $arrData['name1'];
+
+                $objPage->arrProductsClass[$cnt]['classcategory_name2'][$key] = $arrData['name2'];
                 // 価格の登録
                 $objCartSess->setProductValue($arrCart['id'], 'price', $arrData['price02']);
-                $objPage->arrProductsClass[$cnt]['uniq_price'] = $arrData['price02'];
+                $objPage->arrProductsClass[$cnt]['uniq_price'][$key] = $arrData['price02'];
                 // ポイント付与率の登録
                 if (USE_POINT !== false) {
@@ -320 +315 @@
                 }
                 // 商品ごとの合計金額
-                $objPage->arrProductsClass[$cnt]['total_pretax'] = $objCartSess->getProductTotal($arrCart['id']);
+                $objPage->arrProductsClass[$cnt]['total_pretax'][$key] = $objCartSess->getProductTotal($arrCart['id']);
                 // 送料の合計を計算する
-                $objPage->tpl_total_deliv_fee+= ($arrData['deliv_fee'] * $arrCart['quantity']);
+                $objPage->tpl_total_deliv_fee[$key] += ($arrData['deliv_fee'] * $arrCart['quantity']);
                 $cnt++;
             } else { // DBに商品が見つからない場合、
@@ -335 +330 @@
                 $objPage->tpl_error = "※「{$quantityInfo['name']}」は数量「{$quantityInfo['sale_limit']}」以下に販売制限しております。一度にこれ以上の購入はできません。\n";
                 // 販売制限に引っかかった商品をマークする
-                foreach (array_keys($objPage->arrProductsClass) as $key) {
-                    $ProductsClass =& $objPage->arrProductsClass[$key];
+                foreach (array_keys($objPage->arrProductsClass) as $k) {
+                    $ProductsClass =& $objPage->arrProductsClass[$k];
                     if ($ProductsClass['product_id'] == $product_id) {
                         $ProductsClass['error'] = true;
@@ -345 +340 @@
 
         // 全商品合計金額(税込み)
-        $objPage->tpl_total_pretax = $objCartSess->getAllProductsTotal();
+        $objPage->tpl_total_pretax[$key] = $objCartSess->getAllProductsTotal();
         // 全商品合計消費税
-        $objPage->tpl_total_tax = $objCartSess->getAllProductsTax();
+        $objPage->tpl_total_tax[$key] = $objCartSess->getAllProductsTax();
         // 全商品合計ポイント
         if (USE_POINT !== false) {
-            $objPage->tpl_total_point = $objCartSess->getAllProductsPoint();
+            $objPage->tpl_total_point[$key] = $objCartSess->getAllProductsPoint();
         }
 
@@ -1447 +1442 @@
      * @return array 最終計算後の配列
      */
-    function sfTotalConfirm($arrData, &$objPage, &$objCartSess, $dummy1 = null, $objCustomer = "") {
+    function sfTotalConfirm($arrData, &$objPage, &$objCartSess, $dummy1 = null, $objCustomer = "", $key = "") {
         // 店舗基本情報を取得する
         $arrInfo = SC_Helper_DB_Ex::sf_getBasisData();
@@ -1459 +1454 @@
 
         // 税金の取得
-        $arrData['tax'] = $objPage->tpl_total_tax;
+        $arrData['tax'] = $objPage->tpl_total_tax[$key];
         // 小計の取得
-        $arrData['subtotal'] = $objPage->tpl_total_pretax;
+        $arrData['subtotal'] = $objPage->tpl_total_pretax[$key];
 
         // 合計送料の取得
@@ -1502 +1497 @@
 
         // 合計の計算
-        $arrData['total'] = $objPage->tpl_total_pretax; // 商品合計
+        $arrData['total'] = $objPage->tpl_total_pretax[$key]; // 商品合計
         $arrData['total']+= $arrData['deliv_fee'];      // 送料
         $arrData['total']+= $arrData['charge'];         // 手数料
@@ -1509 +1504 @@
         // 加算ポイントの計算
         if (USE_POINT !== false) {
-            $arrData['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($objPage->tpl_total_point, $arrData['use_point']);
+            $arrData['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($objPage->tpl_total_point[$key], $arrData['use_point']);
 
             if($objCustomer != "") {