Commit 802b84e4 authored by Shudrum's avatar Shudrum

Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

parents 1f0a8995 b49abdc3
...@@ -68,12 +68,14 @@ ...@@ -68,12 +68,14 @@
{if $host_mode} {if $host_mode}
<div class="alert alert-info"> <div class="alert alert-info">
<h4>{l s='How to restore a database backup'}</h4> <h4>{l s='How to restore a database backup'}</h4>
<ol> {l s='If you need to restore a database backup, we invite you to subscribe to a [1][2]technical support plan[/2][/1].' tags=['<strong>', '<a class="_blank" href="http://addons.prestashop.com/support/16298-support-essentiel-plan.html">']}
<li>{l s='If you wish to restore a database backup, we invite you to open a support ticket on your [1]PrestaShop.com account[/1].' tags=['<a href="https://www.prestashop.com/cloud/support?init=ask">']}</li> <br />
<li>{l s='Our team will take care of restoring your database safely.'}</li> {l s='Our team will take care of restoring your database safely.'}
<li>{l s='Why can\'t I restore it by myself?'}</li> <br />
<li>{l s='Your shop is hosted by PrestaShop. Although you can create backup files here below, there are core settings you cannot access for security reasons, like the database management. Thus, only our team can proceed to a restoration.'}</li> <br />
</ol> {l s='Why can\'t I restore it by myself?'}
<br />
{l s='Your shop is hosted by PrestaShop. Although you can create backup files here below, there are core settings you cannot access for security reasons, like the database management. Thus, only our team can proceed to a restoration.'}
</div> </div>
{else} {else}
<div class="alert alert-info"> <div class="alert alert-info">
......
...@@ -366,7 +366,7 @@ class AddressCore extends ObjectModel ...@@ -366,7 +366,7 @@ class AddressCore extends ObjectModel
$address = new Address(); $address = new Address();
$address->id_country = (int)$context->customer->geoloc_id_country; $address->id_country = (int)$context->customer->geoloc_id_country;
$address->id_state = (int)$context->customer->id_state; $address->id_state = (int)$context->customer->id_state;
$address->zipcode = $context->customer->postcode; $address->postcode = $context->customer->postcode;
} }
else else
{ {
......
...@@ -336,7 +336,7 @@ class ReferrerCore extends ObjectModel ...@@ -336,7 +336,7 @@ class ReferrerCore extends ObjectModel
$json_array = array( $json_array = array(
'id_product' => (int)$product->id, 'id_product' => (int)$product->id,
'product_name' => addslashes($product->name), 'product_name' => htmlspecialchars($product->name),
'uniqs' => (int)$stats_visits['uniqs'], 'uniqs' => (int)$stats_visits['uniqs'],
'visitors' => (int)$stats_visits['visitors'], 'visitors' => (int)$stats_visits['visitors'],
'visits' => (int)$stats_visits['visits'], 'visits' => (int)$stats_visits['visits'],
...@@ -354,4 +354,4 @@ class ReferrerCore extends ObjectModel ...@@ -354,4 +354,4 @@ class ReferrerCore extends ObjectModel
die ('['.Tools::jsonEncode($json_array).']'); die ('['.Tools::jsonEncode($json_array).']');
} }
} }
\ No newline at end of file
...@@ -2089,7 +2089,7 @@ class OrderCore extends ObjectModel ...@@ -2089,7 +2089,7 @@ class OrderCore extends ObjectModel
return true; return true;
} }
public function getWsCurrentState($state) public function getWsCurrentState()
{ {
return $this->getCurrentState(); return $this->getCurrentState();
} }
......
...@@ -1280,6 +1280,9 @@ class AdminThemesControllerCore extends AdminController ...@@ -1280,6 +1280,9 @@ class AdminThemesControllerCore extends AdminController
if (count($to_install) > 0) if (count($to_install) > 0)
{ {
foreach ($to_install as $module)
$fields_value['modulesToExport_module'.$module] = true;
$fields_form['form']['input'][] = array( $fields_form['form']['input'][] = array(
'type' => 'checkbox', 'type' => 'checkbox',
'label' => $this->l('Select the theme\'s modules that you wish to export'), 'label' => $this->l('Select the theme\'s modules that you wish to export'),
......
...@@ -1452,7 +1452,7 @@ CREATE TABLE `PREFIX_product` ( ...@@ -1452,7 +1452,7 @@ CREATE TABLE `PREFIX_product` (
`redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '', `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '',
`id_product_redirected` int(10) unsigned NOT NULL DEFAULT '0', `id_product_redirected` int(10) unsigned NOT NULL DEFAULT '0',
`available_for_order` tinyint(1) NOT NULL DEFAULT '1', `available_for_order` tinyint(1) NOT NULL DEFAULT '1',
`available_date` date NOT NULL, `available_date` date NOT NULL DEFAULT '0000-00-00',
`condition` ENUM('new', 'used', 'refurbished') NOT NULL DEFAULT 'new', `condition` ENUM('new', 'used', 'refurbished') NOT NULL DEFAULT 'new',
`show_price` tinyint(1) NOT NULL DEFAULT '1', `show_price` tinyint(1) NOT NULL DEFAULT '1',
`indexed` tinyint(1) NOT NULL DEFAULT '0', `indexed` tinyint(1) NOT NULL DEFAULT '0',
...@@ -1494,7 +1494,7 @@ CREATE TABLE IF NOT EXISTS `PREFIX_product_shop` ( ...@@ -1494,7 +1494,7 @@ CREATE TABLE IF NOT EXISTS `PREFIX_product_shop` (
`redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '', `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '',
`id_product_redirected` int(10) unsigned NOT NULL DEFAULT '0', `id_product_redirected` int(10) unsigned NOT NULL DEFAULT '0',
`available_for_order` tinyint(1) NOT NULL DEFAULT '1', `available_for_order` tinyint(1) NOT NULL DEFAULT '1',
`available_date` date NOT NULL, `available_date` date NOT NULL DEFAULT '0000-00-00',
`condition` enum('new','used','refurbished') NOT NULL DEFAULT 'new', `condition` enum('new','used','refurbished') NOT NULL DEFAULT 'new',
`show_price` tinyint(1) NOT NULL DEFAULT '1', `show_price` tinyint(1) NOT NULL DEFAULT '1',
`indexed` tinyint(1) NOT NULL DEFAULT '0', `indexed` tinyint(1) NOT NULL DEFAULT '0',
...@@ -1525,7 +1525,7 @@ CREATE TABLE `PREFIX_product_attribute` ( ...@@ -1525,7 +1525,7 @@ CREATE TABLE `PREFIX_product_attribute` (
`unit_price_impact` DECIMAL(20,6) NOT NULL DEFAULT '0.00', `unit_price_impact` DECIMAL(20,6) NOT NULL DEFAULT '0.00',
`default_on` tinyint(1) unsigned NOT NULL DEFAULT '0', `default_on` tinyint(1) unsigned NOT NULL DEFAULT '0',
`minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1', `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1',
`available_date` date NOT NULL, `available_date` date NOT NULL DEFAULT '0000-00-00',
PRIMARY KEY (`id_product_attribute`), PRIMARY KEY (`id_product_attribute`),
KEY `product_attribute_product` (`id_product`), KEY `product_attribute_product` (`id_product`),
KEY `reference` (`reference`), KEY `reference` (`reference`),
...@@ -1544,7 +1544,7 @@ CREATE TABLE `PREFIX_product_attribute_shop` ( ...@@ -1544,7 +1544,7 @@ CREATE TABLE `PREFIX_product_attribute_shop` (
`unit_price_impact` DECIMAL(20,6) NOT NULL DEFAULT '0.00', `unit_price_impact` DECIMAL(20,6) NOT NULL DEFAULT '0.00',
`default_on` tinyint(1) unsigned NOT NULL DEFAULT '0', `default_on` tinyint(1) unsigned NOT NULL DEFAULT '0',
`minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1', `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1',
`available_date` date NOT NULL, `available_date` date NOT NULL DEFAULT '0000-00-00',
PRIMARY KEY (`id_product_attribute`, `id_shop`) PRIMARY KEY (`id_product_attribute`, `id_shop`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION; ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
......
...@@ -47,4 +47,9 @@ CREATE TABLE `PREFIX_cms_category_shop` ( ...@@ -47,4 +47,9 @@ CREATE TABLE `PREFIX_cms_category_shop` (
ALTER TABLE `PREFIX_customization_field_lang` ADD `id_shop` INT(10) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_lang`; ALTER TABLE `PREFIX_customization_field_lang` ADD `id_shop` INT(10) UNSIGNED NOT NULL DEFAULT '1' AFTER `id_lang`;
ALTER TABLE `PREFIX_customization_field_lang` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_customization_field`, `id_shop`, `id_lang`); ALTER TABLE `PREFIX_customization_field_lang` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_customization_field`, `id_shop`, `id_lang`);
/* PHP:customization_field_multishop_lang(); */; /* PHP:customization_field_multishop_lang(); */;
\ No newline at end of file
ALTER TABLE `PREFIX_product` CHANGE `available_date` `available_date` DATE NOT NULL DEFAULT '0000-00-00';
ALTER TABLE `PREFIX_product_shop` CHANGE `available_date` `available_date` DATE NOT NULL DEFAULT '0000-00-00';
ALTER TABLE `PREFIX_product_attribute` CHANGE `available_date` `available_date` DATE NOT NULL DEFAULT '0000-00-00';
ALTER TABLE `PREFIX_product_attribute_shop` CHANGE `available_date` `available_date` DATE NOT NULL DEFAULT '0000-00-00';
...@@ -356,7 +356,7 @@ function bind_inputs() ...@@ -356,7 +356,7 @@ function bind_inputs()
}); });
} }
else else
$(this).closest('tr').find('td').find('div.input-group input:text').attr('disabled', 'disabled').val(''); $(this).closest('tr').find('td').find('div.input-group input:text').attr('disabled', 'disabled');
return false; return false;
}); });
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<currency name="Dollar (CAD)" iso_code="CAD" iso_code_num="124" sign="CAD$" blank="0" conversion_rate="1.40054" format="1" decimals="1" /> <currency name="Dollar (CAD)" iso_code="CAD" iso_code_num="124" sign="CAD$" blank="0" conversion_rate="1.40054" format="1" decimals="1" />
</currencies> </currencies>
<languages> <languages>
<language iso_code="fr" /> <language iso_code="qc" />
<language iso_code="en" /> <language iso_code="en" />
</languages> </languages>
<states> <states>
...@@ -59,4 +59,3 @@ ...@@ -59,4 +59,3 @@
</configurations> </configurations>
<group_default price_display_method="1" /> <group_default price_display_method="1" />
</localizationPack> </localizationPack>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<currency name="Franc" iso_code="CHF" iso_code_num="756" sign="CHF" blank="1" conversion_rate="1.34183" format="5" decimals="1" /> <currency name="Franc" iso_code="CHF" iso_code_num="756" sign="CHF" blank="1" conversion_rate="1.34183" format="5" decimals="1" />
</currencies> </currencies>
<languages> <languages>
<language iso_code="de" /> <language iso_code="dh" />
<language iso_code="fr" /> <language iso_code="fr" />
<language iso_code="it" /> <language iso_code="it" />
</languages> </languages>
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
<tax id="1" name="TVA CH 8.0%" rate="8.0" /> <tax id="1" name="TVA CH 8.0%" rate="8.0" />
<tax id="2" name="TVA CH 3.8%" rate="3.8" /> <tax id="2" name="TVA CH 3.8%" rate="3.8" />
<tax id="3" name="TVA CH 2.5%" rate="2.5" /> <tax id="3" name="TVA CH 2.5%" rate="2.5" />
<taxRulesGroup name="CH Standard Rate (8.0%)"> <taxRulesGroup name="CH Standard Rate (8.0%)">
<taxRule iso_code_country="ch" id_tax="1" /> <taxRule iso_code_country="ch" id_tax="1" />
</taxRulesGroup> </taxRulesGroup>
<taxRulesGroup name="CH Reduced Rate (3.8%)"> <taxRulesGroup name="CH Reduced Rate (3.8%)">
<taxRule iso_code_country="ch" id_tax="2" /> <taxRule iso_code_country="ch" id_tax="2" />
</taxRulesGroup> </taxRulesGroup>
<taxRulesGroup name="CH Super Reduced Rate (2.5%)"> <taxRulesGroup name="CH Super Reduced Rate (2.5%)">
<taxRule iso_code_country="ch" id_tax="3" /> <taxRule iso_code_country="ch" id_tax="3" />
</taxRulesGroup> </taxRulesGroup>
...@@ -32,4 +32,4 @@ ...@@ -32,4 +32,4 @@
<unit type="base_distance" value="m" /> <unit type="base_distance" value="m" />
<unit type="long_distance" value="km" /> <unit type="long_distance" value="km" />
</units> </units>
</localizationPack> </localizationPack>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment