From a5be1f147f53d5bd034df14b126001d3e7b301d7 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Fri, 9 Aug 2013 10:58:07 +0200
Subject: [PATCH] //small fix when multi-store is enable on carrier wizard

---
 .../carrier_wizard/helpers/form/form_ranges.tpl            | 2 +-
 controllers/admin/AdminCarrierWizardController.php         | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
index 3d6d015b9..b19611d31 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
@@ -21,7 +21,7 @@
 				</tr>
 				<tr class="fees_all">
 					<td class="border_top border_bottom border_bold"><span class="fees_all" {if $ranges|count == 0}style="display:none" {/if}>All</span></td>
-					<td></td>
+					<td><input type="checkbox" onclick="checkAllZones(this);" ></td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center border_top border_bottom {if $range.id_range != 0} validated {/if}"  >
 							<input type="text" {if isset($form_id) &&  !$form_id} disabled="disabled"{/if} {if $range.id_range == 0} style="display:none"{/if} /><span class="currency_sign" {if $range.id_range == 0} style="display:none" {/if}>&nbsp; {$currency_sign}</span>
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index c5a331648..5e536a2bd 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -883,16 +883,13 @@ class AdminCarrierWizardControllerCore extends AdminController
 			1 => array('name', 'delay', 'grade', 'url'),
 			2 => array('is_free', 'id_tax_rules_group', 'shipping_handling', 'shipping_method', 'range_behavior'),
 			3 => array('range_behavior', 'max_height', 'max_width', 'max_depth', 'max_weight'),
+			4 => array(),
 		);
 
 		if (Shop::isFeatureActive())
 		{
 			$multistore_field = array(array('shop'));
-			$tmp = $step_fields;
-			$step_fields = array(1 => $tmp[1]) +  $multistore_field;
-			array_shift($tmp);
-			foreach ($tmp as $row)
-				$step_field[] = $row;
+			array_splice($step_fields, 1, 0, $multistore_field);
 		}
 
 		$rules = Carrier::getValidationRules('Carrier');