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 = '';