Ignore:
Timestamp:
2011/01/10 13:59:23 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19859
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/default/shopping/deliv.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fdeliv.tpl
data/Smarty/templates/default/shopping/multiple.tpl multiple.tpl-20110109122547-u3fq5xmi1b4jn5n4-1
data/Smarty/templates/default/shopping/nonmember_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fnonmember_input.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Customer.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Customer.php
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/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/error/LC_Page_Error.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ferror%2FLC_Page_Error.php
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 16093@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DeliveryAddr.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-3
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/js/site.js site.js-20101208110316-7ungq6kj49bhw4d1-7
html/shopping/multiple.php multiple.php-20110109122547-u3fq5xmi1b4jn5n4-4
html/user_data/packages/default/css/under02.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Funder02.css
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110110045915-6b02oxleldtyw7ee
bzr:revno:
2589
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/default/shopping/deliv.tpl nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/Smarty/templates/default/shopping/multiple.tpl nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/Smarty/templates/default/shopping/nonmember_input.tpl nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/Smarty/templates/default/shopping/payment.tpl nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/SC_CartSession.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/SC_Customer.php nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/class/helper/SC_Helper_DB.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/error/LC_Page_Error.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/class/pages/shopping/LC_Page_Shopping.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/shopping/LC_Page_Shopping_Confirm.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/shopping/LC_Page_Shopping_Deliv.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/util/SC_Utils.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php nanasess@fsm.ne.jp-20110109122604-8059rgcurt250q06
html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20110109121902-2oqes35heyjm5nlc
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20110109121902-2oqes35heyjm5nlc
html/install/sql/drop_table.sql nanasess@fsm.ne.jp-20110109121902-2oqes35heyjm5nlc
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20110109122604-8059rgcurt250q06
html/js/site.js nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
html/shopping/multiple.php nanasess@fsm.ne.jp-20110109122604-8059rgcurt250q06
html/user_data/packages/default/css/under02.css nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
bzr:timestamp:
2011-01-10 13:59:15.388999939 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-10T04:59:15.389000Z
Message:

#843(複数配送先の指定)

  • とりあえず通常配送が通るように修正
Location:
branches/version-2_5-dev/html
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

    r19854 r19860  
    588588    order_birth datetime, 
    589589    order_job int, 
    590     deliv_name01 text, 
    591     deliv_name02 text, 
    592     deliv_kana01 text, 
    593     deliv_kana02 text, 
    594     deliv_tel01 text, 
    595     deliv_tel02 text, 
    596     deliv_tel03 text, 
    597     deliv_fax01 text, 
    598     deliv_fax02 text, 
    599     deliv_fax03 text, 
    600     deliv_zip01 text, 
    601     deliv_zip02 text, 
    602     deliv_pref smallint, 
    603     deliv_addr01 text, 
    604     deliv_addr02 text, 
    605590    subtotal numeric, 
    606591    discount numeric, 
    607     deliv_fee numeric, 
    608592    charge numeric, 
    609593    use_point numeric, 
     
    615599    payment_id int, 
    616600    payment_method text, 
    617     deliv_id int, 
    618     deliv_time_id int, 
    619     deliv_time text, 
    620     deliv_no text, 
    621601    note text, 
    622602    status smallint, 
     
    627607    device_type_id int, 
    628608    del_flg smallint NOT NULL DEFAULT 0, 
    629     deliv_date text, 
    630609    memo01 text, 
    631610    memo02 text, 
     
    664643    order_birth datetime, 
    665644    order_job int, 
    666     deliv_name01 text, 
    667     deliv_name02 text, 
    668     deliv_kana01 text, 
    669     deliv_kana02 text, 
    670     deliv_tel01 text, 
    671     deliv_tel02 text, 
    672     deliv_tel03 text, 
    673     deliv_fax01 text, 
    674     deliv_fax02 text, 
    675     deliv_fax03 text, 
    676     deliv_zip01 text, 
    677     deliv_zip02 text, 
    678     deliv_pref smallint, 
    679     deliv_addr01 text, 
    680     deliv_addr02 text, 
    681645    subtotal numeric, 
    682646    discount numeric, 
    683     deliv_fee numeric, 
    684647    charge numeric, 
    685648    use_point numeric, 
     
    691654    payment_id int, 
    692655    payment_method text, 
    693     deliv_id int, 
    694     deliv_time_id int, 
    695     deliv_time text, 
    696     deliv_no text, 
    697656    note text, 
    698657    mail_flag smallint, 
    699658    status smallint, 
    700     deliv_check smallint, 
    701659    point_check smallint, 
    702660    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
     
    704662    device_type_id int, 
    705663    del_flg smallint NOT NULL DEFAULT 0, 
    706     deliv_date text, 
    707664    order_id int, 
    708665    memo01 text, 
     
    717674    memo10 text, 
    718675    session text 
     676) ENGINE=InnoDB; 
     677 
     678CREATE TABLE dtb_shipping ( 
     679    shipping_id int NOT NULL, 
     680    order_id int NOT NULL, 
     681    shipping_name01 text, 
     682    shipping_name02 text, 
     683    shipping_kana01 text, 
     684    shipping_kana02 text, 
     685    shipping_tel01 text, 
     686    shipping_tel02 text, 
     687    shipping_tel03 text, 
     688    shipping_fax01 text, 
     689    shipping_fax02 text, 
     690    shipping_fax03 text, 
     691    shipping_pref smallint, 
     692    shipping_zip01 text, 
     693    shipping_zip02 text, 
     694    shipping_addr01 text, 
     695    shipping_addr02 text, 
     696    deliv_id int NOT NULL, 
     697    time_id int NOT NULL, 
     698    shipping_fee NUMERIC, 
     699    shipping_time TEXT, 
     700    shipping_num TEXT, 
     701    shipping_date datetime, 
     702    shipping_commit_date datetime, 
     703    rank int, 
     704    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
     705    update_date timestamp NOT NULL, 
     706    del_flg smallint NOT NULL DEFAULT 0, 
     707    PRIMARY KEY (shipping_id, order_id) 
     708) ENGINE=InnoDB; 
     709 
     710CREATE TABLE dtb_shipment_item ( 
     711    shipping_id int NOT NULL, 
     712    product_class_id int NOT NULL, 
     713    order_id int NOT NULL, 
     714    product_name text NOT NULL, 
     715    product_code text, 
     716    classcategory_name1 text, 
     717    classcategory_name2 text, 
     718    price numeric, 
     719    quantity numeric, 
     720    PRIMARY KEY (shipping_id, product_class_id, order_id) 
    719721) ENGINE=InnoDB; 
    720722 
  • branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

    r19808 r19860  
    590590    order_birth timestamp, 
    591591    order_job int, 
    592     deliv_name01 text, 
    593     deliv_name02 text, 
    594     deliv_kana01 text, 
    595     deliv_kana02 text, 
    596     deliv_tel01 text, 
    597     deliv_tel02 text, 
    598     deliv_tel03 text, 
    599     deliv_fax01 text, 
    600     deliv_fax02 text, 
    601     deliv_fax03 text, 
    602     deliv_zip01 text, 
    603     deliv_zip02 text, 
    604     deliv_pref smallint, 
    605     deliv_addr01 text, 
    606     deliv_addr02 text, 
    607592    subtotal numeric, 
    608593    discount numeric, 
    609     deliv_fee numeric, 
    610594    charge numeric, 
    611595    use_point numeric, 
     
    617601    payment_id int, 
    618602    payment_method text, 
    619     deliv_id int, 
    620     deliv_time_id int, 
    621     deliv_time text, 
    622     deliv_no text, 
    623603    note text, 
    624604    status smallint, 
     
    629609    device_type_id int, 
    630610    del_flg smallint NOT NULL DEFAULT 0, 
    631     deliv_date text, 
    632611    memo01 text, 
    633612    memo02 text, 
     
    666645    order_birth timestamp, 
    667646    order_job int, 
    668     deliv_name01 text, 
    669     deliv_name02 text, 
    670     deliv_kana01 text, 
    671     deliv_kana02 text, 
    672     deliv_tel01 text, 
    673     deliv_tel02 text, 
    674     deliv_tel03 text, 
    675     deliv_fax01 text, 
    676     deliv_fax02 text, 
    677     deliv_fax03 text, 
    678     deliv_zip01 text, 
    679     deliv_zip02 text, 
    680     deliv_pref smallint, 
    681     deliv_addr01 text, 
    682     deliv_addr02 text, 
    683647    subtotal numeric, 
    684648    discount numeric, 
    685     deliv_fee numeric, 
    686649    charge numeric, 
    687650    use_point numeric, 
     
    693656    payment_id int, 
    694657    payment_method text, 
    695     deliv_id int, 
    696     deliv_time_id int, 
    697     deliv_time text, 
    698     deliv_no text, 
    699658    note text, 
    700659    mail_flag smallint, 
    701660    status smallint, 
    702     deliv_check smallint, 
    703661    point_check smallint, 
    704662    create_date timestamp NOT NULL DEFAULT now(), 
     
    706664    device_type_id int, 
    707665    del_flg smallint NOT NULL DEFAULT 0, 
    708     deliv_date text, 
    709666    order_id int, 
    710667    memo01 text, 
     
    719676    memo10 text, 
    720677    session text 
     678); 
     679 
     680CREATE TABLE dtb_shipping ( 
     681    shipping_id int NOT NULL, 
     682    order_id int NOT NULL, 
     683    shipping_name01 text, 
     684    shipping_name02 text, 
     685    shipping_kana01 text, 
     686    shipping_kana02 text, 
     687    shipping_tel01 text, 
     688    shipping_tel02 text, 
     689    shipping_tel03 text, 
     690    shipping_fax01 text, 
     691    shipping_fax02 text, 
     692    shipping_fax03 text, 
     693    shipping_pref smallint, 
     694    shipping_zip01 text, 
     695    shipping_zip02 text, 
     696    shipping_addr01 text, 
     697    shipping_addr02 text, 
     698    deliv_id int NOT NULL, 
     699    time_id int NOT NULL, 
     700    shipping_fee NUMERIC, 
     701    shipping_time TEXT, 
     702    shipping_num TEXT, 
     703    shipping_date timestamp, 
     704    shipping_commit_date timestamp, 
     705    rank int, 
     706    create_date timestamp NOT NULL DEFAULT now(), 
     707    update_date timestamp, 
     708    del_flg smallint NOT NULL DEFAULT 0, 
     709    PRIMARY KEY (shipping_id, order_id) 
     710); 
     711 
     712CREATE TABLE dtb_shipment_item ( 
     713    shipping_id int NOT NULL, 
     714    product_class_id int NOT NULL, 
     715    order_id int NOT NULL, 
     716    product_name text NOT NULL, 
     717    product_code text, 
     718    classcategory_name1 text, 
     719    classcategory_name2 text, 
     720    price numeric, 
     721    quantity numeric, 
     722    PRIMARY KEY (shipping_id, product_class_id, order_id) 
    721723); 
    722724 
  • branches/version-2_5-dev/html/install/sql/drop_table.sql

    r19711 r19860  
    3232DROP TABLE dtb_order; 
    3333DROP TABLE dtb_order_temp; 
     34DROP TABLE dtb_shipping; 
     35DROP TABLE dtb_shipment_item; 
    3436DROP TABLE dtb_other_deliv; 
    3537DROP TABLE dtb_order_detail; 
  • branches/version-2_5-dev/html/install/sql/insert_data.sql

    r19847 r19860  
    109109INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 27, 1, 2, 3, 0); 
    110110INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 27, 1, 3, 1, 0); 
    111 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 28, 1, 1, 2, 0); 
    112 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 28, 1, 2, 3, 0); 
    113 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 28, 1, 3, 1, 0); 
    114 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 29, 1, 1, 2, 0); 
    115 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 29, 1, 2, 3, 0); 
    116 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 29, 1, 3, 1, 0); 
    117 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 30, 1, 1, 2, 0); 
    118 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 30, 1, 2, 3, 0); 
    119 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 30, 1, 3, 1, 0); 
    120 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (1, 1, 1, 1, 2, 0); 
    121111INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (1, 1, 1, 2, 3, 0); 
    122112INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (1, 1, 1, 3, 1, 0); 
     
    529519INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 22, '商品購入/ログイン', 'shopping/index.php', NULL, NULL, 'shopping/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    530520INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 23, '商品購入/お届け先の指定', 'shopping/deliv.php', NULL, NULL, 'shopping/deliv', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    531 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 24, '商品購入/お支払方法・お届け時間等の指定', 'shopping/payment.php', NULL, NULL, 'shopping/payment', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    532 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 25, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    533 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 26, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     521INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 24, '商品購入/お届け先の複数指定', 'shopping/multiple.php', NULL, NULL, 'shopping/multiple', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     522INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 25, '商品購入/お支払方法・お届け時間等の指定', 'shopping/payment.php', NULL, NULL, 'shopping/payment', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     523INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 26, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     524INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 27, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    534525INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 0, NULL, 'preview', NULL, NULL, 'preview', 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    535526INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 1, 'TOPページ', 'index.php', NULL, NULL, 'index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     
    556547INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 22, '商品購入/ログイン', 'shopping/index.php', NULL, NULL, 'shopping/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    557548INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 23, '商品購入/お届け先の指定', 'shopping/deliv.php', NULL, NULL, 'shopping/deliv', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    558 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 24, '商品購入/お支払方法・お届け時間等の指定', 'shopping/payment.php', NULL, NULL, 'shopping/payment', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    559 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 25, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    560 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 26, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     549INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 24, '商品購入/お届け先の複数指定', 'shopping/multiple.php', NULL, NULL, 'shopping/multiple', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     550INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 25, '商品購入/お支払方法・お届け時間等の指定', 'shopping/payment.php', NULL, NULL, 'shopping/payment', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     551INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 26, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     552INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (2, 27, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    561553INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 0, NULL, 'preview', NULL, NULL, 'preview', 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    562554INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 1, 'TOPページ', 'index.php', NULL, NULL, 'index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     
    583575INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 22, '商品購入/ログイン', 'shopping/index.php', NULL, NULL, 'shopping/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    584576INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 23, '商品購入/お届け先の指定', 'shopping/deliv.php', NULL, NULL, 'shopping/deliv', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    585 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 24, '商品購入/お支払方法・お届け時間等の指定', 'shopping/payment.php', NULL, NULL, 'shopping/payment', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    586 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 25, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    587 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 26, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    588 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 27, '非対応デバイス', 'unsupported/index.php', NULL, NULL, 'unsupported/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    589 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 28, 'ご利用ガイド', 'guide/index.php', NULL, NULL, 'guide/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    590 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 29, 'ご利用ガイド/ご利用方法', 'guide/usage.php', NULL, NULL, 'guide/usage', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    591 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 30, 'ご利用ガイド/プライバシーポリシー', 'guide/privacy.php', NULL, NULL, 'guide/privacy', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    592 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 31, 'ご利用ガイド/通信料について', 'guide/charge.php', NULL, NULL, 'guide/charge', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    593 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 32, 'ご利用ガイド/ご利用規約', 'guide/kiyaku.php', NULL, NULL, 'guide/kiyaku', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    594 INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 33, 'ご利用ガイド/運営会社紹介', 'guide/about.php', NULL, NULL, 'guide/about', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     577INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 24, '商品購入/お届け先の複数指定', 'shopping/multiple.php', NULL, NULL, 'shopping/multiple', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     578INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 25, '商品購入/お支払方法・お届け時間等の指定', 'shopping/payment.php', NULL, NULL, 'shopping/payment', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     579INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 26, '商品購入/ご入力内容のご確認', 'shopping/confirm.php', NULL, NULL, 'shopping/confirm', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     580INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 27, '商品購入/ご注文完了', 'shopping/complete.php', NULL, NULL, 'shopping/complete', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     581INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 28, '非対応デバイス', 'unsupported/index.php', NULL, NULL, 'unsupported/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     582INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 29, 'ご利用ガイド', 'guide/index.php', NULL, NULL, 'guide/index', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     583INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 30, 'ご利用ガイド/ご利用方法', 'guide/usage.php', NULL, NULL, 'guide/usage', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     584INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 31, 'ご利用ガイド/プライバシーポリシー', 'guide/privacy.php', NULL, NULL, 'guide/privacy', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     585INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 32, 'ご利用ガイド/通信料について', 'guide/charge.php', NULL, NULL, 'guide/charge', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     586INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 33, 'ご利用ガイド/ご利用規約', 'guide/kiyaku.php', NULL, NULL, 'guide/kiyaku', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
     587INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, php_dir, tpl_dir, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (1, 34, 'ご利用ガイド/運営会社紹介', 'guide/about.php', NULL, NULL, 'guide/about', 1, 1, 2, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    595588 
    596589INSERT 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, 5, 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); 
  • branches/version-2_5-dev/html/js/site.js

    r19719 r19860  
    249249    if(document.form1['deliv_check']) { 
    250250        list = new Array( 
    251                         'deliv_name01', 
    252                         'deliv_name02', 
    253                         'deliv_kana01', 
    254                         'deliv_kana02', 
    255                         'deliv_pref', 
    256                         'deliv_zip01', 
    257                         'deliv_zip02', 
    258                         'deliv_addr01', 
    259                         'deliv_addr02', 
    260                         'deliv_tel01', 
    261                         'deliv_tel02', 
    262                         'deliv_tel03' 
     251                        'shipping_name01', 
     252                        'shipping_name02', 
     253                        'shipping_kana01', 
     254                        'shipping_kana02', 
     255                        'shipping_pref', 
     256                        'shipping_zip01', 
     257                        'shipping_zip02', 
     258                        'shipping_addr01', 
     259                        'shipping_addr02', 
     260                        'shipping_tel01', 
     261                        'shipping_tel02', 
     262                        'shipping_tel03' 
    263263                        ); 
    264264 
     
    368368    } 
    369369} 
    370  
    371 // お届け時間のリアル反映 
    372 function fnSetDelivTime(mode, r_key, s_id) { 
    373     var f_key, f_val; 
    374     var f_cnt = document.form1.length; 
    375     var f_data = "mode=" + mode; 
    376  
    377     // formデータの形成 
    378     for (i = 0; i < f_cnt; i++) { 
    379         f_key = document.form1[i].name; 
    380         f_val = document.form1[i].value; 
    381         if (f_key != "mode") { 
    382             if (f_key == r_key) { 
    383                 if (document.form1[i].checked === true) { 
    384                     f_data += "&" + f_key + "=" + f_val; 
    385                 } 
    386             } else { 
    387                 f_data += "&" + f_key + "=" + f_val; 
    388             } 
    389         } 
    390     } 
    391  
    392     // AJAX 
    393     $.ajax({ 
    394         type: "POST", 
    395         url: document.form1.action, 
    396         data: f_data, 
    397         dataType: "json", 
    398         success: function(data) { 
    399             var elm_s = "select#" + s_id; 
    400             var elm_o = elm_s + " option"; 
    401             $(elm_o).remove(); 
    402             $(elm_s).append($('<option>').attr({value: ""}).text("指定なし")); 
    403             for (i = 0; i < data.length; i++) { 
    404                 if (data[i].time_id > 0) { 
    405                     $(elm_s).append($('<option>').attr({value: data[i].time_id}).text(data[i].deliv_time)); 
    406                     $(elm_s).width(); 
    407                 } 
    408             } 
    409         } 
    410     }); 
    411 } 
  • branches/version-2_5-dev/html/user_data/packages/default/css/under02.css

    r19815 r19860  
    125125 
    126126div#under02column_shopping h3 { 
    127     margin: 0 0 15px 0; 
     127    margin: 10px 5px; 
     128    font-size: 120%; 
     129    border-bottom: 1px solid #999; 
     130    text-align: left; 
    128131} 
    129132 
Note: See TracChangeset for help on using the changeset viewer.