Merge pull request #601 from PrestaEdit/carrier_wizard2

[-] Carrier Wizard: fix

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>

classes/Carrier.php

@@ -1300,4 +1300,3 @@ class CarrierCore extends ObjectModel
 		return Db::getInstance()->execute(rtrim($sql, ','));
 	}
 }
-

controllers/admin/AdminCarrierWizardController.php

@@ -533,7 +533,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()
@@ -545,7 +545,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'))
@@ -658,8 +657,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);
@@ -687,6 +685,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))