From 67b44b5f176c66adfd95ce5a34558ab4aa11d7f1 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Tue, 6 Aug 2013 18:04:12 +0200
Subject: [PATCH] //fixed carrier bug and added typewatch plugin on range
 validation

---
 .../carrier_wizard/helpers/form/form.tpl      |  8 +-
 css/admin.css                                 |  4 +-
 js/admin_carrier_wizard.js                    | 82 +++++++++++++------
 3 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
index 0a716c23e..f487e9120 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
@@ -30,10 +30,16 @@
 
 {block name="field"}
 	{if $input.name == 'zones'}
+		<div class="ranges_not_follow warn" style="display:none">
+			<label>{l s="Ranges are not correctly ordered:"}</label>
+			<a href="#" class="button" style="text-decoration:none">{l s="Reordering"}</a>
+		</div>
 		{include file='controllers/carrier_wizard/helpers/form/form_ranges.tpl'}
-		<div class="validate_range" style="display:none">
+		<!--
+<div class="validate_range" style="display:none">
 			<a href="#" class="button" id="validate_range_button">{l s="Validate"}</a>
 		</div>
+-->
 		<div class="new_range">
 			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}</a>
 		</div>
diff --git a/css/admin.css b/css/admin.css
index 893609148..c600e332d 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -2626,7 +2626,7 @@ margin-bottom:7px;
 #carrier_wizard .border_all {border:solid 1px #C0C0C0;}
 #carrier_wizard input.field_error {border : solid 1px red; background-color:#FFCCCC;}
 #carrier_wizard table td.center {text-align: center}
-#carrier_wizard .new_range, #carrier_wizard .validate_range {float: left; margin: 20px 0 0 10px; width: 130px;}
+#carrier_wizard .new_range, #carrier_wizard .validate_range {float: left; margin: 35px 0 0 10px; width: 130px;}
 #carrier_wizard tr.fees_all { background: #CCCCCC}
 #carrier_wizard #zones_table input[type=text] {width: 45px;}
 #carrier_wizard #fieldset_form { min-height: 190px}
@@ -2634,6 +2634,8 @@ margin-bottom:7px;
 #carrier_wizard #step_carrier_summary label {width: 40px}
 #carrier_wizard #step_carrier_summary .margin-form {padding-left: 60px;}
 #carrier_wizard #summary_zones, #carrier_wizard #summary_groups {margin-left: 20px; margin-top: 10px; list-style: disc}
+#carrier_wizard .ranges_not_follow label {width: inherit; float:none}
+#carrier_wizard .ranges_not_follow {width: 300px; margin-bottom: 0}
 
 
 /*** IE10 ***/
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index eec6ed73a..7b2f6a86b 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -252,7 +252,8 @@ function bind_inputs()
 		return false;
 	});
 	
-	$('#validate_range_button').off('click').on('click', function () {
+	/*
+$('#validate_range_button').off('click').on('click', function () {
 		index = $('tr.fees_all td:last').index();
 		if (validateRange(index))
 		{
@@ -264,6 +265,7 @@ function bind_inputs()
 		validateAndAddRangeButtonDisplay();
 		return false;
 	});
+*/
 	
 	$('tr.fees td input:checkbox').off('change').on('change', function () {
 				
@@ -297,14 +299,17 @@ function bind_inputs()
 		}
 	});
 	
-	$('tr.range_sup td input:text, tr.range_inf td input:text').off('change').on('change', function () {
-		index = $(this).parent('td').index();
-		if ($('tr.fees_all td:eq('+index+')').hasClass('validated') || $('tr.fees_all td:eq('+index+')').hasClass('not_validated'))
-		{
+	$('tr.range_sup td input:text, tr.range_inf td input:text').typeWatch({
+		captureLength: 0,
+		highlight: false,
+		wait: 1000,
+		callback: function() { 
+
+			index = $(this.el).parent('td').index();
 			if (validateRange(index))
 				enableRange(index);
 			else
-				disableRange(index);
+				disableRange(index);			
 		}
 	});
 	
@@ -386,6 +391,7 @@ function showFees()
 
 function validateRange(index)
 {
+	$('.wizard_error').remove();
 	//reset error css
 	$('tr.range_sup td input:text').removeClass('field_error');
 	$('tr.range_inf td input:text').removeClass('field_error');
@@ -413,25 +419,29 @@ function validateRange(index)
 		is_ok = false;
 		displayError([invalid_range], $("#carrier_wizard").smartWizard('currentStep'));
 	}
-	else if (is_ok && index > 2)//check range only if it's not the first range
+	else if (is_ok && index > 2) //check range only if it's not the first range
 	{	
 		$('tr.range_sup td').not('.range_type, .range_sign, tr.range_sup td:last').each( function () 
 		{
-			is_ok = false;
-			curent_index = $(this).index();
-
-			current_sup = $(this).find('input').val();
-			current_inf = $('tr.range_inf td:eq('+curent_index+') input').val();
+			if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
+			{
+				is_ok = false;
+				curent_index = $(this).index();
+	
+				current_sup = $(this).find('input').val();
+				current_inf = $('tr.range_inf td:eq('+curent_index+') input').val();
+				
+				if ($('tr.range_inf td:eq('+curent_index+1+') input').length)
+					next_inf = $('tr.range_inf td:eq('+curent_index+1+') input').val();
+				else
+					next_inf = false;
+				
+				//check if range already exist
+				//check if ranges is overlapping
+				if ((range_sup != current_sup && range_inf != current_inf) && ((range_sup > current_sup || range_sup <= current_inf) && (range_inf < current_inf || range_inf >= current_sup)))
+					is_ok = true;
+			}
 			
-			if ($('tr.range_inf td:eq('+curent_index+1+') input').length)
-				next_inf = $('tr.range_inf td:eq('+curent_index+1+') input').val();
-			else
-				next_inf = false;
-			
-			//check if range already exist
-			//check if ranges is overlapping
-			if ((range_sup != current_sup && range_inf != current_inf) && ((range_sup > current_sup || range_sup <= current_inf) && (range_inf < current_inf || range_inf >= current_sup)))
-				is_ok = true;
 		});
 
 		if (!is_ok)
@@ -440,6 +450,8 @@ function validateRange(index)
 			$('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error');
 			displayError([range_is_overlapping], $("#carrier_wizard").smartWizard('currentStep'));
 		}
+		else
+			checkRangeContinuity();
 	}
 	return is_ok;
 }
@@ -531,6 +543,7 @@ function rebuildTabindex()
 
 function validateAndAddRangeButtonDisplay()
 {
+	return;
 	if ($('tr.fees_all td:last').hasClass('validated'))
 	{
 		$('.validate_range').hide();
@@ -543,8 +556,7 @@ function validateAndAddRangeButtonDisplay()
 	}
 }
 
-
-function repositionRange(current_index, new_index)
+function reorderRange(current_index, new_index)
 {
 	$('tr.range_sup, tr.range_inf, tr.fees_all, tr.fees, tr.delete_range ').each(function () {
 		$(this).find('td:eq('+current_index+')').each( function () {
@@ -552,4 +564,28 @@ function repositionRange(current_index, new_index)
 			$(this).remove();
 		});
 	});
+}
+
+function checkRangeContinuity()
+{
+	res = true;
+	return true;//TODO
+	$('tr.range_sup td').not('.range_type, .range_sign, tr.range_sup').each( function () 
+	{
+		index = $(this).index();
+		if (index > 2)
+		{
+			range_sup = parseFloat($('tr.range_sup td:eq('+index+')').children('input:text').val().trim());
+			range_inf = parseFloat($('tr.range_inf td:eq('+index+')').children('input:text').val().trim());
+			prev_index = index-1;
+			prev_range_sup = parseFloat($('tr.range_sup td:eq('+prev_index+')').children('input:text').val().trim());
+			prev_range_inf = parseFloat($('tr.range_inf td:eq('+prev_index+')').children('input:text').val().trim());
+			if (range_inf < prev_range_inf || range_sup < prev_range_sup)
+				res = false;
+		}
+	});
+	if (res)
+		$('.ranges_not_follow').fadeOut();
+	else
+		$('.ranges_not_follow').fadeIn();
 }
\ No newline at end of file