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

// Fix delivery in new install

Browse Source
This commit is contained in:
rMalie
2011-12-22 22:11:12 +00:00
parent b0aeba9516
commit e3b373dc71
6 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-new/data/xml/address_format.xml
+19 -19
View File
@@ -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">
install-new/data/xml/configuration.xml
+4 -16
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 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>
install-new/data/xml/delivery.xml
+13
View File
@@ -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>