// Fix delivery in new install

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11709 b9a71923-0436-4b27-9f14-aed3839534dd
PrestaShop · Dec 22, 2011 · 5508823 · 5508823
1 parent ca3ab74
commit 5508823
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 42 deletions.
diff --git a/install-new/data/db_structure.sql b/install-new/data/db_structure.sql
@@ -867,6 +867,7 @@ CREATE TABLE `PREFIX_image_lang` (
 
 CREATE TABLE `PREFIX_image_type` (
   `id_image_type` int(10) unsigned NOT NULL auto_increment,
+  `id_theme` INT(11) unsigned NOT NULL,
   `name` varchar(16) NOT NULL,
   `width` int(10) unsigned NOT NULL,
   `height` int(10) unsigned NOT NULL,
@@ -877,7 +878,7 @@ CREATE TABLE `PREFIX_image_type` (
   `scenes` tinyint(1) NOT NULL default '1',
   `stores` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id_image_type`),
-  KEY `image_type_name` (`name`)
+  UNIQUE KEY `image_type_name` (`id_theme`, `name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_lang` (

diff --git a/install-new/data/xml/address_format.xml b/install-new/data/xml/address_format.xml
@@ -36,12 +36,12 @@ Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_4" id_country="CA">
-      <format>firstname lastname&#13;
-company&#13;
-address1&#13;
-address2&#13;
-city State:name postcode&#13;
-Country:name&#13;
+      <format>firstname lastname
+company
+address1
+address2
+city State:name postcode
+Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_5" id_country="CN">
@@ -95,14 +95,14 @@ Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_10" id_country="IT">
-      <format>firstname lastname&#13;
-company&#13;
-vat_number&#13;
-address1&#13;
-address2&#13;
-postcode city&#13;
-State:name&#13;
-Country:name&#13;
+      <format>firstname lastname
+company
+vat_number
+address1
+address2
+postcode city
+State:name
+Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_11" id_country="JP">
@@ -206,11 +206,11 @@ Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_21" id_country="US">
-      <format>firstname lastname&#13;
-company&#13;
-address1 address2&#13;
-city, State:name postcode&#13;
-Country:name&#13;
+      <format>firstname lastname
+company
+address1 address2
+city, State:name postcode
+Country:name
 phone</format>
     </address_format>
     <address_format id="address_format_22" id_country="HK">

diff --git a/install-new/data/xml/configuration.xml b/install-new/data/xml/configuration.xml
@@ -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 22:46:00</value>
+      <value>2011-12-22 23:11:43</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 22:46:00</value>
+      <value>2011-12-22 23:11:43</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>1324590360</value>
+      <value>1324591903</value>
     </configuration>
     <configuration id="PS_BACKUP_DROP_TABLE" name="PS_BACKUP_DROP_TABLE">
       <value>1</value>
@@ -494,18 +494,6 @@
     <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="PS_LIMIT_UPLOAD_IMAGE_VALUE" name="PS_LIMIT_UPLOAD_IMAGE_VALUE">
-      <value>2</value>
-    </configuration>
-    <configuration id="PS_LIMIT_UPLOAD_FILE_VALUE" name="PS_LIMIT_UPLOAD_FILE_VALUE">
-      <value>2</value>
-    </configuration>
     <configuration id="MB_PAY_TO_EMAIL" name="MB_PAY_TO_EMAIL">
       <value/>
     </configuration>
@@ -861,7 +849,7 @@
       <value>1</value>
     </configuration>
     <configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
-      <value>2</value>
+      <value>0</value>
     </configuration>
   </entities>
 </entity_configuration>
diff --git a/install-new/data/xml/delivery.xml b/install-new/data/xml/delivery.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<entity_delivery>
+  <fields class="Delivery" sql="a.id_carrier = 1">
+    <field name="id_shop"/>
+    <field name="id_group_shop"/>
+    <field name="id_carrier" relation="carrier"/>
+    <field name="id_range_price" relation="range_price"/>
+    <field name="id_range_weight" relation="range_weight"/>
+    <field name="id_zone" relation="zone"/>
+    <field name="price"/>
+  </fields>
+  <entities/>
+</entity_delivery>
diff --git a/install-new/fixtures/apple/data/customer.xml b/install-new/fixtures/apple/data/customer.xml
@@ -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="e854ea98ca70113b5f2749044ed5e812" last_passwd_gen="2011-12-22 22:46:00" 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="8ba6e3efb3ea6ae43b746b25b7576b5c" last_passwd_gen="2011-12-22 23:11:43" 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>

diff --git a/install-new/fixtures/apple/data/delivery.xml b/install-new/fixtures/apple/data/delivery.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_delivery>
-  <fields class="Delivery">
+  <fields class="Delivery" sql="a.id_carrier &gt; 1">
+    <field name="id_shop"/>
+    <field name="id_group_shop"/>
     <field name="id_carrier" relation="carrier"/>
     <field name="id_range_price" relation="range_price"/>
     <field name="id_range_weight" relation="range_weight"/>
     <field name="id_zone" relation="zone"/>
     <field name="price"/>
   </fields>
   <entities>
-    <delivery id="delivery_1" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="Europe" price="5.000000"/>
-    <delivery id="delivery_2" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="North_America" price="5.000000"/>
-    <delivery id="delivery_4" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="Europe" price="5.000000"/>
-    <delivery id="delivery_5" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="North_America" price="5.000000"/>
+    <delivery id="delivery_1" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="Europe" price="5.000000"/>
+    <delivery id="delivery_2" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="" id_range_weight="range_weight_1" id_zone="North_America" price="5.000000"/>
+    <delivery id="delivery_4" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="Europe" price="5.000000"/>
+    <delivery id="delivery_5" id_shop="" id_group_shop="" id_carrier="My_carrier" id_range_price="range_price_1" id_range_weight="" id_zone="North_America" price="5.000000"/>
   </entities>
 </entity_delivery>