From 9b2e9586c39a70b21a02c80906415138a44894bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Thu, 18 Jul 2013 16:55:54 +0200
Subject: [PATCH] // bug merge

---
 js/admin_carrier_wizard.js | 39 ++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 3bbf037d6..ebfdfb206 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -253,6 +253,37 @@ function bind_inputs()
 		
 		return false;
 	});
+	
+	$('input[name="is_free"]').on('click', function() {
+		var is_free = $(this);
+		$("#step_carrier_ranges .margin-form").each(function() {
+			var field = $(this).children().attr('name');
+			if (typeof(field) != 'undefined' && field != 'is_free')
+			{
+				if (parseInt(is_free.val()))
+				{
+					$(this).hide();
+					$(this).prev().hide();
+				}
+				else
+				{
+					$(this).show();
+					$(this).prev().show();
+				}
+			}
+		});
+		if (parseInt(is_free.val()))
+		{
+			$('#zones_table').hide();
+			$('.new_range').hide();
+		}
+		else
+		{
+			$('#zones_table').show();
+			$('.new_range').show();
+		}
+	});
+	$('input[name="is_free"]:checked').click();
 }
 
 function validateRange(index)
@@ -359,11 +390,3 @@ function delete_new_range()
 	if ($('#new_range_form_placeholder').children('td').length = 1)
 		return false;
 }
-
-function is_freeChange()
-{
-	if ($('input[name=is_free]:checked').val())
-		$('').hide();
-	else
-		$('').show();
-}
\ No newline at end of file