Changeset 18275 for branches/comu-ver2/html

Timestamp:

2009/09/01 15:04:37 (15 years ago)

Author:

Seasoft

Message:

• #540(LC_Page_Shopping_Confirm#process 「カート内の商品の売り切れチェック」が動作していない)を改修。
• #544(サンプルデータで在庫制限が異常動作)を改修。
• #534(dtb_products.sale_unlimited は不要)を改善。

Location:

branches/comu-ver2/html

Files:

• install/sql/column_comment.sql (modified) (1 diff)
• install/sql/create_table_mysql.sql (modified) (1 diff)
• install/sql/create_table_pgsql.sql (modified) (1 diff)
• install/sql/create_view.sql (modified) (1 diff)
• install/sql/insert_data.sql (modified) (1 diff)
• user_data/packages/default/js/admin.js (modified) (1 diff)

branches/comu-ver2/html/install/sql/column_comment.sql

@@ -143 +143 @@
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','deliv_fee','商品送料');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','sale_limit','購入制限数');
-INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','sale_unlimited','購入制限（1:購入制限無し)');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','category_id','商品カテゴリー');
 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_products','rank','表示ランク');

branches/comu-ver2/html/install/sql/create_table_mysql.sql

@@ -276 +276 @@
     deliv_fee numeric,
     sale_limit numeric,
-    sale_unlimited smallint DEFAULT 0,
     category_id int,
     maker_id int,

branches/comu-ver2/html/install/sql/create_table_pgsql.sql

@@ -284 +284 @@
     deliv_fee numeric,
     sale_limit numeric,
-    sale_unlimited int2 DEFAULT 0,
     category_id int4,
     maker_id int4,

branches/comu-ver2/html/install/sql/create_view.sql

@@ -65 +65 @@
         dtb_products.deliv_fee,
         dtb_products.sale_limit,
-        dtb_products.sale_unlimited,
         dtb_products.maker_id,
         dtb_products.rank,

branches/comu-ver2/html/install/sql/insert_data.sql

@@ -311 +311 @@
 INSERT INTO dtb_payment (payment_method,charge,rule,deliv_id,rank,note,fix,status,del_flg,creator_id,create_date,update_date,payment_image,upper_rule) VALUES ('代金引換', 0, NULL, 1, 1, NULL, 2, 1, 0, 1, now(), now(), NULL, NULL);
 
-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)
-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);
-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)
-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);
+INSERT INTO dtb_products (name,deliv_fee,sale_limit,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)
+VALUES ('アイスクリーム', 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);
+INSERT INTO dtb_products (name,deliv_fee,sale_limit,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)
+VALUES ('おなべ', NULL, 5, 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);
 
 INSERT INTO dtb_products_class (product_id,classcategory_id1,classcategory_id2,product_code,stock,stock_unlimited,sale_limit,price01,price02,status,creator_id,create_date,update_date)

branches/comu-ver2/html/user_data/packages/default/js/admin.js

@@ -279 +279 @@
 }
 
-// 購入制限数判定
-function fnCheckSaleLimit(icolor) {
-    list = new Array(
-        'sale_limit'
-        );
-    if(document.form1['sale_unlimited'].checked) {
-        fnChangeDisabled(list, icolor);
-        document.form1['sale_limit'].value = "";
-    } else {
-        fnChangeDisabled(list, '');
-    }
-}
-
 // 在庫数判定
 function fnCheckAllStockLimit(max, icolor) {