From c2e0edcc7a7a20a3eb3d088d5798d5236ef299e8 Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Fri, 6 Dec 2013 10:17:07 +0100
Subject: [PATCH] [-] BO : carrier wizard no fees display

---
 controllers/admin/AdminCarrierWizardController.php | 7 ++++---
 js/admin_carrier_wizard.js                         | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 66182fc47..37396c180 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -686,17 +686,18 @@ class AdminCarrierWizardControllerCore extends AdminController
 				$price_list = array();
 				if (is_array($fees) && count($fees))
 				{
-					$price = isset($fee[$key]) ? (float)$fee[$key] : 0;
 					foreach ($fees as $id_zone => $fee)
+					{
 						$price_list[] = array(
 							'id_range_price' => ($range_type == Carrier::SHIPPING_METHOD_PRICE ? (int)$range->id : null),
 							'id_range_weight' => ($range_type == Carrier::SHIPPING_METHOD_WEIGHT ? (int)$range->id : null),
 							'id_carrier' => (int)$carrier->id,
 							'id_zone' => (int)$id_zone,
-							'price' => $price,
+							'price' => isset($fee[$key]) ? (float)$fee[$key] : 0,
 						);
+					}
 				}
-
+				
 				if (count($price_list) && !$carrier->addDeliveryPrice($price_list, true))
 					return false;
 			}
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 6a1dedb8e..0692a56d9 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -31,7 +31,6 @@ $(document).ready(function() {
 	if (parseInt($('input[name="is_free"]:checked').val()))
 		is_freeClick($('input[name="is_free"]:checked'));
 	displayRangeType();
-	checkAllZones();
 });
 
 function initCarrierWizard()
@@ -673,7 +672,7 @@ function checkAllZones(elt)
 	else
 	{
 		$('.input_zone').removeAttr('checked');
-		$('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled').val('');
+		$('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled');
 	}
 	
 }
\ No newline at end of file