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

[-] BO : fixed bug #PSCFV-10096

Browse Source
This commit is contained in:
Vincent Augagneur committed 2013-08-13 16:14:09 +02:00
1 parent e8685b1430
commit 6e386868a6
2 files changed
+19 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

js/admin_carrier_wizard.js
+12 -5
View File
@@ -137,17 +137,24 @@ function displaySummary()
// Weight or price ranges
$('#summary_range').html(summary_translation_range);
if ($('input[name="shipping_method"]:checked').val() == 1)
unit = PS_WEIGHT_UNIT;
else
unit = currency_sign;
var range_inf = summary_translation_undefined;
var range_sup = summary_translation_undefined;
/*
$('input[name$="range_inf[]"]').each(function(){
/*
$('input[name$="range_inf[]"]').each(function(){
if (!isNaN(parseFloat($(this).val())) && (range_inf == summary_translation_undefined || range_inf < $(this).val()))
range_inf = $(this).val();
});
*/
range_inf = $('tr.range_inf td input:first').val();
range_sup = $('tr.range_sup td input:last').val();
range_inf = $('tr.range_inf td input:first').val()+' '+unit;
range_sup = $('tr.range_sup td input:last').val()+' '+unit;
$('input[name$="range_sup[]"]').each(function(){
if (!isNaN(parseFloat($(this).val())) && (range_sup == summary_translation_undefined || range_sup > $(this).val()))
@@ -187,7 +194,7 @@ function validateSteps(step_number)
var is_ok = true;
if ((multistore_enable && step_number == 3) || (!multistore_enable && step_number == 2))
{
if (!validateRange(2))
if ($('input[name="is_free"]').val() == 1 && !validateRange(2))
is_ok = false;
}