From d3b000e72fed919b81b6875daf3fdc0b9aa8c107 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 31 Jul 2013 18:09:00 +0200 Subject: [PATCH] //fixed bug on carrier wizard when is_free --- controllers/admin/AdminCarrierWizardController.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php index 1df6c8c4c..ec837406c 100644 --- a/controllers/admin/AdminCarrierWizardController.php +++ b/controllers/admin/AdminCarrierWizardController.php @@ -708,12 +708,13 @@ class AdminCarrierWizardControllerCore extends AdminController $return['has_error'] = true; $return['errors'][] = $this->l('An error occurred while saving carrier zones.'); } - - if (!$this->processRanges((int)$carrier->id)) - { - $return['has_error'] = true; - $return['errors'][] = $this->l('An error occurred while saving carrier ranges.'); - } + + if (!$carrier->is_free) + if (!$this->processRanges((int)$carrier->id)) + { + $return['has_error'] = true; + $return['errors'][] = $this->l('An error occurred while saving carrier ranges.'); + } if (Shop::isFeatureActive() && !$this->updateAssoShop((int)$carrier->id)) {