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(複数配送先の指定)

  • とりあえず通常配送が通るように修正
File:
1 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 
Note: See TracChangeset for help on using the changeset viewer.