From 162ee61d4fd81cbe28d3779f086e2f9e277d21dd Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 30 Jun 2014 13:53:25 +0200 Subject: [PATCH] [FIX] website_sale: discount price is never hide --- addons/website_sale/static/src/css/website_sale.css | 8 ++++++++ addons/website_sale/static/src/css/website_sale.sass | 5 +++++ addons/website_sale/static/src/js/website_sale.js | 6 +++++- addons/website_sale/views/templates.xml | 4 ++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css index 8055d0ad310..503c409cb0a 100644 --- a/addons/website_sale/static/src/css/website_sale.css +++ b/addons/website_sale/static/src/css/website_sale.css @@ -333,6 +333,14 @@ label.css_attribute_color.css_not_available { max-height: 500px; } +.oe_default_price { + display: none; +} + +.discount .oe_default_price { + display: block; +} + /* ---- Publish managment and options ---- */ #products_grid .css_options { display: none; diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass index f08b635124c..b5726536955 100644 --- a/addons/website_sale/static/src/css/website_sale.sass +++ b/addons/website_sale/static/src/css/website_sale.sass @@ -282,6 +282,11 @@ label.css_attribute_color.css_not_available display: block max-height: 500px +.oe_default_price + display: none +.discount .oe_default_price + display: block + /* ---- Publish managment and options ---- */ #products_grid .css_options diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index ad7823ca6bb..642d5724a42 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -102,7 +102,11 @@ $('.oe_website_sale').each(function () { if (_.isEqual(variant_ids[k][1], values)) { $price.html(price_to_str(variant_ids[k][2])); $default_price.html(price_to_str(variant_ids[k][3])); - $default_price.parent().toggle(variant_ids[k][3]-variant_ids[k][2]>0.2); + if (variant_ids[k][3]-variant_ids[k][2]>0.2) { + $default_price.closest('.oe_website_sale').addClass("discount"); + } else { + $default_price.closest('.oe_website_sale').removeClass("discount"); + } product_id = variant_ids[k][0]; break; } diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 2f7a248f8f6..daf6ac0e628 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -371,7 +371,7 @@ -
+
@@ -435,7 +435,7 @@