// Merge -> 10309
This commit is contained in:
rMalie
+25
-9
@@ -380,14 +380,18 @@ CREATE TABLE `PREFIX_cms_category_lang` (
|
||||
KEY `category_name` (`name`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `PREFIX_compare_product` (
|
||||
`id_compare_product` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`id_product` int(10) unsigned NOT NULL,
|
||||
`id_guest` int(10) unsigned NOT NULL,
|
||||
CREATE TABLE `PREFIX_compare` (
|
||||
`id_compare` int(10) unsigned NOT NULL auto_increment,
|
||||
`id_customer` int(10) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id_compare`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `PREFIX_compare_product` (
|
||||
`id_compare` int(10) unsigned NOT NULL,
|
||||
`id_product` int(10) unsigned NOT NULL,
|
||||
`date_add` datetime NOT NULL,
|
||||
`date_upd` datetime NOT NULL,
|
||||
PRIMARY KEY (`id_compare_product`)
|
||||
PRIMARY KEY (`id_compare`,`id_product`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `PREFIX_configuration` (
|
||||
@@ -1095,6 +1099,12 @@ CREATE TABLE `PREFIX_order_detail` (
|
||||
KEY `id_order_id_order_detail` (`id_order`, `id_order_detail`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `PREFIX_order_tax` (
|
||||
`id_order` int(11) NOT NULL,
|
||||
`tax_name` varchar(40) NOT NULL,
|
||||
`tax_rate` decimal(6,3) NOT NULL,
|
||||
`amount` decimal(20,6) NOT NULL
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `PREFIX_order_cart_rule` (
|
||||
`id_order_cart_rule` int(10) unsigned NOT NULL auto_increment,
|
||||
@@ -1544,7 +1554,7 @@ CREATE TABLE `PREFIX_specific_price` (
|
||||
`id_group` INT UNSIGNED NOT NULL,
|
||||
`id_product_attribute` INT UNSIGNED NOT NULL,
|
||||
`price` DECIMAL(20, 6) NOT NULL,
|
||||
`from_quantity` SMALLINT UNSIGNED NOT NULL,
|
||||
`from_quantity` mediumint(8) UNSIGNED NOT NULL,
|
||||
`reduction` DECIMAL(20, 6) NOT NULL,
|
||||
`reduction_type` ENUM('amount', 'percentage') NOT NULL,
|
||||
`from` DATETIME NOT NULL,
|
||||
@@ -1668,8 +1678,8 @@ CREATE TABLE `PREFIX_store` (
|
||||
`address2` varchar(128) DEFAULT NULL,
|
||||
`city` varchar(64) NOT NULL,
|
||||
`postcode` varchar(12) NOT NULL,
|
||||
`latitude` decimal(10,8) DEFAULT NULL,
|
||||
`longitude` decimal(10,8) DEFAULT NULL,
|
||||
`latitude` decimal(11,8) DEFAULT NULL,
|
||||
`longitude` decimal(11,8) DEFAULT NULL,
|
||||
`hours` varchar(254) DEFAULT NULL,
|
||||
`phone` varchar(16) DEFAULT NULL,
|
||||
`fax` varchar(16) DEFAULT NULL,
|
||||
@@ -1857,6 +1867,12 @@ PRIMARY KEY (`id_carrier`, `id_shop`),
|
||||
KEY `id_shop` (`id_shop`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `PREFIX_address_format` (
|
||||
`id_country` int(10) unsigned NOT NULL,
|
||||
`format` varchar(255) NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (`id_country`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
CREATE TABLE `PREFIX_cms_shop` (
|
||||
`id_cms` INT( 11 ) UNSIGNED NOT NULL,
|
||||
`id_shop` INT( 11 ) UNSIGNED NOT NULL ,
|
||||
@@ -2235,4 +2251,4 @@ CREATE TABLE `PREFIX_accounting_product_zone_shop` (
|
||||
`account_number` varchar(64) NOT NULL,
|
||||
PRIMARY KEY (`id_accounting_product_zone_shop`),
|
||||
UNIQUE KEY `id_product` (`id_product`,`id_shop`,`id_zone`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
@@ -72,7 +72,7 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_hook`, `position`) VALUES (3,
|
||||
(35, 33, 2),(36, 33, 3),(37, 33, 4),(39, 37, 1),(40, 32, 8),(41, 32, 9),(42, 32, 10),(43, 32, 11),(42, 14, 6),(43, 14, 7),(44, 32, 12),(45, 32, 13),(46, 32, 15),
|
||||
(47, 32, 14),(48, 32, 16),(49, 32, 17),(55, 32, 22),(50, 32, 18),(51, 32, 19),(51, 45, 1),(25, 25, 1),(41, 20, 2),(52, 32, 20),(53, 32, 21),(17, 9, 2),(18, 9, 3),(24, 9, 4),(9, 9, 5),
|
||||
(15, 9, 6),(5, 9, 7),(8, 9, 8),(10, 9, 9),(20, 9, 10),(11, 9, 11),(16, 9, 12),(22, 9, 13),(13, 9, 14),(14, 9, 15),(12, 9, 16),(7, 9, 17),(21, 9, 18),(10, 60, 1),(10, 61, 1),(10, 62, 1),
|
||||
(54, 9, 19),(10,66,1);
|
||||
(54, 9, 19),(10,66,1),(19,9,20);
|
||||
|
||||
CREATE TABLE `PREFIX_pagenotfound` (
|
||||
`id_pagenotfound` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
@@ -866,6 +866,85 @@ INSERT INTO `PREFIX_search_word` (`id_word`, `id_lang`, `word`) VALUES (1, 1, 'i
|
||||
|
||||
INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 2, id_tab, 1, 1, 1, 1 FROM PREFIX_tab);
|
||||
INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) VALUES
|
||||
(2, 1, 1, 1, 1, 1),
|
||||
(2, 2, 1, 1, 1, 1),
|
||||
(2, 3, 1, 1, 1, 1),
|
||||
(2, 4, 0, 0, 0, 0),
|
||||
(2, 5, 1, 1, 1, 1),
|
||||
(2, 6, 0, 0, 0, 0),
|
||||
(2, 7, 0, 0, 0, 0),
|
||||
(2, 8, 0, 0, 0, 0),
|
||||
(2, 9, 0, 0, 0, 0),
|
||||
(2, 10, 0, 0, 0, 0),
|
||||
(2, 11, 0, 0, 0, 0),
|
||||
(2, 12, 1, 1, 1, 1),
|
||||
(2, 13, 1, 1, 1, 1),
|
||||
(2, 14, 0, 0, 0, 0),
|
||||
(2, 15, 0, 0, 0, 0),
|
||||
(2, 16, 0, 0, 0, 0),
|
||||
(2, 17, 1, 1, 1, 1),
|
||||
(2, 18, 0, 0, 0, 0),
|
||||
(2, 19, 0, 0, 0, 0),
|
||||
(2, 20, 1, 1, 1, 1),
|
||||
(2, 21, 1, 1, 1, 1),
|
||||
(2, 22, 0, 0, 0, 0),
|
||||
(2, 23, 0, 0, 0, 0),
|
||||
(2, 24, 0, 0, 0, 0),
|
||||
(2, 26, 0, 0, 0, 0),
|
||||
(2, 27, 0, 0, 0, 0),
|
||||
(2, 28, 0, 0, 0, 0),
|
||||
(2, 29, 0, 0, 0, 0),
|
||||
(2, 30, 0, 0, 0, 0),
|
||||
(2, 31, 0, 0, 0, 0),
|
||||
(2, 32, 0, 0, 0, 0),
|
||||
(2, 33, 0, 0, 0, 0),
|
||||
(2, 34, 1, 1, 1, 1),
|
||||
(2, 35, 0, 0, 0, 0),
|
||||
(2, 36, 0, 0, 0, 0),
|
||||
(2, 37, 0, 0, 0, 0),
|
||||
(2, 38, 0, 0, 0, 0),
|
||||
(2, 39, 0, 0, 0, 0),
|
||||
(2, 40, 0, 0, 0, 0),
|
||||
(2, 41, 0, 0, 0, 0),
|
||||
(2, 42, 1, 1, 1, 1),
|
||||
(2, 43, 0, 0, 0, 0),
|
||||
(2, 44, 0, 0, 0, 0),
|
||||
(2, 46, 0, 0, 0, 0),
|
||||
(2, 47, 1, 1, 1, 1),
|
||||
(2, 48, 0, 0, 0, 0),
|
||||
(2, 49, 1, 1, 1, 1),
|
||||
(2, 51, 0, 0, 0, 0),
|
||||
(2, 52, 0, 0, 0, 0),
|
||||
(2, 53, 0, 0, 0, 0),
|
||||
(2, 54, 0, 0, 0, 0),
|
||||
(2, 55, 1, 1, 1, 1),
|
||||
(2, 56, 0, 0, 0, 0),
|
||||
(2, 57, 0, 0, 0, 0),
|
||||
(2, 58, 0, 0, 0, 0),
|
||||
(2, 59, 1, 1, 1, 1),
|
||||
(2, 60, 1, 1, 1, 1),
|
||||
(2, 61, 0, 0, 0, 0),
|
||||
(2, 62, 0, 0, 0, 0),
|
||||
(2, 63, 0, 0, 0, 0),
|
||||
(2, 64, 0, 0, 0, 0),
|
||||
(2, 65, 0, 0, 0, 0),
|
||||
(2, 66, 0, 0, 0, 0),
|
||||
(2, 67, 0, 0, 0, 0),
|
||||
(2, 68, 0, 0, 0, 0),
|
||||
(2, 69, 0, 0, 0, 0),
|
||||
(2, 70, 0, 0, 0, 0),
|
||||
(2, 71, 0, 0, 0, 0),
|
||||
(2, 72, 0, 0, 0, 0),
|
||||
(2, 73, 1, 1, 1, 1),
|
||||
(2, 80, 0, 0, 0, 0),
|
||||
(2, 81, 0, 0, 0, 0),
|
||||
(2, 82, 0, 0, 0, 0),
|
||||
(2, 83, 0, 0, 0, 0),
|
||||
(2, 84, 0, 0, 0, 0),
|
||||
(2, 85, 0, 0, 0, 0),
|
||||
(2, 86, 0, 0, 0, 0),
|
||||
(2, 87, 0, 0, 0, 0),
|
||||
(2, 88, 1, 1, 1, 1),
|
||||
(3, 1, 1, 1, 1, 1),
|
||||
(3, 2, 1, 1, 1, 1),
|
||||
(3, 3, 1, 1, 1, 1),
|
||||
@@ -945,7 +1024,6 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
|
||||
(3, 86, 0, 0, 0, 0),
|
||||
(3, 87, 0, 0, 0, 0),
|
||||
(3, 88, 0, 0, 0, 0),
|
||||
(3, 89, 0, 0, 0, 0),
|
||||
(3, 90, 0, 0, 0, 0),
|
||||
(3, 91, 0, 0, 0, 0),
|
||||
(3, 92, 0, 0, 0, 0),
|
||||
@@ -1041,6 +1119,7 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
|
||||
(4, 85, 0, 0, 0, 0),
|
||||
(4, 86, 0, 0, 0, 0),
|
||||
(4, 87, 0, 0, 0, 0),
|
||||
<<<<<<< .working
|
||||
(4, 88, 0, 0, 0, 0),
|
||||
(4, 89, 0, 0, 0, 0),
|
||||
(4, 90, 0, 0, 0, 0),
|
||||
@@ -1156,7 +1235,9 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del
|
||||
(5, 103, 1, 1, 1, 1),
|
||||
(5, 104, 1, 1, 1, 1),
|
||||
(5, 105, 0, 0, 0, 0),
|
||||
(5, 106, 0, 0, 0, 0);
|
||||
(5, 106, 0, 0, 0, 0),
|
||||
(4, 88, 1, 1, 1, 1);
|
||||
>>>>>>> .merge-right.r10309
|
||||
|
||||
INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 2, id_module, 0, 1 FROM PREFIX_module);
|
||||
INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 3, id_module, 0, 1 FROM PREFIX_module);
|
||||
|
||||
@@ -1052,8 +1052,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
|
||||
INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
|
||||
(4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
|
||||
(4, 5, 'Versandkosten'),(4, 6, 'Statistik'),(4, 7, 'Module'),(4, 8, 'Voreinstellungen'),(4, 9, 'Tools'),(4, 10, 'Hersteller'),(4, 11, 'Attribute und Gruppen'),
|
||||
(4, 12, 'Adressen'),(4, 13, 'Status'),(4, 14, 'Gutscheine'),(4, 15, 'Währungen'),(4, 16, 'Steuern'),(4, 17, 'Lieferanten'),(4, 18, 'Länder'),
|
||||
(4, 19, 'Zonen'),(4, 20, 'Preislagen'),(4, 21, 'Gewichtsklassen'),(4, 22, 'Positionen'),(4, 23, 'Datenbank'),(4, 24, 'E-Mail'),(4, 26, 'Bild'),
|
||||
(4, 12, 'Adressen'),(4, 13, 'Status'),(4, 14, 'Gutscheine'),(4, 15, 'Währungen'),(4, 16, 'Steuern'),(4, 17, 'Versanddienst'),(4, 18, 'Länder'),
|
||||
(4, 19, 'Zonen'),(4, 20, 'Preisspanne'),(4, 21, 'Gewichtsklassen'),(4, 22, 'Positionen'),(4, 23, 'Datenbank'),(4, 24, 'E-Mail'),(4, 26, 'Bild'),
|
||||
(4, 27, 'Produkte'),(4, 28, 'Kontakte'),(4, 29, 'Mitarbeiter'),(4, 30, 'Profile'),(4, 31, 'Berechtigungen'),(4, 32, 'Sprachen'),(4, 33, 'Übersetzungen'),
|
||||
(4, 34, 'Zulieferer'),(4, 35, 'Tabs'),(4, 36, 'Funktionen'),(4, 37, 'Schnellzugriff'),(4, 38, 'Themen'),(4, 39, 'Kontaktinformation'),(4, 40, 'Alias'),
|
||||
(4, 41, 'Import'),(4, 42, 'Rechnungen'),(4, 43, 'Suche'),(4, 44, 'Lokalisierung'),(4, 46, 'Staaten'),(4, 47, 'Warenrücksendungen'),(4, 48, 'PDF'),
|
||||
@@ -1061,6 +1061,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
|
||||
(4, 55, 'Lieferscheine'),(4, 56, 'SEO & URLs'),(4, 57, 'CMS'),(4, 58, 'Image Mapping'),(4, 59, 'Kundennachrichten'),(4, 60, 'Tracking'),
|
||||
(4, 61, 'Suchmaschinen'),(4, 62, 'Referrer'),(4, 63, 'Gruppen'),(4, 64, 'Generatoren'),(4, 65, 'Warenkörbe'),(4, 66, 'Tags'),(4, 67, 'Suche'),
|
||||
(4, 68, 'Anhänge'),(4, 69, 'Konfigurationsinformationen'),(4, 70, 'Leistung'),(4, 71, 'Kundenservice'),(4, 72, 'Webservice'),(4, 73, 'Lagerbewegungen'),
|
||||
<<<<<<< .working
|
||||
(4, 80, 'Module und Themenkatalog'),(4, 81, 'Mein Konto'),(4, 82, 'Shops'),(4, 83, 'Themen'),(4, 84, 'Geotargeting'),(4, 85, 'Steuerregeln'),(4, 86, 'Log'),
|
||||
(4, 87,'Home'), (4, 88, 'Shops'), (4, 89, 'Group Shops'), (4, 90, 'Shop Urls'),(4, 91, 'Genders'),(4, 92, 'SQL Manager'),
|
||||
(4, 93, 'Products'),
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
SET NAMES 'utf8';
|
||||
|
||||
/* PHP:update_order_canada(); */;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `PREFIX_compare` (
|
||||
`id_compare` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`id_customer` int(10) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id_compare`)
|
||||
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
|
||||
|
||||
ALTER TABLE `PREFIX_compare_product` DROP `id_compare_product` , DROP `id_guest` , DROP `id_customer` ;
|
||||
|
||||
ALTER TABLE `PREFIX_compare_product`
|
||||
ADD `id_compare` int(10) unsigned NOT NULL,
|
||||
ADD PRIMARY KEY(
|
||||
`id_compare`,
|
||||
`id_product`);
|
||||
|
||||
ALTER TABLE `PREFIX_store` CHANGE `latitude` `latitude` DECIMAL(11, 8) NULL DEFAULT NULL;
|
||||
ALTER TABLE `PREFIX_store` CHANGE `longitude` `longitude` DECIMAL(11, 8) NULL DEFAULT NULL;
|
||||
|
||||
ALTER TABLE `PREFIX_address_format` ADD PRIMARY KEY (`id_country`);
|
||||
ALTER TABLE `PREFIX_address_format` DROP INDEX `country`;
|
||||
|
||||
/* PHP:hook_blocksearch_on_header(); */;
|
||||
Reference in New Issue
Block a user