Index: /branches/version-2_12-dev/html/install/index.php =================================================================== --- /branches/version-2_12-dev/html/install/index.php (revision 21756) +++ /branches/version-2_12-dev/html/install/index.php (revision 21810) @@ -519,4 +519,5 @@ $arrDsn = getArrayDsn($objDBParam); + $sqlval['id'] = 1; $sqlval['shop_name'] = $objWebParam->getValue('shop_name'); $sqlval['email01'] = $objWebParam->getValue('admin_mail'); Index: /branches/version-2_12-dev/html/install/sql/insert_data.sql =================================================================== --- /branches/version-2_12-dev/html/install/sql/insert_data.sql (revision 21798) +++ /branches/version-2_12-dev/html/install/sql/insert_data.sql (revision 21810) @@ -682,8 +682,8 @@ INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 37, 'ご利用ガイド/運営会社紹介', 'guide/about.php', 'guide/about', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); -INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, '郵便振替', 0, NULL, 4, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (2, '現金書留', 0, NULL, 3, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (3, '銀行振込', 0, NULL, 2, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO dtb_payment (payment_id, payment_method, charge, rule, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (4, '代金引換', 0, NULL, 1, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (1, '郵便振替', 0, NULL, 4, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (2, '現金書留', 0, NULL, 3, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (3, '銀行振込', 0, NULL, 2, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO dtb_payment (payment_id, payment_method, charge, rule_max, rank, note, fix, status, del_flg, creator_id, create_date, update_date, payment_image, upper_rule, charge_flg, rule_min, upper_rule_max, module_id, module_path, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10) VALUES (4, '代金引換', 0, NULL, 1, NULL, 2, 1, 0, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO dtb_product_categories (product_id, category_id, rank) VALUES (1, 5, 1); Index: /branches/version-2_12-dev/html/install/sql/create_table_mysql.sql =================================================================== --- /branches/version-2_12-dev/html/install/sql/create_table_mysql.sql (revision 21795) +++ /branches/version-2_12-dev/html/install/sql/create_table_mysql.sql (revision 21810) @@ -12,5 +12,6 @@ CREATE TABLE dtb_ownersstore_settings ( - public_key text + public_key text, + PRIMARY KEY(public_key(64)) ); @@ -41,8 +42,10 @@ CREATE TABLE mtb_zip ( + zip_id int, zipcode text, state text, city text, - town text + town text, + PRIMARY KEY (zip_id) ); @@ -66,4 +69,5 @@ CREATE TABLE dtb_baseinfo ( + id int, company_name text, company_kana text, @@ -129,5 +133,6 @@ longitude text, downloadable_days numeric DEFAULT 30, - downloadable_days_unlimited smallint + downloadable_days_unlimited smallint, + PRIMARY KEY (id) ); @@ -174,5 +179,5 @@ payment_method text, charge numeric, - rule numeric, + rule_max numeric, rank int, note text, @@ -387,5 +392,6 @@ creator_id int NOT NULL, create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_date timestamp NOT NULL + update_date timestamp NOT NULL, + PRIMARY KEY (recommend_product_id) ); @@ -628,5 +634,6 @@ memo09 text, memo10 text, - session text + session text, + PRIMARY KEY (order_temp_id(64)) ); @@ -1085,5 +1092,6 @@ param_value text, url text, - create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (session_id(255)) ); @@ -1096,5 +1104,6 @@ del_flg smallint NOT NULL DEFAULT 0, create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_date timestamp NOT NULL + update_date timestamp NOT NULL, + PRIMARY KEY (module_id) ); Index: /branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql =================================================================== --- /branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql (revision 21795) +++ /branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql (revision 21810) @@ -12,5 +12,6 @@ CREATE TABLE dtb_ownersstore_settings ( - public_key text + public_key text, + PRIMARY KEY(public_key) ); @@ -41,8 +42,10 @@ CREATE TABLE mtb_zip ( + zip_id int, zipcode text, state text, city text, - town text + town text, + PRIMARY KEY (zip_id) ); @@ -66,4 +69,5 @@ CREATE TABLE dtb_baseinfo ( + id int, company_name text, company_kana text, @@ -129,5 +133,6 @@ longitude text, downloadable_days numeric DEFAULT 30, - downloadable_days_unlimited smallint + downloadable_days_unlimited smallint, + PRIMARY KEY (id) ); @@ -174,5 +179,5 @@ payment_method text, charge numeric, - rule numeric, + rule_max numeric, rank int, note text, @@ -387,5 +392,6 @@ creator_id int NOT NULL, create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_date timestamp NOT NULL + update_date timestamp NOT NULL, + PRIMARY KEY (recommend_product_id) ); @@ -628,5 +634,6 @@ memo09 text, memo10 text, - session text + session text, + PRIMARY KEY (order_temp_id) ); @@ -1085,5 +1092,6 @@ param_value text, url text, - create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP + create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (session_id) ); @@ -1096,5 +1104,6 @@ del_flg smallint NOT NULL DEFAULT 0, create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_date timestamp NOT NULL + update_date timestamp NOT NULL, + PRIMARY KEY (module_id) ); Index: /branches/version-2_12-dev/data/Smarty/templates/admin/basis/payment_input.tpl =================================================================== --- /branches/version-2_12-dev/data/Smarty/templates/admin/basis/payment_input.tpl (revision 21539) +++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/payment_input.tpl (revision 21810) @@ -63,5 +63,5 @@