From 52806c0056f951b918704dbd0ca969edc5027db5 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Mon, 12 Aug 2013 14:41:44 +0200
Subject: [PATCH] [-] BO : fixed bug #PSCFV-10033 - disable next step if no
 range has been added on carrier wizard

---
 .../carrier_wizard/helpers/view/view.tpl      |  1 +
 js/admin_carrier_wizard.js                    | 55 +++++++++++--------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
index 8a6ff6d5c..ea743c58a 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
@@ -41,6 +41,7 @@
 	var PS_WEIGHT_UNIT = '{$PS_WEIGHT_UNIT}';
 	var invalid_range = '{l s='This range is not valid' js=1}';
 	var range_is_overlapping = '{l s='Ranges are overlapping' js=1}';
+	var multistore_enable = {$multistore_enable};
 </script>
 <div id="carrier_wizard" class="swMain">
 	<ul class="nbr_steps_{$wizard_steps.steps|count}">
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 540de14ba..ced186044 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -184,32 +184,41 @@ $('input[name$="range_inf[]"]').each(function(){
 
 function validateSteps(step_number)
 {
-	$('.wizard_error').remove();
 	var is_ok = true;
-	form = $('#carrier_wizard #step-'+step_number+' form');
-	$.ajax({
-		type:"POST",
-		url : validate_url,
-		async: false,
-		dataType: 'json',
-		data : form.serialize()+'&step_number='+step_number+'&action=validate_step&ajax=1',
-		success : function(datas)
-		{
-			if (datas.has_error)
+	if ((multistore_enable && step_number == 3) || (!multistore_enable && step_number == 2))
+	{
+		if (!validateRange(2))
+			is_ok = false;
+	}
+	
+	$('.wizard_error').remove();
+	if (is_ok)
+	{
+		form = $('#carrier_wizard #step-'+step_number+' form');
+		$.ajax({
+			type:"POST",
+			url : validate_url,
+			async: false,
+			dataType: 'json',
+			data : form.serialize()+'&step_number='+step_number+'&action=validate_step&ajax=1',
+			success : function(datas)
 			{
-				is_ok = false;
-				
-				$('input').focus( function () {
-					$(this).removeClass('field_error');
-				});
-				displayError(datas.errors, step_number);
-				resizeWizard();
+				if (datas.has_error)
+				{
+					is_ok = false;
+					
+					$('input').focus( function () {
+						$(this).removeClass('field_error');
+					});
+					displayError(datas.errors, step_number);
+					resizeWizard();
+				}
+			},
+			error: function(XMLHttpRequest, textStatus, errorThrown) {
+				jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
 			}
-		},
-		error: function(XMLHttpRequest, textStatus, errorThrown) {
-			jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
-		}
-	});
+		});
+	}
 	return is_ok;
 }