Changeset 18705
- Timestamp:
- 2010/06/16 13:31:53 (14 years ago)
- 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
- Location:
- branches/version-2_4
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_4/data/class/helper/SC_Helper_DB.php
r18521 r18705 312 312 // 購入制限数を求める。 313 313 if ($arrData['stock_unlimited'] != '1' && $arrData['sale_unlimited'] != '1') { 314 if($arrData['sale_limit'] < $arrData['stock']) { 315 $limit = $arrData['sale_limit']; 314 $limit = min($arrData['sale_limit'], $arrData['stock']); 315 } elseif ($arrData['sale_unlimited'] != '1') { 316 $limit = $arrData['sale_limit']; 317 } else { 318 // 購入制限なしの場合は、SALE_LIMIT_MAXが最大購入個数 319 // 但し、SALE_LIMIT_MAXは、有効な整数値でないと機能しない 320 321 if ($arrData['stock_unlimited'] != '1') { 322 // 在庫制限がある場合は、SALE_LIMIT_MAXと在庫数の小さい方が購入可能最大数 323 if (SALE_LIMIT_MAX > 0) { 324 $limit = min(SALE_LIMIT_MAX, $arrData['stock']); 325 } else { 326 $limit = $arrData['stock']; 327 } 316 328 } else { 317 // 購入制限数を在庫数に 318 #$limit = $arrData['stock']; 319 // 購入制限数をSALE_LIMIT_MAXに 320 $limit = SALE_LIMIT_MAX; 321 } 322 } else { 323 if ($arrData['sale_unlimited'] != '1') { 324 $limit = $arrData['sale_limit']; 325 } 326 if ($arrData['stock_unlimited'] != '1') { 327 // 購入制限数を在庫数に 328 #$limit = $arrData['stock']; 329 // 購入制限数をSALE_LIMIT_MAXに 330 $limit = SALE_LIMIT_MAX; 329 if (SALE_LIMIT_MAX > 0) { 330 $limit = SALE_LIMIT_MAX; 331 } 331 332 } 332 333 } -
branches/version-2_4/data/mtb_constants_init.php
r18521 r18705 382 382 define('FILE_NAME_LEN', 10); 383 383 /** 購入制限なしの場合の最大購入個数 */ 384 define('SALE_LIMIT_MAX', 10);384 define('SALE_LIMIT_MAX', 0); 385 385 /** HTMLタイトル */ 386 386 define('SITE_TITLE', "EC-CUBE テストサイト"); -
branches/version-2_4/html/install/sql/insert_data.sql
r18521 r18705 316 316 317 317 INSERT INTO dtb_products (name,deliv_fee,sale_limit,sale_unlimited,category_id,rank,status,product_flag,point_rate,comment1,comment2,comment3,comment4,comment5,comment6,file1,file2,file3,file4,file5,file6,main_list_comment,main_list_image,main_comment,main_image,main_large_image,sub_title1,sub_comment1,sub_image1,sub_large_image1,sub_title2,sub_comment2,sub_image2,sub_large_image2,sub_title3,sub_comment3,sub_image3,sub_large_image3,sub_title4,sub_comment4,sub_image4,sub_large_image4,sub_title5,sub_comment5,sub_image5,sub_large_image5,sub_title6,sub_comment6,sub_image6,sub_large_image6,del_flg,creator_id,create_date,update_date,deliv_date_id) 318 VALUES ('アイスクリーム', NULL, NULL, NULL, 5, 1, 1, '10010', 10, NULL, NULL, 'アイス,バニラ,チョコ,抹茶', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '暑い夏にどうぞ。', '08311201_44f65122ee5fe.jpg', '冷たいものはいかがですか?', '08311202_44f6515906a41.jpg', '08311203_44f651959bcb5.jpg', NULL, '<b>おいしいよ<b>', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 2);318 VALUES ('アイスクリーム', NULL, NULL, 1, 5, 1, 1, '10010', 10, NULL, NULL, 'アイス,バニラ,チョコ,抹茶', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '暑い夏にどうぞ。', '08311201_44f65122ee5fe.jpg', '冷たいものはいかがですか?', '08311202_44f6515906a41.jpg', '08311203_44f651959bcb5.jpg', NULL, '<b>おいしいよ<b>', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 2); 319 319 INSERT INTO dtb_products (name,deliv_fee,sale_limit,sale_unlimited,category_id,rank,status,product_flag,point_rate,comment1,comment2,comment3,comment4,comment5,comment6,file1,file2,file3,file4,file5,file6,main_list_comment,main_list_image,main_comment,main_image,main_large_image,sub_title1,sub_comment1,sub_image1,sub_large_image1,sub_title2,sub_comment2,sub_image2,sub_large_image2,sub_title3,sub_comment3,sub_image3,sub_large_image3,sub_title4,sub_comment4,sub_image4,sub_large_image4,sub_title5,sub_comment5,sub_image5,sub_large_image5,sub_title6,sub_comment6,sub_image6,sub_large_image6,del_flg,creator_id,create_date,update_date,deliv_date_id) 320 320 VALUES ('おなべ', NULL, 5, NULL, NULL, 1, 1, '11001', 5, NULL, NULL, '鍋,なべ,ナベ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '一人用からあります。', '08311311_44f661811fec0.jpg', 'たまには鍋でもどうでしょう。', '08311313_44f661dc649fb.jpg', '08311313_44f661e5698a6.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, now(), now(), 3); … … 967 967 INSERT INTO mtb_constants VALUES ('SEARCH_CATEGORY_LEN','18',208,'検索カテゴリ最大表示文字数(byte)'); 968 968 INSERT INTO mtb_constants VALUES ('FILE_NAME_LEN','10',209,'ファイル名表示文字数'); 969 INSERT INTO mtb_constants VALUES ('SALE_LIMIT_MAX',' 10',210,'購入制限なしの場合の最大購入個数');969 INSERT INTO mtb_constants VALUES ('SALE_LIMIT_MAX','0',210,'購入制限なしの場合の最大購入個数'); 970 970 INSERT INTO mtb_constants VALUES ('SITE_TITLE','"EC-CUBE テストサイト"',211,'HTMLタイトル'); 971 971 INSERT INTO mtb_constants VALUES ('COOKIE_EXPIRE','365',212,'クッキー保持期限(日)');
Note: See TracChangeset
for help on using the changeset viewer.