From fa958c9a5e11255cc90c26ae1e5b24d5dae030ec Mon Sep 17 00:00:00 2001
From: Vincent Augagneur <vincent.augagneur@prestashop.com>
Date: Thu, 1 Aug 2013 17:13:08 +0200
Subject: [PATCH] //carrier wizard currency sign bug

---
 .../controllers/carrier_wizard/helpers/form/form_ranges.tpl   | 4 ++--
 js/admin_carrier_wizard.js                                    | 1 +
 2 files changed, 3 insertions(+), 2 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 9fb12910d..bb28b5eaa 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
@@ -24,7 +24,7 @@
 					<td></td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center border_top border_bottom {if $range.id_range != -1} validated {/if}"  >
-							<input type="text" {if isset($form_id) &&  !$form_id} disabled="disabled"{/if} {if $range.id_range == -1} style="display:none"{/if} /><span class="currency_sign">&nbsp; {$currency_sign}</span>
+							<input type="text" {if isset($form_id) &&  !$form_id} disabled="disabled"{/if} {if $range.id_range == -1} style="display:none"{/if} /><span class="currency_sign" {if $range.id_range == -1} style="display:none" {/if}>&nbsp; {$currency_sign}</span>
 							{if $range.id_range == -1} <button class="button">{l s="Validate"}</button> {/if}
 						</td>
 					{foreachelse}
@@ -42,7 +42,7 @@
 					</td>
 					{foreach from=$ranges key=r item=range}
 						<td class="center">
-							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if (isset($form_id) &&  !$form_id) || isset($change_ranges) || (isset($fields_value[$input.name][$zone.id_zone]) && !$fields_value[$input.name][$zone.id_zone])} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone]) && $fields_value[$input.name][$zone.id_zone]} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:"%.6f"} {/if}" />&nbsp; {$currency_sign}
+							<input name="fees[{$zone.id_zone|intval}][{$range.id_range|intval}]" {if ((isset($form_id) &&  !$form_id) || isset($change_ranges) || (isset($fields_value[$input.name][$zone.id_zone]) && !$fields_value[$input.name][$zone.id_zone]))} disabled="disabled"{/if} type="text" value="{if isset($price_by_range[$range.id_range][$zone.id_zone]) && $fields_value[$input.name][$zone.id_zone]} {$price_by_range[$range.id_range][$zone.id_zone]|string_format:'%.6f'}  {/if}" />&nbsp; {$currency_sign}
 						</td>
 					{/foreach}
 				</tr>
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index 2e096e402..aac11585f 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -421,6 +421,7 @@ function enableRange(index)
 	});
 	$('span.fees_all').show();
 	$('tr.fees_all td:eq('+index+')').children('input').show().removeAttr('disabled');
+	$('tr.fees_all td:eq('+index+')').children('.currency_sign').show();
 	$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
 	$('tr.fees_all td:eq('+index+')').children('button').remove();
 	bind_inputs();