From c1b0d32d32305ee87c0b2444f859bf660e5888d4 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Mon, 29 Jul 2013 13:57:31 +0200
Subject: [PATCH] [-] Carrier Wizard: fix

---
 .../template/controllers/carrier_wizard/summary.tpl        | 2 ++
 classes/Carrier.php                                        | 3 +--
 controllers/admin/AdminCarrierWizardController.php         | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
index 42cfd89af..fab7260ab 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -55,9 +55,11 @@
 		{l s='It will be displayed only for the following groups:'}
 		<ul id="summary_groups"></ul>
 	</div>
+	{if $is_multishop}
 	<div class="clear">&nbsp;</div>
 	<div>
 		{l s='It will be displayed only for the following shops:'}
 		<ul id="summary_shops"></ul>
 	</div>
+	{/if}
 </fieldset>
diff --git a/classes/Carrier.php b/classes/Carrier.php
index 3c3f5039a..9f8f8b8a5 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -1290,7 +1290,7 @@ class CarrierCore extends ObjectModel
 	public function setGroups($groups, $delete = true)
 	{
 		if ($delete)
-			Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$id_carrier);
+			Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$this->id);
 		if (!count($groups))
 			return true;
 		$sql = 'INSERT INTO '._DB_PREFIX_.'carrier_group (id_carrier, id_group) VALUES ';
@@ -1300,4 +1300,3 @@ class CarrierCore extends ObjectModel
 		return Db::getInstance()->execute(rtrim($sql, ','));
 	}
 }
-
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 3cd3ef63d..e3f601e74 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -532,7 +532,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 		$template->assign('fields_value', $fields_value);
 		$template->assign('input', array('type' => 'zone',	'name' => 'zones'	));
 
-		die ($template->fetch());
+		die($template->fetch());
 	}
 	
 	public function ajaxProcessValidateStep()
@@ -544,7 +544,6 @@ class AdminCarrierWizardControllerCore extends AdminController
 			$this->errors[] = Tools::displayError('You do not have permission to use this wizard.');
 		else
 		{
-
 			if (Shop::isFeatureActive() && $step_number == 2)
 			{
 				if (!Tools::getValue('checkBoxShopAsso_carrier'))
@@ -657,8 +656,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 				$return['errors'][] = Tools::displayError('You do not have permission to use this wizard.')
 			);
 		else
-		{
-				
+		{				
 			if ($id_carrier = Tools::getValue('id_carrier'))
 			{
 				$current_carrier = new Carrier((int)$id_carrier);
@@ -686,6 +684,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 					$return['errors'][] = $this->l('An error occurred while saving this carrier.');
 				}
 			}
+			
 			if (Validate::isLoadedObject($carrier))
 			{
 				if (!$this->changeGroups((int)$carrier->id))