// merge 1.4 (5397)

2011-04-22 16:00:58 +00:00
parent 0cd5856fe5
commit ff49083fb6
126 changed files with 3390 additions and 1430 deletions
@@ -2,9 +2,9 @@ SET NAMES 'utf8';

 INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edit`) VALUES ('afterSaveAdminMeta', 'After save configuration in AdminMeta', 'After save configuration in AdminMeta', 0, 0);

-INSERT INTO `PREFIX_hook_module` (`id_module`, `id_hook`, `position`) VALUES 
+INSERT INTO `PREFIX_hook_module` (`id_module`, `id_hook`, `position`) VALUES
 (
-(SELECT `id_module` FROM `PREFIX_module` WHERE `name` = 'blockcategories'), 
+(SELECT `id_module` FROM `PREFIX_module` WHERE `name` = 'blockcategories'),
 (SELECT `id_hook` FROM `PREFIX_hook` WHERE `name` = 'afterSaveAdminMeta'), 1
 );

@@ -23,7 +23,28 @@ ALTER TABLE `PREFIX_connections` CHANGE `ip_address` `ip_address` BIGINT NULL DE
 UPDATE `PREFIX_meta_lang`
 SET `title` = 'Angebote', `keywords` = 'besonders, Angebote', `url_rewrite` = 'angebote' WHERE url_rewrite = 'preise-fallen';

-ALTER TABLE `PREFIX_order_detail` 
+ALTER TABLE `PREFIX_country` ADD `display_tax_label` BOOLEAN NOT NULL DEFAULT '1';
+DROP TABLE IF EXISTS `PREFIX_country_tax`;
+
+ALTER TABLE `PREFIX_order_detail`
 CHANGE `product_quantity_in_stock` `product_quantity_in_stock` INT(10) NOT NULL DEFAULT '0';

+CREATE TABLE `PREFIX_address_format` (
+  `id_country` int(10) unsigned NOT NULL,
+  `format` varchar(255) NOT NULL DEFAULT '',
+  KEY `country` (`id_country`)
+) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
+
+INSERT INTO `PREFIX_address_format` (`id_country`, `format`)
+(SELECT `id_country` as id_country, 'firstname lastname\ncompany\nvat_number\naddress1\naddress2\npostcode city\ncountry\nphone' as format FROM PREFIX_country);
+
+UPDATE `PREFIX_address_format` set `format`='firstname lastname
+company
+address1
+address2
+city state postcode 
+country
+phone' where `id_country`=21;
+
 /* PHP:alter_cms_block(); */;
+