From 8a241719964438049cacfb40c3dd2f5a91a7cf99 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 13 Jun 2014 09:32:28 +0200 Subject: [PATCH] [IMP] website_sale: display 'Product not available' message in product selector --- .../static/src/css/website_sale.css | 25 ++++++++++++++-- .../static/src/css/website_sale.sass | 30 +++++++++++++------ .../static/src/js/website_sale.js | 4 +-- addons/website_sale/views/templates.xml | 5 +++- 4 files changed, 49 insertions(+), 15 deletions(-) diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css index 41db67c0ffe..232872fa19f 100644 --- a/addons/website_sale/static/src/css/website_sale.css +++ b/addons/website_sale/static/src/css/website_sale.css @@ -298,13 +298,32 @@ margin: 6px; } -.js_add_cart_variants option.css_not_available { +.css_not_available_msg { + display: none; +} + +.css_not_available .row > div:nth-child(3), .css_not_available .row > div:nth-child(4) { + display: none; +} +.css_not_available .row > div:last-child { + display: block; +} +.css_not_available .product_price { + display: none; +} +.css_not_available .css_not_available_msg { + display: block; +} + +option.css_not_available { color: #cccccc; } -.js_add_cart_variants label.css_not_available { + +label.css_not_available { opacity: 0.6; } -.js_add_cart_variants label.css_attribute_color.css_not_available { + +label.css_attribute_color.css_not_available { opacity: 1; background-image: url("/website_sale/static/src/img/redcross.png"); background-size: cover; diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass index 05bcff522da..bb6a329a821 100644 --- a/addons/website_sale/static/src/css/website_sale.sass +++ b/addons/website_sale/static/src/css/website_sale.sass @@ -257,15 +257,27 @@ &.active input margin: 6px -.js_add_cart_variants - option.css_not_available - color: #ccc - label.css_not_available - opacity: 0.6 - label.css_attribute_color.css_not_available - opacity: 1 - background-image: url('/website_sale/static/src/img/redcross.png') - background-size: cover +.css_not_available_msg + display: none +.css_not_available + .row + > div:nth-child(3), > div:nth-child(4) + display: none + > div:last-child + display: block + .product_price + display: none + .css_not_available_msg + display: block + +option.css_not_available + color: #ccc +label.css_not_available + opacity: 0.6 +label.css_attribute_color.css_not_available + opacity: 1 + background-image: url('/website_sale/static/src/img/redcross.png') + background-size: cover .product_detail_img margin-left: auto diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index fce5f72b861..149b54d7c8e 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -110,11 +110,11 @@ $(document).ready(function () { }); if (product_id) { - $parent.removeClass("oe_not_available"); + $parent.removeClass("css_not_available"); $porduct_id.val(product_id); $parent.find(".js_check_product").removeAttr("disabled"); } else { - $parent.addClass("oe_not_available"); + $parent.addClass("css_not_available"); $porduct_id.val(0); $parent.find(".js_check_product").attr("disabled", "disabled"); } diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 596056b2df1..1483482f7b8 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -518,6 +518,9 @@ +
+

Product not available

+
@@ -568,7 +571,7 @@ - +

Product not available

Add to Cart Add to Cart