Changeset 18705 for branches/version-2_4/data

Timestamp:

2010/06/16 13:31:53 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100615085540-414g9otzmiljpc10

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

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/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100616043149-lhr1rbqldxfqlakc

bzr:revno:

1918

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/class/helper/SC_Helper_DB.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521
data/mtb_constants_init.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521
html/install/sql/insert_data.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18521

bzr:timestamp:

2010-06-16 13:31:49.904999971 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-16T04:31:49.905000Z

Message:

merged r18583, r18601, r18704

• SALE_LIMIT_MAX が無視されているのを修正(#545)

Location:

branches/version-2_4/data

Files:

• class/helper/SC_Helper_DB.php (modified) (1 diff)
• mtb_constants_init.php (modified) (1 diff)

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

@@ -312 +312 @@
                 // 購入制限数を求める。
                 if ($arrData['stock_unlimited'] != '1' && $arrData['sale_unlimited'] != '1') {
-                    if($arrData['sale_limit'] < $arrData['stock']) {
-                        $limit = $arrData['sale_limit'];
+                    $limit = min($arrData['sale_limit'], $arrData['stock']);
+                } elseif ($arrData['sale_unlimited'] != '1') {
+                    $limit = $arrData['sale_limit'];
+                } else {
+                    // 購入制限なしの場合は、SALE_LIMIT_MAXが最大購入個数
+                    // 但し、SALE_LIMIT_MAXは、有効な整数値でないと機能しない
+
+                    if ($arrData['stock_unlimited'] != '1') {
+                        // 在庫制限がある場合は、SALE_LIMIT_MAXと在庫数の小さい方が購入可能最大数
+                        if (SALE_LIMIT_MAX > 0) {
+                            $limit = min(SALE_LIMIT_MAX, $arrData['stock']);
+                        } else {
+                            $limit = $arrData['stock'];
+                        }
                     } else {
-                        // 購入制限数を在庫数に
-                        #$limit = $arrData['stock'];
-                        // 購入制限数をSALE_LIMIT_MAXに
-                        $limit = SALE_LIMIT_MAX;
-                    }
-                } else {
-                    if ($arrData['sale_unlimited'] != '1') {
-                        $limit = $arrData['sale_limit'];
-                    }
-                    if ($arrData['stock_unlimited'] != '1') {
-                        // 購入制限数を在庫数に
-                        #$limit = $arrData['stock'];
-                        // 購入制限数をSALE_LIMIT_MAXに
-                        $limit = SALE_LIMIT_MAX;
+                        if (SALE_LIMIT_MAX > 0) {
+                            $limit = SALE_LIMIT_MAX;
+                        }
                     }
                 }

branches/version-2_4/data/mtb_constants_init.php

@@ -382 +382 @@
 define('FILE_NAME_LEN', 10);
 /** 購入制限なしの場合の最大購入個数 */
-define('SALE_LIMIT_MAX', 10);
+define('SALE_LIMIT_MAX', 0);
 /** HTMLタイトル */
 define('SITE_TITLE', "ＥＣ-ＣＵＢＥ  テストサイト");