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

.gitignore

@@ -12,6 +12,7 @@ config.codekit
 robots.txt
 sitemap.xml
 cache/cachefs/*
+cache/purifier/HTML/*
 !cache/cachefs/index.php
 download/*
 !download/index.php

admin-dev/cron_currency_rates.php

@@ -31,6 +31,13 @@
 if (isset($_GET['secure_key']))
 {
 	$secureKey = md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME'));
-	if (!empty($secureKey) AND $secureKey === $_GET['secure_key'])
-                Currency::refreshCurrencies();
-}
+	if (!empty($secureKey) && $secureKey === $_GET['secure_key'])
+	{
+		$shop_ids = Shop::getCompleteListOfShopsID();
+		foreach($shop_ids as $shop_id)
+		{
+			Shop::setContext(Shop::CONTEXT_SHOP, (int)$shop_id);
+			Currency::refreshCurrencies();
+		}
+	}
+}

admin-dev/themes/default/js/help.js

@@ -299,7 +299,7 @@ $(function() {
 			comment: null
 		};
 		$('#help-container .helpful-labels li').on('click', function(){
-			var percentageMap = {0:'Not at all', 25:'Not very', 50:'Somewhat', 75:'Very', 100:'Extremly'};
+			var percentageMap = {0:'Not at all', 25:'Not very', 50:'Somewhat', 75:'Very', 100:'Extremely'};
 			var percentage = parseInt($(this).data('percentage'));
 			arr_feedback.helpful = percentageMap[percentage];
 			$('#help-container .slider-cursor').removeClass('hide');

admin-dev/themes/default/sass/partials/_commons.sass

@@ -157,3 +157,8 @@
 
 #mColorPickerInput
 	color: #000000
+
+//modals
+.modal-content-overflow
+	max-height: 400px
+	overflow-y: scroll

admin-dev/themes/default/template/controllers/cms_content/content.tpl

@@ -30,3 +30,11 @@
 {/if}
 
 {$content}
+<script type="text/javascript">
+$(document).ready(function () {
+	var re = /url_cms_preview=(.*)/;
+	var url = re.exec(document.URL);
+	if (typeof(url[1]) != "undifined" && url[1])
+		window.open(url[1], "_blank");
+});
+</script>

admin-dev/themes/default/template/controllers/customer_threads/helpers/view/message.tpl

@@ -53,7 +53,8 @@
 			</h4>
 		{/if}
 		<span class="message-date">&nbsp;<i class="icon-calendar"></i> - {dateFormat date=$message.date_add full=0} - <i class="icon-time"></i> {$message.date_add|substr:11:5}</span>
-		{if isset($message.file_name)} <span class="message-attachment">&nbsp;<i class="icon-link"></i> <a href="{$message.file_name|escape:'html':'UTF-8'}" target="_blank">{l s="Attachment"}</a></span>{/if}
+		{if isset($message.file_name)} <span class="message-product">&nbsp;<i class="icon-link"></i> <a href="{$message.file_name|escape:'html':'UTF-8'}" target="_blank">{l s="Attachment"}</a></span>{/if}
+		{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" target="_blank">{l s="Product:"} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
 		<p class="message-item-text">{$message.message|escape:'html':'UTF-8'}</p>
 	</div>
 </div>

admin-dev/themes/default/template/controllers/marketing/helpers/view/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to [email protected] so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <[email protected]>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../../../');
+exit;

admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl

@@ -1 +1,26 @@
+{*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to [email protected] so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <[email protected]>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
 {$modules_list}

admin-dev/themes/default/template/controllers/marketing/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to [email protected] so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <[email protected]>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../../../');
+exit;

admin-dev/themes/default/template/controllers/meta/helpers/index.php

@@ -31,5 +31,5 @@
 header('Cache-Control: post-check=0, pre-check=0', false);
 header('Pragma: no-cache');
 
-header('Location: ../../../../../../../');
+header('Location: ../../../../../../../../');
 exit;

admin-dev/themes/default/template/controllers/modules/list.tpl

@@ -112,9 +112,15 @@
 										{/if}
 									{else}
 										{if isset($module->trusted) && $module->trusted}
-										<a class="btn btn-success" href="{$module->options.install_url|escape:'html':'UTF-8'}">
-											<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Install'}
-										</a>
+											{if $module->trusted == 2}
+												<a class="btn btn-success untrustedaddon" href="#" data-target="#moduleNotTrustedCountry" data-toggle="modal" data-link="{$module->options.install_url|escape:'html':'UTF-8'}" data-module-name="{$module->displayName}">
+													<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Install'}
+												</a>
+											{else}
+												<a class="btn btn-success" href="{$module->options.install_url|escape:'html':'UTF-8'}">
+													<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Install'}
+												</a>
+											{/if}
 										{else}
 										<a class="btn btn-success untrustedaddon" href="#" data-target="#moduleNotTrusted" data-toggle="modal" data-link="{$module->options.install_url|escape:'html':'UTF-8'}" data-module-name="{$module->displayName}">
 											<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Install'}

admin-dev/themes/default/template/controllers/modules/modal_not_trusted_country.tpl

@@ -0,0 +1,50 @@
+{*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to [email protected] so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <[email protected]>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{assign var=module_name value='<strong><span class="module-name-placeholder"></span></strong>'}
+
+<div class="modal-body">
+	<div class="alert alert-warning">
+		<h4>{l s='You are about to install "%s", a module which is not compatible with your country.' sprintf=$module_name}</h4>
+		<p>
+			{l s='This module was not verified by PrestaShop hence we cannot certify that it works well in your country and that it complies with our quality requirements.'}
+			<strong>{l s='Use at your own risk.'}</strong>
+		</p>
+	</div>
+	<h3>{l s='What Should I Do?'}</h3>
+	<p>
+		{l s='If you are unsure about this, you should contact the Customer Service of %s to ask them to make the module compatible with your country.' sprintf=$module_name}<br />
+		{l s='Moreover, we recommend that you use an equivalent module: compatible modules for your country are listed in the "Modules" tab of your Back-Office.'}
+	</p>
+	<p>
+		{l s='If you are unsure about this module, you can look for similar modules on the official marketplace.'}
+		<a target="_blank" href="http://addons.prestashop.com/">{l s='Click here to browse PrestaShop Addons.'}</a>
+	</p>
+</div>
+
+<div class="modal-footer">
+	<button type="button" class="btn btn-default" data-dismiss="modal">{l s='Back to the module list'}</button>
+	<a id="proceed-install-anyway" href="#" class="btn btn-warning">{l s='Proceed with the installation'}</a>
+</div>

admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl

@@ -37,7 +37,7 @@
 					- <span class="module-badge-bought help-tooltip text-warning" data-title="{l s="You bought this module on PrestaShop Addons. Thank You."}"><i class="icon-pushpin"></i> <small>{l s="Bought"}</small></span>
 				{elseif isset($module->type) && $module->type == 'addonsMustHave'}
 					- <span class="module-badge-popular help-tooltip text-primary" data-title="{l s="This module is available on PrestaShop Addons"}"><i class="icon-group"></i> <small>{l s="Popular"}</small></span>
-				{elseif isset($module->type) && ($module->type == 'addonsPartner' || $module->type == 'addonsNative')}
+				{elseif isset($module->type) && $module->type == 'addonsPartner'}
 					- <span class="module-badge-partner help-tooltip text-warning" data-title="{l s="This module is available for free thanks to our partner."}"><i class="icon-pushpin"></i> <small>{l s="Official"}</small></span>
 				{elseif isset($module->id) && $module->id gt 0}
 					{if isset($module->version_addons) && $module->version_addons}

admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl

@@ -45,7 +45,7 @@
 			</ul>
 		</div>
 	</div>
-	<div id="modules_list_container_content" class="tab-content">
+	<div id="modules_list_container_content" class="tab-content modal-content-overflow">
 		{if count($tab_modules_list.not_installed)}
 		<div class="tab-pane active" id="tab_modules_list_not_installed">
 			<table id="tab_modules_list_not_installed" class="table">

admin-dev/themes/default/template/controllers/modules_positions/form.tpl

@@ -99,7 +99,10 @@
 	function position_exception_listchange() {
 		var obj = $(this);
 		var shopID = obj.attr('id').replace(/\D/g, '');
-		var str = obj.val().join(', ');
+		var val = obj.val();
+		var str = '';
+		if (val)
+			str = val.join(', ');
 		obj.closest('form').find('#em_text_' + shopID).val(str);
 	}
 	$(document).ready(function(){

admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl

@@ -482,11 +482,12 @@
 										</div>
 									</td>
 									<td>
-										<select name="payment_method" class="payment_method">
+										<input name="payment_method" list="payment_method" class="payment_method">
+										<datalist id="payment_method">
 										{foreach from=$payment_methods item=payment_method}
-											<option value="{$payment_method}">{$payment_method}</option>
+											<option value="{$payment_method}">
 										{/foreach}
-										</select>
+										</datalist>
 									</td>
 									<td>
 										<input type="text" name="payment_transaction_id" value="" class="form-control fixed-width-sm"/>

admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl

@@ -26,9 +26,9 @@
 
 {block name="input_row"}
 	{if $input.name == 'caching_system'}<div id="{$input.name}_wrapper"{if isset($_PS_CACHE_ENABLED_) && !$_PS_CACHE_ENABLED_} style="display:none"{/if}>{/if}
-	{if $input.name == 'smarty_caching_type'}<div id="{$input.name}_wrapper"{if isset($fields_value.smarty_cache) && !$fields_value.smarty_cache} style="display:none"{/if}>{/if}
+	{if $input.name == 'smarty_caching_type' || $input.name == 'smarty_clear_cache'}<div id="{$input.name}_wrapper"{if isset($fields_value.smarty_cache) && !$fields_value.smarty_cache} style="display:none"{/if}>{/if}
 	{$smarty.block.parent}
-	{if $input.name == 'caching_system' || $input.name == 'smarty_caching_type'}</div>{/if}
+	{if $input.name == 'caching_system' || $input.name == 'smarty_caching_type' || $input.name == 'smarty_clear_cache'}</div>{/if}
 {/block}
 
 {block name="input"}
@@ -164,6 +164,7 @@
 
 		$('input[name="smarty_cache"]').change(function() {
 			$('#smarty_caching_type_wrapper').css('display', ($(this).val() == 1) ? 'block' : 'none');
+			$('#smarty_clear_cache_wrapper').css('display', ($(this).val() == 1) ? 'block' : 'none');
 		});
 
 		$('#addMemcachedServer').click(function() {
@@ -206,7 +207,7 @@
 			return false;
 		});
 
-		$('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_caching_type"], input[name="smarty_console"], input[name="smarty_console_key"]').change(function(){
+		$('input[name="smarty_force_compile"], input[name="smarty_cache"], input[name="smarty_clear_cache"], input[name="smarty_caching_type"], input[name="smarty_console"], input[name="smarty_console_key"]').change(function(){
 			$('#smarty_up').val(1);
 		});
 

admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl

@@ -33,12 +33,12 @@
 			setup : function(ed) {
 				ed.on('init', function(ed)
 				{
-					if (typeof ProductMultishop.load_tinymce[ed.id] != 'undefined')
+					if (typeof ProductMultishop.load_tinymce[ed.target.id] != 'undefined')
 					{
-						if (typeof ProductMultishop.load_tinymce[ed.id])
-							ed.hide();
+						if (typeof ProductMultishop.load_tinymce[ed.target.id])
+							tinyMCE.get(ed.target.id).hide();
 						else
-							ed.show();
+							tinyMCE.get(ed.target.id).show();
 					}
 				});
 
@@ -302,7 +302,7 @@
 
 			{* all input are here *}
 			{foreach $product_tabs key=numStep item=tab}
-				{if $tab.name != "Pack" }
+				{if $tab.id != "Pack" }
 				<div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
 					{if $tab.selected}
 						{$custom_form}
@@ -315,4 +315,5 @@
 		</form>
 	</div>
 
-{/block}
+{/block}
+