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

//fixed float validation on carrier wizard

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-02 11:25:08 +02:00
parent f2146ac2ae
commit 02fdc5fe24
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin_carrier_wizard.js
+6 -4
View File
@@ -365,8 +365,8 @@ function validateRange(index)
$('tr.range_inf td input:text').removeClass('field_error'); $('tr.range_inf td input:text').removeClass('field_error');
is_ok = true; is_ok = true;
range_sup = parseInt($('tr.range_sup td:eq('+index+')').children('input:text').val().trim()); range_sup = parseFloat($('tr.range_sup td:eq('+index+')').children('input:text').val().trim());
range_inf = parseInt($('tr.range_inf td:eq('+index+')').children('input:text').val().trim()); range_inf = parseFloat($('tr.range_inf td:eq('+index+')').children('input:text').val().trim());
if (isNaN(range_sup) || range_sup.length === 0) if (isNaN(range_sup) || range_sup.length === 0)
{ {
@@ -384,6 +384,7 @@ function validateRange(index)
{ {
if (range_inf >= range_sup) if (range_inf >= range_sup)
{ {
console.log('range_inf >= range_sup');
$('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error'); $('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error');
$('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error'); $('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error');
is_ok = false; is_ok = false;
@@ -391,7 +392,8 @@ function validateRange(index)
//check if previous range is inf only if it's not the first range //check if previous range is inf only if it's not the first range
if (index > 2) if (index > 2)
{ {
previous_range_sup = parseInt($('tr.range_sup td:eq('+(index -1)+')').children('input:text').val().trim()); console.log('index > 2');
previous_range_sup = parseFloat($('tr.range_sup td:eq('+(index -1)+')').children('input:text').val().trim());
if (range_inf < previous_range_sup) if (range_inf < previous_range_sup)
{ {
$('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error'); $('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error');
@@ -401,7 +403,7 @@ function validateRange(index)
//check if next range is sup only if it's not the last range //check if next range is sup only if it's not the last range
if ($('tr.range_inf td:eq('+(index + 1)+')').length) if ($('tr.range_inf td:eq('+(index + 1)+')').length)
{ {
next_range_inf = parseInt($('tr.range_inf td:eq('+(index +1)+')').children('input:text').val().trim()); next_range_inf = parseFloat($('tr.range_inf td:eq('+(index +1)+')').children('input:text').val().trim());
if ((isNaN(range_sup) || range_sup.length === 0) && range_sup > next_range_inf) if ((isNaN(range_sup) || range_sup.length === 0) && range_sup > next_range_inf)
{ {