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

Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php

js/admin.js

@@ -477,32 +477,6 @@ function validateImportation(mandatory)
 		}
 }
 
-function askFeatureName(selected, selector)
-{
-	var elem;
-
-	if (selected.value == 'features')
-	{
-		$('#features_' + selector).show();
-		$('#feature_name_' + selector).attr('name', selected.name);
-	}
-}
-
-function replaceFeature(toReplace, selector)
-{
-	var elem;
-
-	if ($('#feature_name_' + selector).val() == '')
-		return false;
-
-	elem = getE(toReplace);
-	elem.options[elem.selectedIndex].text = $('#feature_name_' + selector).val();
-	elem.options[elem.selectedIndex].value = '#F_' + $('#feature_name_' + selector).val();
-	$('#features_' + selector).toggle();
-	$('#feature_name_' + selector).val('');
-	$('#feature_name_' + selector).attr('name', '');
-}
-
 function chooseTypeTranslation(id_lang)
 {
 	getE('translation_lang').value = id_lang;

js/adminImport.js

@@ -37,12 +37,12 @@ $(document).ready(function(){
 			matchFields += '&'+$(this).attr('id')+'='+$(this).attr('value');
 		});
 		$.ajax({
-	       type: 'GET',
+	       type: 'POST',
 	       url: 'index.php',
 	       async: false,
 	       cache: false,
 	       dataType : "json",
-	       data: 'ajax=1&action=saveImportMatchs&skip='+$('input[name=skip]').attr('value')+'&newImportMatchs='+newImportMatchs+matchFields+'&tab=AdminImport&token='+token,
+	       data: 'ajax=1&action=saveImportMatchs&tab=AdminImport&token=' + token + '&skip=' + $('input[name=skip]').attr('value') + '&newImportMatchs=' + newImportMatchs + matchFields,
 	       success: function(jsonData)
 	       {
 				$('#valueImportMatchs').append('<option id="'+jsonData.id+'" value="'+matchFields+'" selected="selected">'+newImportMatchs+'</option>');
@@ -62,12 +62,12 @@ $(document).ready(function(){
 	
 		var idToLoad = $('select#valueImportMatchs option:selected').attr('id');
 		$.ajax({
-		       type: 'GET',
+		       type: 'POST',
 		       url: 'index.php',
 		       async: false,
 		       cache: false,
 		       dataType : "json",
-		       data: 'ajax=1&action=loadImportMatchs&idImportMatchs='+idToLoad+'&tab=AdminImport&token='+token,
+		       data: 'ajax=1&action=loadImportMatchs&tab=AdminImport&token=' + token + '&idImportMatchs=' + idToLoad,
 		       success: function(jsonData)
 		       {
 					var matchs = jsonData.matchs.split('|')
@@ -87,12 +87,12 @@ $(document).ready(function(){
 	
 		var idToDelete = $('select#valueImportMatchs option:selected').attr('id');
 		$.ajax({
-		       type: 'GET',
+		       type: 'POST',
 		       url: 'index.php',
 		       async: false,
 		       cache: false,
 		       dataType : "json",
-		       data: 'ajax=1&action=deleteImportMatchs&idImportMatchs='+idToDelete+'&tab=AdminImport&token='+token,
+		       data: 'ajax=1&action=deleteImportMatchs&tab=AdminImport&token=' + token + '&idImportMatchs=' + idToDelete ,
 		       success: function(jsonData)
 		       {
 					$('select#valueImportMatchs option[id=\''+idToDelete+'\']').remove();

js/admin_carrier_wizard.js

@@ -367,7 +367,6 @@ function bind_inputs()
 function is_freeClick(elt)
 {
 	var is_free = $(elt);
-
 	if (parseInt(is_free.val()))
 		hideFees();
 	else
@@ -388,7 +387,7 @@ function hideFees()
 function showFees()
 {
 	$('tr.range_inf td, tr.range_sup td, tr.fees_all td, tr.fees td').each( function () {
-		if ($(this).index() > 2)
+		if ($(this).index() >= 2)
 		{
 			//enable only if zone is active
 			tr = $(this).closest('tr');
@@ -472,7 +471,8 @@ function validateRange(index)
 function enableZone(index)
 {
 	$('tr.fees').each( function () {
-		$(this).find('td:eq('+index+')').children('input').removeAttr('disabled');
+		if ($(this).find('td:eq(1)').children('input[type=checkbox]:checked').length)	
+			$(this).find('td:eq('+index+')').children('input').removeAttr('disabled');
 	});
 }
 
@@ -490,12 +490,17 @@ function enableRange(index)
 		if ($(this).find('td').find('input:checkbox').attr('checked') == 'checked')
 			enableZone(index);
 	});
+	$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
+	if ($('.zone input[type=checkbox]:checked').length)
+		enableGlobalFees(index);
+	bind_inputs();
+}
+
+function enableGlobalFees(index)
+{
 	$('span.fees_all').show();
 	$('tr.fees_all td:eq('+index+')').find('input').show().removeAttr('disabled');
-	$('tr.fees_all td:eq('+index+')').find('.currency_sign').show();
-	$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
-	$('tr.fees_all td:eq('+index+')').find('button').remove();
-	bind_inputs();
+	$('tr.fees_all td:eq('+index+')').find('.currency_sign').show();	
 }
 
 function disableRange(index)
@@ -633,7 +638,8 @@ function checkAllZones(elt)
 	{
 		$('.input_zone').attr('checked', 'checked');
 		$('.fees input:text').each( function () {
-			index = $(this).parent().index();
+			index = $(this).closest('td').index();
+			enableGlobalFees(index);
 			if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
 			{
 				$(this).removeAttr('disabled');

js/retro-compat.js.php

@@ -3,7 +3,8 @@
 include('../config/config.inc.php');
 header('content-type: application/x-javascript');
 
-$plugins_folder = __DIR__.'/jquery/plugins/';
+$jquery_folder = dirname(__FILE__).'/jquery/';
+$plugins_folder = $jquery_folder.'plugins/';
 
 $plugins = array(
 				'ajaxfileupload.js' => 
@@ -51,7 +52,7 @@ $plugins = array(
 				'jquery.hoverIntent.minified.js' => 
 					array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'),
 				'jquery-ui-1.8.10.custom.min.js' =>
-					array('new_file' => __DIR__.'/jquery/jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
+					array('new_file' => $jquery_folder.'jquery-ui.will.be.removed.in.1.6.js', 'name' => ''),
 				'jquery.treeview.async.js' =>
 					array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.async.js', 'name' => 'treeview-categories.async'),
 				'jquery.treeview.edit.js' =>