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

[-] BO : fixed bug #PSCFV-10111 when carrier is free don't display ranges in summary

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-14 14:19:52 +02:00
parent 3d591be8c6
commit ec39b9e701
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+2 -1
View File
@@ -28,7 +28,8 @@
var summary_translation_meta_informations = '{l s='This carrier is @s1 and the delivery announced is: @s2.' js=1}'; var summary_translation_meta_informations = '{l s='This carrier is @s1 and the delivery announced is: @s2.' js=1}';
var summary_translation_free = '<strong>{l s='free' js=1}</strong>'; var summary_translation_free = '<strong>{l s='free' js=1}</strong>';
var summary_translation_paid = '<strong>{l s='not free' js=1}</strong>'; var summary_translation_paid = '<strong>{l s='not free' js=1}</strong>';
var summary_translation_range = '{l s='This carrier can deliver orders from @s1 to @s2. If the order is out of range, the behavior is to @s3.' js=1}'; var summary_translation_range = '<span class="is_free">{l s='This carrier can deliver orders from @s1 to @s2.' js=1}</span>';
var summary_translation_range_limit = '{l s='If the order is out of range, the behavior is to @s3.' js=1}';
var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 will be applied.' js=1}'; var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 will be applied.' js=1}';
var summary_translation_price = '<strong>{l s='according to the price' js=1}</strong>'; var summary_translation_price = '<strong>{l s='according to the price' js=1}</strong>';
var summary_translation_weight = '<strong>{l s='according to the weight' js=1}</strong>'; var summary_translation_weight = '<strong>{l s='according to the weight' js=1}</strong>';
js/admin_carrier_wizard.js
+15 -11
View File
@@ -127,16 +127,20 @@ function displaySummary()
// Tax and calculation mode for the shipping cost // Tax and calculation mode for the shipping cost
tmp = summary_translation_shipping_cost.replace('@s2', '<strong>' + $('#id_tax_rules_group option:selected').text() + '</strong>'); tmp = summary_translation_shipping_cost.replace('@s2', '<strong>' + $('#id_tax_rules_group option:selected').text() + '</strong>');
if ($('#billing_price').attr('checked'))
tmp = tmp.replace('@s1', summary_translation_price); if ($('#billing_price').attr('checked'))
else if ($('#billing_weight').attr('checked')) tmp = tmp.replace('@s1', summary_translation_price);
tmp = tmp.replace('@s1', summary_translation_weight); else if ($('#billing_weight').attr('checked'))
else tmp = tmp.replace('@s1', summary_translation_weight);
tmp = tmp.replace('@s1', '<strong>' + summary_translation_undefined + '</strong>'); else
tmp = tmp.replace('@s1', '<strong>' + summary_translation_undefined + '</strong>');
$('#summary_shipping_cost').html(tmp); $('#summary_shipping_cost').html(tmp);
// Weight or price ranges // Weight or price ranges
$('#summary_range').html(summary_translation_range); $('#summary_range').html(summary_translation_range+' '+summary_translation_range_limit);
if ($('input[name="shipping_method"]:checked').val() == 1) if ($('input[name="shipping_method"]:checked').val() == 1)
@@ -164,7 +168,8 @@ function displaySummary()
.replace('@s2', '<strong>' + range_sup +' '+ unit + '</strong>') .replace('@s2', '<strong>' + range_sup +' '+ unit + '</strong>')
.replace('@s3', '<strong>' + $('#range_behavior option:selected').text().toLowerCase() + '</strong>') .replace('@s3', '<strong>' + $('#range_behavior option:selected').text().toLowerCase() + '</strong>')
); );
if ($('#is_free_on').attr('checked'))
$('span.is_free').hide();
// Delivery zones // Delivery zones
$('#summary_zones').html(''); $('#summary_zones').html('');
$('.input_zone').each(function(){ $('.input_zone').each(function(){
@@ -192,7 +197,7 @@ function validateSteps(step_number)
var is_ok = true; var is_ok = true;
if ((multistore_enable && step_number == 3) || (!multistore_enable && step_number == 2)) if ((multistore_enable && step_number == 3) || (!multistore_enable && step_number == 2))
{ {
if ($('input[name="is_free"]').val() == 1 && !validateRange(2)) if (!$('#is_free_on').attr('checked') && !validateRange(2))
is_ok = false; is_ok = false;
} }
@@ -381,11 +386,10 @@ function showFees()
if ($(this).index() >= 2) if ($(this).index() >= 2)
{ {
//enable only if zone is active //enable only if zone is active
/*
tr = $(this).parent('tr'); tr = $(this).parent('tr');
validate = $('tr.fees_all td:eq('+$(this).index()+')').hasClass('validated'); validate = $('tr.fees_all td:eq('+$(this).index()+')').hasClass('validated');
if ($(tr).index() > 2 && $(tr).find('td:eq(1) input').attr('checked') && validate || !$(tr).hasClass('range_sup') || !$(tr).hasClass('range_inf')) if ($(tr).index() > 2 && $(tr).find('td:eq(1) input').attr('checked') && validate || !$(tr).hasClass('range_sup') || !$(tr).hasClass('range_inf'))
$(this).find('input:text').val('').removeAttr('disabled'); */ $(this).find('input:text').removeAttr('disabled');
$(this).find('input:text, button').css('background-color', '').css('border-color', ''); $(this).find('input:text, button').css('background-color', '').css('border-color', '');
$(this).find('button').css('background-color', '').css('border-color', '').removeAttr('disabled'); $(this).find('button').css('background-color', '').css('border-color', '').removeAttr('disabled');