From db2ef9a2450db992d339309ced8def8af1bcc2d0 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 16 May 2012 08:40:23 +0000
Subject: [PATCH] // Blocklayered : Format slider price

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15324 b9a71923-0436-4b27-9f14-aed3839534dd
---
 modules/blocklayered/blocklayered.js  | 26 ++++++++++++++++++++++----
 modules/blocklayered/blocklayered.php |  2 ++
 modules/blocklayered/blocklayered.tpl | 27 +++++++++++++++++++++++----
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/modules/blocklayered/blocklayered.js b/modules/blocklayered/blocklayered.js
index 5b26d44f5..146dbe845 100644
--- a/modules/blocklayered/blocklayered.js
+++ b/modules/blocklayered/blocklayered.js
@@ -170,12 +170,13 @@ function hideFilterValueAction(it)
 	}
 }
 
-function addSlider(type, data, unit)
+function addSlider(type, data, unit, format)
 {
 	sliderList.push({
 		type: type,
 		data: data,
-		unit: unit
+		unit: unit,
+		format: format
 	});
 }
 
@@ -183,8 +184,25 @@ function initSliders()
 {
 	$(sliderList).each(function(i, slider){
 		$('#layered_'+slider['type']+'_slider').slider(slider['data']);
-		$('#layered_'+slider['type']+'_range').html($('#layered_'+slider['type']+'_slider').slider('values', 0)+slider['unit']+
-			' - ' + $('#layered_'+slider['type']+'_slider').slider('values', 1 )+slider['unit']);
+		
+		var from = '';
+		var to = '';
+		console.log(slider);
+		switch (slider['format'])
+		{
+			case 1:
+			case 2:
+			case 3:
+			case 4:
+				from = formatCurrency($('#layered_'+slider['type']+'_slider').slider('values', 0), slider['format'], slider['unit']);
+				to = formatCurrency($('#layered_'+slider['type']+'_slider').slider('values', 1), slider['format'], slider['unit']);
+				break;
+			case 5:
+				from =  $('#layered_'+slider['type']+'_slider').slider('values', 0)+slider['unit']
+				to = $('#layered_'+slider['type']+'_slider').slider('values', 1)+slider['unit'];
+				break;
+		}
+		$('#layered_'+slider['type']+'_range').html(from+' - '+to);
 	});
 }
 
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index f2a5c9fe1..013bb2795 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -2842,6 +2842,7 @@ class BlockLayered extends Module
 						'min' => null,
 						'values' => array ('1' => 0),
 						'unit' => $currency->sign,
+						'format' => $currency->format,
 						'filter_show_limit' => $filter['filter_show_limit'],
 						'filter_type' => $filter['filter_type']
 					);
@@ -2903,6 +2904,7 @@ class BlockLayered extends Module
 						'min' => null,
 						'values' => array ('1' => 0),
 						'unit' => Configuration::get('PS_WEIGHT_UNIT'),
+						'format' => 5, // Ex: xxxxx kg
 						'filter_show_limit' => $filter['filter_show_limit'],
 						'filter_type' => $filter['filter_type']
 					);
diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl
index 60810c16c..086d74d0d 100644
--- a/modules/blocklayered/blocklayered.tpl
+++ b/modules/blocklayered/blocklayered.tpl
@@ -52,8 +52,13 @@ param_product_url = '';
 											<li>
 												<a href="#" rel="layered_{$filter.type}_slider" title="{l s='Cancel' mod='blocklayered'}">x</a>
 												{$filter.name|escape:html:'UTF-8'}{l s=':' mod='blocklayered'}
-												{$filter.values[0]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'} - 
-												{$filter.values[1]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'}
+												{if $filter.format}
+													{displayPrice price=$filter.values[0]} - 
+													{displayPrice price=$filter.values[1]}
+												{else}
+													{$filter.values[0]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'} - 
+													{$filter.values[1]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'}
+												{/if}
 											</li>
 										{/if}
 									{else}
@@ -159,12 +164,25 @@ param_product_url = '';
 										values: [ {/literal}{$filter.values[0]}{literal}, {/literal}{$filter.values[1]}{literal}],
 										slide: function( event, ui ) {
 											stopAjaxQuery();
-											$('#layered_{/literal}{$filter.type}{literal}_range').html(ui.values[ 0 ] + '{/literal}{$filter.unit}{literal}' + ' - ' + ui.values[ 1 ] + '{/literal}{$filter.unit}{literal}');
+											{/literal}
+											{if $filter.format < 5}
+											{literal}
+												from = formatCurrency(ui.values[0], {/literal}{$filter.format}{literal}, '{/literal}{$filter.unit}{literal}');
+												to = formatCurrency(ui.values[1], {/literal}{$filter.format}{literal}, '{/literal}{$filter.unit}{literal}');
+											{/literal}
+											{else}
+											{literal}
+												from = ui.values[0]+'{/literal}{$filter.unit}{literal}';
+												to = ui.values[1]+'{/literal}{$filter.unit}{literal}';
+											{/literal}
+											{/if}
+											{literal}
+											$('#layered_{/literal}{$filter.type}{literal}_range').html(from+' - '+to);
 										},
 										stop: function () {
 											reloadContent();
 										}
-									}, '{/literal}{$filter.unit}{literal}');
+									}, '{/literal}{$filter.unit}{literal}', {/literal}{$filter.format}{literal});
 								{/literal}
 								</script>
 							{else}
@@ -174,6 +192,7 @@ param_product_url = '';
 									<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
 									{l s='to' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_max layered_input_range" id="layered_{$filter.type}_range_max" type="text" value="{$filter.values[1]}"/>
 									<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
+									<span class="layered_{$filter.type}_format">{$filter.format}</span>
 									<script type="text/javascript">
 									{literal}
 										$('#layered_{/literal}{$filter.type}{literal}_range_min').attr('limitValue', {/literal}{$filter.min}{literal});