Changeset 18829 for branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php

Timestamp:

2010/09/27 19:30:37 (14 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

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/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/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/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/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-20100927102325-k7kq5liftg1lhyoq

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100927103023-gxi8k3mun5ajq1th

bzr:revno:

2312

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/list.tpl ohkouchi@loop-az.jp-20100927102325-k7kq5liftg1lhyoq
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20100927102325-k7kq5liftg1lhyoq
data/class/pages/cart/LC_Page_Cart.php ohkouchi@loop-az.jp-20100927102325-k7kq5liftg1lhyoq
data/class/pages/shopping/LC_Page_Shopping_Complete.php ohkouchi@loop-az.jp-20100927102325-k7kq5liftg1lhyoq

bzr:timestamp:

2010-09-27 19:30:23.668999910 +0900

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-09-27T10:30:23.669000Z

Message:

#781(規格のデータベースを木構造に)

• カートの中身を product_class_id で特定するように修正

File:

• branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php (modified) (3 diffs)

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

@@ -536 +536 @@
         $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
 
+        $objProduct = new SC_Product();
         for ($i = 0; $i < $max; $i++) {
             // 商品規格情報の取得
-            $arrData = $objDb->sfGetProductsClass($arrCart[$i]['id']);
+            $arrData = $objProduct->getDetailAndProductsClass($arrCart[$i]['id']);
 
             // 存在する商品のみ表示する。
             if($arrData != "") {
                 $sqlval['order_id'] = $order_id;
-                $sqlval['product_id'] = $arrCart[$i]['id'][0];
-                $sqlval['product_class_id'] = $arrCart[$i]['id'][1];
-                $sqlval['classcategory_id1'] = $arrCart[$i]['id'][2];
-                $sqlval['classcategory_id2'] = $arrCart[$i]['id'][3];
+                $sqlval['product_id'] = $arrData['product_id'];
+                $sqlval['product_class_id'] = $arrData['product_class_id'];
+                // FIXME product_class_id のみで対応予定のため暫定対応
+                $sqlval['classcategory_id1'] = is_null($arrData['classcategory_id1']) ? 0 : $sqlval['classcategory_id1'];
+                $sqlval['classcategory_id2'] = is_null($arrData['classcategory_id2']) ? 0 : $sqlval['classcategory_id2'];
                 $sqlval['product_name'] = $arrData['name'];
                 $sqlval['product_code'] = $arrData['product_code'];
-                $sqlval['classcategory_name1'] = $arrClassCatName[$arrData['classcategory_id1']];
-                $sqlval['classcategory_name2'] = $arrClassCatName[$arrData['classcategory_id2']];
+                $sqlval['classcategory_name1'] = $arrData['name1'];
+                $sqlval['classcategory_name2'] = $arrData['name2'];
                 $sqlval['point_rate'] = $arrCart[$i]['point_rate'];
                 $sqlval['price'] = $arrCart[$i]['price'];
@@ -665 +667 @@
     }
 
-    // 在庫を減らす処理
-    function lfReduceStock(&$objQuery, $arrID, $quantity) {
+    /**
+     * 在庫を減らす処理
+     *
+     * FIXME 件数カウントバッチは最後にまとめて実行すること.
+     */
+    function lfReduceStock(&$objQuery, $product_class_id, $quantity) {
         $objDb = new SC_Helper_DB_Ex();
 
@@ -675 +681 @@
 
         $objProduct = new SC_Product();
-        $productsClass = $objProduct->getProductsClassFullByProductId($arrID[0]);
-
-        foreach ($productsClass as $val) {
-            if ($val['classcategory_id1'] == $arrID[2]
-                && $val['classcategory_id2'] == $arrID[3]) {
-
-                if (($val['stock_unlimited'] != '1' && $val['stock'] < $quantity) || $quantity == 0) {
-                    // 売り切れエラー
-                    $objQuery->rollback();
-                    SC_Utils_Ex::sfDispSiteError(SOLD_OUT, "", true);
-                }
-
-                // 在庫を減らす
-                $arrRawSql = array();
-                $arrRawSql['stock'] = 'stock - ?';
-                $arrRawSqlVal[] = $quantity;
-                $objQuery->update('dtb_products_class', array(), "product_class_id = ?", array($val['product_class_id']), $arrRawSql, $arrRawSqlVal);
-                break;
-            }
-        }
+        $productsClass = $objProduct->getDetailAndProductsClass($product_class_id);
+
+        if (($productsClass['stock_unlimited'] != '1' && $productsClass['stock'] < $quantity)
+            || $quantity == 0) {
+            // 売り切れエラー
+            $objQuery->rollback();
+            SC_Utils_Ex::sfDispSiteError(SOLD_OUT, "", true);
+        }
+
+        // 在庫を減らす
+        $arrRawSql = array();
+        $arrRawSql['stock'] = 'stock - ?';
+        $arrRawSqlVal[] = $quantity;
+        $objQuery->update('dtb_products_class', array(), "product_class_id = ?", array($val['product_class_id']), $arrRawSql, $arrRawSqlVal);
 
         // 在庫無し商品の非表示対応