dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//carrier range validation fix

Browse Source
This commit is contained in:
Vincent Augagneur committed 2013-08-06 10:04:54 +02:00
1 parent 29bbe81ae6
commit 88d4f57894
1 file changed
+15 -21
Download Patch File Download Diff File Expand all files Collapse all files
js/admin_carrier_wizard.js
+15 -21
View File
@@ -285,13 +285,16 @@ function bind_inputs()
}); });
$('tr.range_sup td input:text, tr.range_inf td input:text').keypress( function (evn) { $('tr.range_sup td input:text, tr.range_inf td input:text').keypress( function (evn) {
index = $(this).parent('td').index(); index = $(this).parent('td').index();
if (evn.keyCode == 13) if (evn.keyCode == 13)
{
if (validateRange(index)) if (validateRange(index))
enableRange(index); enableRange(index);
else else
disableRange(index); disableRange(index);
validateAndAddRangeButtonDisplay();
return false;
}
}); });
$('tr.range_sup td input:text, tr.range_inf td input:text').off('change').on('change', function () { $('tr.range_sup td input:text, tr.range_inf td input:text').off('change').on('change', function () {
@@ -416,28 +419,19 @@ function validateRange(index)
{ {
is_ok = false; is_ok = false;
curent_index = $(this).index(); curent_index = $(this).index();
current_val = $(this).find('input').val();
if ((range_sup != current_val) && (range_inf != $('tr.range_inf td:eq('+curent_index+') input').val()))
{
if ((range_inf >= current_val) && (($('tr.range_inf td:eq('+curent_index+1+')').length && range_inf <= $('tr.range_inf td:eq('+curent_index+1+') input').val()) || !$('tr.range_inf td:eq('+curent_index+1+')').length))
{
if (range_sup >= $('tr.range_inf td:eq('+curent_index+') input').val() && ($('tr.range_inf td:eq('+curent_index+1+')').length && range_sup < $('tr.range_inf td:eq('+curent_index+1+') input').val() || !$('tr.range_inf td:eq('+index+1+')').length ))
{
if ((range_sup < current_val && range_inf <= current_val) || (range_sup >= $('tr.range_inf td:eq('+curent_index+') input').val() && range_inf > $('tr.range_inf td:eq('+curent_index+') input').val()))//check if ranges is overlapping current_sup = $(this).find('input').val();
{ current_inf = $('tr.range_inf td:eq('+curent_index+') input').val();
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
is_ok = false;
}
else
is_ok = false;
}
else else
is_ok = false; 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) if (!is_ok)