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

// Update new installer with last modifications from old installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11638 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-12-22 16:39:44 +00:00
parent 1c7ca064eb
commit 5646de21f3
17 changed files with 95 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-new/data/db_structure.sql
+26 -1
View File
@@ -516,6 +516,10 @@ CREATE TABLE `PREFIX_customer` (
`id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1',
`id_gender` int(10) unsigned NOT NULL,
`id_default_group` int(10) unsigned NOT NULL DEFAULT '1',
`id_risk` int(10) unsigned NOT NULL DEFAULT '1',
`company` varchar(64),
`siret` varchar(14),
`ape` varchar(5),
`firstname` varchar(32) NOT NULL,
`lastname` varchar(32) NOT NULL,
`email` varchar(128) NOT NULL,
@@ -526,6 +530,10 @@ CREATE TABLE `PREFIX_customer` (
`ip_registration_newsletter` varchar(15) default NULL,
`newsletter_date_add` datetime default NULL,
`optin` tinyint(1) unsigned NOT NULL default '0',
`website` varchar(128),
`outstanding_allow_amount` DECIMAL( 10,6 ) NOT NULL default '0.00',
`show_public_prices` tinyint(1) unsigned NOT NULL default '0',
`max_payment_days` int(10) unsigned NOT NULL default '60',
`secure_key` varchar(32) NOT NULL default '-1',
`note` text,
`active` tinyint(1) unsigned NOT NULL default '0',
@@ -1226,7 +1234,8 @@ CREATE TABLE `PREFIX_order_slip_detail` (
`id_order_slip` int(10) unsigned NOT NULL,
`id_order_detail` int(10) unsigned NOT NULL,
`product_quantity` int(10) unsigned NOT NULL default '0',
`amount` DECIMAL(10,2) NOT NULL,
`amount_tax_excl` DECIMAL(10,2) default NULL,
`amount_tax_incl` DECIMAL(10,2) default NULL,
PRIMARY KEY (`id_order_slip`,`id_order_detail`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
@@ -1652,6 +1661,7 @@ CREATE TABLE `PREFIX_tab` (
`class_name` varchar(64) NOT NULL,
`module` varchar(64) NULL,
`position` int(10) unsigned NOT NULL,
`active` tinyint(1) NOT NULL DEFAULT 1,
PRIMARY KEY (`id_tab`),
KEY `class_name` (`class_name`),
KEY `id_parent` (`id_parent`)
@@ -2338,3 +2348,18 @@ CREATE TABLE `PREFIX_specific_price_rule_condition` (
PRIMARY KEY (`id_specific_price_rule_condition`),
INDEX (`id_specific_price_rule_condition_group`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `PREFIX_risk` (
`id_risk` int(11) NOT NULL AUTO_INCREMENT,
`percent` tinyint(3) NOT NULL,
`color` varchar(32) NULL,
PRIMARY KEY (`id_risk`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `PREFIX_risk_lang` (
`id_risk` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
`name` varchar(20) NOT NULL,
PRIMARY KEY (`id_risk`,`id_lang`),
KEY `id_risk` (`id_risk`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
install-new/data/xml/access.xml
+1
View File
@@ -108,5 +108,6 @@
<access id="access_1_107" id_profile="SuperAdmin" id_tab="tab_107" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_108" id_profile="SuperAdmin" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_109" id_profile="SuperAdmin" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_1_110" id_profile="SuperAdmin" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
</entities>
</entity_access>
install-new/data/xml/configuration.xml
+10 -4
View File
@@ -192,13 +192,13 @@
<value>0</value>
</configuration>
<configuration id="PS_1_3_UPDATE_DATE" name="PS_1_3_UPDATE_DATE">
<value>2011-12-22 10:17:01</value>
<value>2011-12-22 17:39:33</value>
</configuration>
<configuration id="PS_PRICE_ROUND_MODE" name="PS_PRICE_ROUND_MODE">
<value>2</value>
</configuration>
<configuration id="PS_1_3_2_UPDATE_DATE" name="PS_1_3_2_UPDATE_DATE">
<value>2011-12-22 10:17:01</value>
<value>2011-12-22 17:39:33</value>
</configuration>
<configuration id="PS_CONDITIONS_CMS_ID" name="PS_CONDITIONS_CMS_ID">
<value>3</value>
@@ -342,7 +342,7 @@
<value>1</value>
</configuration>
<configuration id="PS_IMG_UPDATE_TIME" name="PS_IMG_UPDATE_TIME">
<value>1324545421</value>
<value>1324571973</value>
</configuration>
<configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
<value>1</value>
@@ -494,6 +494,12 @@
<configuration id="PS_SMARTY_CONSOLE" name="PS_SMARTY_CONSOLE">
<value>0</value>
</configuration>
<configuration id="PS_B2B_ENABLE" name="PS_B2B_ENABLE">
<value>0</value>
</configuration>
<configuration id="PS_INVOICE_MODEL" name="PS_INVOICE_MODEL">
<value>invoice</value>
</configuration>
<configuration id="MB_PAY_TO_EMAIL" name="MB_PAY_TO_EMAIL">
<value/>
</configuration>
@@ -849,7 +855,7 @@
<value>1</value>
</configuration>
<configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
<value>2</value>
<value>1</value>
</configuration>
</entities>
</entity_configuration>
install-new/data/xml/risk.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<entity_risk>
<fields id="name" class="Risk">
<field name="percent"/>
<field name="color"/>
</fields>
<entities>
<risk id="None" percent="0" color="LimeGreen"/>
<risk id="Low" percent="35" color="DarkOrange"/>
<risk id="Middle" percent="75" color="Crimson"/>
<risk id="Hight" percent="100" color="#ec2e15"/>
</entities>
</entity_risk>
install-new/data/xml/tab.xml
+3
View File
@@ -302,5 +302,8 @@
<tab id="Catalog_price_rules" id_parent="Catalog">
<class_name>AdminSpecificPriceRule</class_name>
</tab>
<tab id="Outstanding" id_parent="Customers">
<class_name>AdminOutstanding</class_name>
</tab>
</entities>
</entity_tab>
install-new/fixtures/apple/data/access.xml
+1
View File
@@ -108,6 +108,7 @@
<access id="access_2_107" id_profile="Administrator" id_tab="tab_107" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_108" id_profile="Administrator" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_109" id_profile="Administrator" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_110" id_profile="Administrator" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_1" id_profile="Logistician" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_2" id_profile="Logistician" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_3" id_profile="Logistician" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
install-new/fixtures/apple/data/customer.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<field name="is_guest"/>
</fields>
<entities>
<customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="03c1ae6b8706086bd29c3b05e49b8488" last_passwd_gen="2011-12-22 10:17:01" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
<customer id="John" id_gender="Mr" id_default_group="3" firstname="John" lastname="DOE" passwd="028f9b77cb416ceade452c29b258e55d" last_passwd_gen="2011-12-22 17:39:33" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="" optin="1" secure_key="47ce86627c1f3c792a80773c5d2deaf8" active="1" is_guest="0">
<email>pub@prestashop.com</email>
<note/>
</customer>
install-new/langs/de/data/risk.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<entity_risk>
<risk id="None" name="None"/>
<risk id="Low" name="Low"/>
<risk id="Middle" name="Middle"/>
<risk id="Hight" name="Hight"/>
</entity_risk>
install-new/langs/de/data/tab.xml
+1
View File
@@ -99,4 +99,5 @@
<tab id="tab_107" name=""/>
<tab id="Configuration" name="Configuration"/>
<tab id="Catalog_price_rules" name="Catalog price rules"/>
<tab id="Outstanding" name="Outstanding"/>
</entity_tab>
install-new/langs/en/data/risk.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<entity_risk>
<risk id="None" name="None"/>
<risk id="Low" name="Low"/>
<risk id="Middle" name="Middle"/>
<risk id="Hight" name="Hight"/>
</entity_risk>
install-new/langs/en/data/tab.xml
+1
View File
@@ -99,4 +99,5 @@
<tab id="tab_107" name=""/>
<tab id="Configuration" name="Configuration"/>
<tab id="Catalog_price_rules" name="Catalog price rules"/>
<tab id="Outstanding" name="Outstanding"/>
</entity_tab>
install-new/langs/es/data/risk.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<entity_risk>
<risk id="None" name="None"/>
<risk id="Low" name="Low"/>
<risk id="Middle" name="Middle"/>
<risk id="Hight" name="Hight"/>
</entity_risk>
install-new/langs/es/data/tab.xml
+1
View File
@@ -99,4 +99,5 @@
<tab id="tab_107" name=""/>
<tab id="Configuration" name="Configuration"/>
<tab id="Catalog_price_rules" name="Catalog price rules"/>
<tab id="Outstanding" name="Outstanding"/>
</entity_tab>
install-new/langs/fr/data/risk.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<entity_risk>
<risk id="None" name="Aucun"/>
<risk id="Low" name="Faible"/>
<risk id="Middle" name="Moyen"/>
<risk id="Hight" name="&#xC9;lev&#xE9;"/>
</entity_risk>
install-new/langs/fr/data/tab.xml
+1
View File
@@ -99,4 +99,5 @@
<tab id="tab_107" name=""/>
<tab id="Configuration" name="Configuration"/>
<tab id="Catalog_price_rules" name="R&#xE8;gles de prix catalogue"/>
<tab id="Outstanding" name="Encours"/>
</entity_tab>
install-new/langs/it/data/risk.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<entity_risk>
<risk id="None" name="None"/>
<risk id="Low" name="Low"/>
<risk id="Middle" name="Middle"/>
<risk id="Hight" name="Hight"/>
</entity_risk>
install-new/langs/it/data/tab.xml
+1
View File
@@ -99,4 +99,5 @@
<tab id="tab_107" name=""/>
<tab id="Configuration" name="Configuration"/>
<tab id="Catalog_price_rules" name="Catalog price rules"/>
<tab id="Outstanding" name="Outstanding"/>
</entity_tab>