dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merging multishipping branche on 1.5

Browse Source
This commit is contained in:
mDeflotte
2011-11-18 11:13:31 +00:00
parent bc06976a52
commit 0df1a7e2eb
41 changed files with 2870 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db.sql
+21 -3
View File
@@ -139,6 +139,11 @@ CREATE TABLE `PREFIX_carrier` (
`external_module_name` varchar(64) DEFAULT NULL,
`shipping_method` int(2) NOT NULL DEFAULT '0',
`position` int(10) unsigned NOT NULL default '0',
`max_width` int(10) DEFAULT 0,
`max_height` int(10) DEFAULT 0,
`max_deep` int(10) DEFAULT 0,
`max_weight` int(10) DEFAULT 0,
`grade` int(10) DEFAULT 0,
PRIMARY KEY (`id_carrier`),
KEY `deleted` (`deleted`,`active`),
KEY `id_tax_rules_group` (`id_tax_rules_group`)
@@ -148,8 +153,8 @@ CREATE TABLE `PREFIX_carrier_lang` (
`id_carrier` int(10) unsigned NOT NULL,
`id_shop` int(11) unsigned NOT NULL DEFAULT '1',
`id_lang` int(10) unsigned NOT NULL,
`delay` varchar(128) default NULL,
UNIQUE KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`)
`delay` varchar(128) DEFAULT NULL,
PRIMARY KEY `shipper_lang_index` (`id_lang`,`id_shop`, `id_carrier`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_carrier_zone` (
@@ -163,6 +168,7 @@ CREATE TABLE `PREFIX_cart` (
`id_group_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`id_carrier` int(10) unsigned NOT NULL,
`delivery_option` varchar(100),
`id_lang` int(10) unsigned NOT NULL,
`id_address_delivery` int(10) unsigned NOT NULL,
`id_address_invoice` int(10) unsigned NOT NULL,
@@ -173,6 +179,7 @@ CREATE TABLE `PREFIX_cart` (
`recyclable` tinyint(1) unsigned NOT NULL default '1',
`gift` tinyint(1) unsigned NOT NULL default '0',
`gift_message` text,
`allow_seperated_package` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
PRIMARY KEY (`id_cart`),
@@ -274,6 +281,7 @@ CREATE TABLE `PREFIX_cart_cart_rule` (
CREATE TABLE `PREFIX_cart_product` (
`id_cart` int(10) unsigned NOT NULL,
`id_product` int(10) unsigned NOT NULL,
`id_address_delivery` int(10) UNSIGNED DEFAULT 0,
`id_shop` int(10) unsigned NOT NULL DEFAULT '1',
`id_product_attribute` int(10) unsigned default NULL,
`quantity` int(10) unsigned NOT NULL default '0',
@@ -583,13 +591,14 @@ CREATE TABLE `PREFIX_customer_thread` (
CREATE TABLE `PREFIX_customization` (
`id_customization` int(10) unsigned NOT NULL auto_increment,
`id_product_attribute` int(10) unsigned NOT NULL default '0',
`id_address_delivery` int(10) UNSIGNED NOT NULL DEFAULT 0,
`id_cart` int(10) unsigned NOT NULL,
`id_product` int(10) NOT NULL,
`quantity` int(10) NOT NULL,
`quantity_refunded` INT NOT NULL DEFAULT '0',
`quantity_returned` INT NOT NULL DEFAULT '0',
`in_cart` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY (`id_customization`,`id_cart`,`id_product`),
PRIMARY KEY (`id_customization`,`id_cart`,`id_product`, `id_address_delivery`),
KEY `id_product_attribute` (`id_product_attribute`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -753,6 +762,13 @@ CREATE TABLE `PREFIX_product_group_reduction_cache` (
PRIMARY KEY(`id_product`, `id_group`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_product_carrier` (
`id_product` int(10) unsigned NOT NULL,
`id_carrier_reference` int(10) unsigned NOT NULL,
`id_shop` int(10) unsigned NOT NULL,
PRIMARY KEY (`id_product`, `id_carrier_reference`, `id_shop`)
) ENGINE = ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_guest` (
`id_guest` int(10) unsigned NOT NULL auto_increment,
`id_operating_system` int(10) unsigned default NULL,
@@ -971,9 +987,11 @@ CREATE TABLE `PREFIX_operating_system` (
CREATE TABLE `PREFIX_orders` (
`id_order` int(10) unsigned NOT NULL auto_increment,
`reference` VARCHAR(9),
`id_group_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`id_carrier` int(10) unsigned NOT NULL,
`id_warehouse` int(10) unsigned DEFAULT 0,
`id_lang` int(10) unsigned NOT NULL,
`id_customer` int(10) unsigned NOT NULL,
`id_cart` int(10) unsigned NOT NULL,