diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl index f6458ad861c8c..121af564ed481 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl @@ -42,6 +42,7 @@ var invalid_range = '{l s='This range is not valid' js=1}'; var overlapping_range = '{l s='Ranges are overlapping' js=1}'; var range_is_overlapping = '{l s='Ranges are overlapping' js=1}'; + var select_at_least_one_zone = '{l s='Please select at least one zone' js=1}'; var multistore_enable = '{$multistore_enable}'; diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js index 05952436865ad..bdfa054648018 100644 --- a/js/admin_carrier_wizard.js +++ b/js/admin_carrier_wizard.js @@ -229,6 +229,21 @@ function validateSteps(fromStep, toStep) var is_ok = true; if ((multistore_enable && fromStep == 3) || (!multistore_enable && fromStep == 2)) { + if (toStep > fromStep && !$('#is_free_on').attr('checked')) + { + is_ok = false; + $('.input_zone').each(function () { + if ($(this).prop('checked')) + is_ok = true; + }); + + if (!is_ok) + { + displayError([select_at_least_one_zone], fromStep); + return; + } + } + if (toStep > fromStep && !$('#is_free_on').attr('checked') && !validateRange(2)) is_ok = false; } @@ -268,7 +283,7 @@ function validateSteps(fromStep, toStep) } function displayError(errors, step_number) -{ +{ $('#carrier_wizard .actionBar a.btn').removeClass('disabled'); $('.wizard_error').remove(); str_error = '