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

[-] BO : fixed bug #PSCFV-10033 - disable next step if no range has been added on carrier wizard

Browse Source
This commit is contained in:
Vincent Augagneur
2013-08-12 14:41:44 +02:00
parent 1359f46bae
commit 52806c0056
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+1
View File
@@ -41,6 +41,7 @@
var PS_WEIGHT_UNIT = '{$PS_WEIGHT_UNIT}';
var invalid_range = '{l s='This range is not valid' js=1}';
var range_is_overlapping = '{l s='Ranges are overlapping' js=1}';
var multistore_enable = {$multistore_enable};
</script>
<div id="carrier_wizard" class="swMain">
<ul class="nbr_steps_{$wizard_steps.steps|count}">
js/admin_carrier_wizard.js
+32 -23
View File
@@ -184,32 +184,41 @@ $('input[name$="range_inf[]"]').each(function(){
function validateSteps(step_number)
{
$('.wizard_error').remove();
var is_ok = true;
form = $('#carrier_wizard #step-'+step_number+' form');
$.ajax({
type:"POST",
url : validate_url,
async: false,
dataType: 'json',
data : form.serialize()+'&step_number='+step_number+'&action=validate_step&ajax=1',
success : function(datas)
{
if (datas.has_error)
if ((multistore_enable && step_number == 3) || (!multistore_enable && step_number == 2))
{
if (!validateRange(2))
is_ok = false;
}
$('.wizard_error').remove();
if (is_ok)
{
form = $('#carrier_wizard #step-'+step_number+' form');
$.ajax({
type:"POST",
url : validate_url,
async: false,
dataType: 'json',
data : form.serialize()+'&step_number='+step_number+'&action=validate_step&ajax=1',
success : function(datas)
{
is_ok = false;
$('input').focus( function () {
$(this).removeClass('field_error');
});
displayError(datas.errors, step_number);
resizeWizard();
if (datas.has_error)
{
is_ok = false;
$('input').focus( function () {
$(this).removeClass('field_error');
});
displayError(datas.errors, step_number);
resizeWizard();
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
jAlert("TECHNICAL ERROR: \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
}
});
});
}
return is_ok;
}