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

//Merge branch release

Browse Source
This commit is contained in:
vAugagneur
2013-01-02 09:56:20 +01:00
parent 2420fff747 a82cb7a8f4
commit a4eb2cc7a9
475 changed files with 23768 additions and 22253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/db_structure.sql
+3 -1
View File
@@ -225,6 +225,7 @@ CREATE TABLE `PREFIX_cart_rule` (
`reduction_product` int(10) NOT NULL default 0,
`gift_product` int(10) unsigned NOT NULL default 0,
`gift_product_attribute` int(10) unsigned NOT NULL default 0,
`highlight` tinyint(1) unsigned NOT NULL default 0,
`active` tinyint(1) unsigned NOT NULL default 0,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
@@ -1177,7 +1178,7 @@ CREATE TABLE `PREFIX_order_cart_rule` (
`id_order` int(10) unsigned NOT NULL,
`id_cart_rule` int(10) unsigned NOT NULL,
`id_order_invoice` int(10) unsigned DEFAULT 0,
`name` varchar(32) NOT NULL,
`name` varchar(254) NOT NULL,
`value` decimal(17,2) NOT NULL default '0.00',
`value_tax_excl` decimal(17,2) NOT NULL default '0.00',
PRIMARY KEY (`id_order_cart_rule`),
@@ -2023,6 +2024,7 @@ CREATE TABLE `PREFIX_lang_shop` (
CREATE TABLE `PREFIX_currency_shop` (
`id_currency` INT( 11 ) UNSIGNED NOT NULL,
`id_shop` INT( 11 ) UNSIGNED NOT NULL,
`conversion_rate` decimal(13,6) NOT NULL,
PRIMARY KEY (`id_currency`, `id_shop`),
KEY `id_shop` (`id_shop`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
install-dev/data/theme.sql
+1 -1
View File
@@ -53,7 +53,7 @@ UPDATE `PREFIX_configuration` SET value = 'CAT2,CAT3,CAT4' WHERE name = 'MOD_BLO
UPDATE `PREFIX_configuration` SET value = '' WHERE name = 'MOD_BLOCKTOPMENU_SEARCH';
UPDATE `PREFIX_configuration` SET value = 'http://www.facebook.com/prestashop' WHERE name = 'blocksocial_facebook';
UPDATE `PREFIX_configuration` SET value = 'http://www.twitter.com/prestashop' WHERE name = 'blocksocial_twitter';
UPDATE `PREFIX_configuration` SET value = 'RSS' WHERE name = 'blocksocial_rss';
UPDATE `PREFIX_configuration` SET value = 'http://www.prestashop.com/blog/en/feed/' WHERE name = 'blocksocial_rss';
UPDATE `PREFIX_configuration` SET value = 'My Company' WHERE name = 'blockcontactinfos_company';
UPDATE `PREFIX_configuration` SET value = '42 avenue des Champs Elysées\n75000 Paris\nFrance' WHERE name = 'blockcontactinfos_address';
UPDATE `PREFIX_configuration` SET value = '+33 (0)1.23.45.67.89' WHERE name = 'blockcontactinfos_phone';
install-dev/data/xml/configuration.xml
+1 -1
View File
@@ -633,7 +633,7 @@
<value>http://www.twitter.com/prestashop</value>
</configuration>
<configuration id="blocksocial_rss" name="blocksocial_rss">
<value>RSS</value>
<value>http://www.prestashop.com/blog/en/feed/</value>
</configuration>
<configuration id="blockcontactinfos_company" name="blockcontactinfos_company">
<value>Your company</value>