Changeset 18465 for branches

Timestamp:

2010/01/06 14:05:22 (14 years ago)

Author:

Yammy

Message:

http://svn.ec-cube.net/open_trac/ticket/545
SALE_LIMIT_MAX が無視されている

対応

Location:

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

Files:

• helper/SC_Helper_DB.php (modified) (2 diffs)
• pages/products/LC_Page_Products_Detail.php (modified) (2 diffs)
• pages/products/LC_Page_Products_List.php (modified) (2 diffs)

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

@@ -315 +315 @@
                         $limit = $arrData['sale_limit'];
                     } else {
-                        $limit = $arrData['stock'];
+                        // 購入制限数を在庫数に
+                        #$limit = $arrData['stock'];
+                        // 購入制限数をSALE_LIMIT_MAXに
+                        $limit = SALE_LIMIT_MAX;
                     }
                 } else {
@@ -322 +325 @@
                     }
                     if ($arrData['stock_unlimited'] != '1') {
-                        $limit = $arrData['stock'];
+                        // 購入制限数を在庫数に
+                        #$limit = $arrData['stock'];
+                        // 購入制限数をSALE_LIMIT_MAXに
+                        $limit = SALE_LIMIT_MAX;
                     }
                 }

branches/version-2_4-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -222 +222 @@
         $this->arrProductCode = $arrProductCode["product_code"];
 
-        // 購入制限数を取得
-        if($this->arrProduct['sale_unlimited'] == 1 || $this->arrProduct['sale_limit'] > SALE_LIMIT_MAX) {
-          $this->tpl_sale_limit = SALE_LIMIT_MAX;
-        } else {
-          $this->tpl_sale_limit = $this->arrProduct['sale_limit'];
-        }
         // サブタイトルを取得
         $arrCategory_id = $objDb->sfGetCategoryId($arrRet[0]['product_id'],'',$status);
@@ -445 +439 @@
         $arrProductCode = SC_Utils_Ex::sfswaparray($arrProductCode);
         $this->arrProductCode = $arrProductCode["product_code"];
-
-        // 購入制限数を取得
-        if($this->arrProduct['sale_unlimited'] == 1 || $this->arrProduct['sale_limit'] > SALE_LIMIT_MAX) {
-            $this->tpl_sale_limit = SALE_LIMIT_MAX;
-        } else {
-            $this->tpl_sale_limit = $this->arrProduct['sale_limit'];
-        }
 
         // サブタイトルを取得

branches/version-2_4-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -542 +542 @@
             for($i = 0; $i < count($this->arrProducts); $i++) {
                 $this->lfMakeSelect($this->arrProducts[$i]['product_id'], $arrClassName, $arrClassCatName);
-                // 購入制限数を取得
-                $this->lfGetSaleLimit($this->arrProducts[$i]);
             }
         }
@@ -716 +714 @@
     }
 
-    // 購入制限数の設定
-    function lfGetSaleLimit($product) {
-        //在庫が無限または購入制限値が設定値より大きい場合
-        if($product['sale_unlimited'] == 1 || $product['sale_limit'] > SALE_LIMIT_MAX) {
-            $this->tpl_sale_limit[$product['product_id']] = SALE_LIMIT_MAX;
-        } else {
-            $this->tpl_sale_limit[$product['product_id']] = $product['sale_limit'];
-        }
-    }
-
     //支払方法の取得
     //payment_id    1:代金引換　2:銀行振り込み　3:現金書留