From 8d22dd8ae942d4eb366264994cc272db9499d00c Mon Sep 17 00:00:00 2001 From: Danial Sheikhani Date: Wed, 23 Feb 2022 12:24:14 +0000 Subject: [PATCH] [IMP] website_sale: Add prevent_zero_price_sale option After this commit clients will be able to select whether to display the add to cart button when the computed price of a product is 0. This option will be available in the settings. task-2694860 closes odoo/odoo#87952 Related: odoo/enterprise#27594 Signed-off-by: William Braeckman (wbr) --- .../data/product_snippet_template_data.xml | 17 ++++++++---- addons/website_sale/models/product_product.py | 3 ++- .../website_sale/models/product_template.py | 16 ++++++++---- .../models/res_config_settings.py | 2 ++ addons/website_sale/models/sale_order.py | 3 +++ addons/website_sale/models/website.py | 5 ++++ .../static/src/js/variant_mixin.js | 19 +++++++++++++- addons/website_sale/tests/test_customize.py | 2 +- .../views/res_config_settings_views.xml | 17 ++++++++++++ addons/website_sale/views/templates.xml | 26 ++++++++++++++----- .../website_sale_comparison_template.xml | 26 ++++++++++++++----- .../views/website_sale_wishlist_template.xml | 8 ++++-- 12 files changed, 116 insertions(+), 28 deletions(-) diff --git a/addons/website_sale/data/product_snippet_template_data.xml b/addons/website_sale/data/product_snippet_template_data.xml index f159667c84a..be90887afdc 100644 --- a/addons/website_sale/data/product_snippet_template_data.xml +++ b/addons/website_sale/data/product_snippet_template_data.xml @@ -12,7 +12,7 @@ - +
@@ -287,10 +287,17 @@ diff --git a/addons/website_sale/models/product_product.py b/addons/website_sale/models/product_product.py index a1f505a2c96..7c1458f2746 100644 --- a/addons/website_sale/models/product_product.py +++ b/addons/website_sale/models/product_product.py @@ -88,7 +88,8 @@ class Product(models.Model): return combination_info['product_type'] == 'product' and combination_info['free_qty'] <= 0 def _website_show_quick_add(self): - return self.sale_ok + website = self.env['website'].get_current_website() + return self.sale_ok and (not website.prevent_zero_price_sale or self._get_contextual_price()) def _is_add_to_cart_allowed(self): self.ensure_one() diff --git a/addons/website_sale/models/product_template.py b/addons/website_sale/models/product_template.py index 57c8377ac22..c6597abe5db 100644 --- a/addons/website_sale/models/product_template.py +++ b/addons/website_sale/models/product_template.py @@ -255,7 +255,7 @@ class ProductTemplate(models.Model): product, partner ) has_discounted_price = pricelist.currency_id.compare_amounts(list_price, price) == 1 - + prevent_zero_price_sale = not price and current_website.prevent_zero_price_sale combination_info.update( base_unit_name=product.base_unit_name, base_unit_price=product.base_unit_price, @@ -263,6 +263,7 @@ class ProductTemplate(models.Model): list_price=list_price, price_extra=price_extra, has_discounted_price=has_discounted_price, + prevent_zero_price_sale=prevent_zero_price_sale, ) return combination_info @@ -491,9 +492,13 @@ class ProductTemplate(models.Model): def _search_render_results_prices(self, mapping, combination_info): monetary_options = {'display_currency': mapping['detail']['display_currency']} - price = self.env['ir.qweb.field.monetary'].value_to_html( - combination_info['price'], monetary_options - ) + if combination_info['prevent_zero_price_sale']: + website = self.env['website'].get_current_website() + price = website.prevent_zero_price_sale_text + else: + price = self.env['ir.qweb.field.monetary'].value_to_html( + combination_info['price'], monetary_options + ) if combination_info['has_discounted_price']: list_price = self.env['ir.qweb.field.monetary'].value_to_html( combination_info['list_price'], monetary_options @@ -524,4 +529,5 @@ class ProductTemplate(models.Model): return pricelist def _website_show_quick_add(self): - return self.sale_ok + website = self.env['website'].get_current_website() + return self.sale_ok and (not website.prevent_zero_price_sale or self._get_contextual_price()) diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py index 3c7c569b1ed..69c2cfc5ddf 100644 --- a/addons/website_sale/models/res_config_settings.py +++ b/addons/website_sale/models/res_config_settings.py @@ -59,6 +59,8 @@ class ResConfigSettings(models.TransientModel): compute="_compute_account_on_checkout", inverse="_inverse_account_on_checkout", readonly=False, required=True) + website_sale_prevent_zero_price_sale = fields.Boolean(string="Prevent Sale of Zero Priced Product", related='website_id.prevent_zero_price_sale', readonly=False) + website_sale_contact_us_button_url = fields.Char(string="Button URL", related='website_id.contact_us_button_url', readonly=False) @api.depends('website_id') def _compute_terms_url(self): diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py index 2f932ef2c64..c340b966437 100644 --- a/addons/website_sale/models/sale_order.py +++ b/addons/website_sale/models/sale_order.py @@ -132,6 +132,9 @@ class SaleOrder(models.Model): if not product or not product._is_add_to_cart_allowed(): raise UserError(_("The given product does not exist therefore it cannot be added to cart.")) + if product.lst_price == 0 and product.website_id.prevent_zero_price_sale: + raise UserError(_("The given product does not have a price therefore it cannot be added to cart.")) + if line_id is not False: order_line = self._cart_find_product_line(product_id, line_id, **kwargs)[:1] else: diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py index eb62f6023ee..7b7307efcd4 100644 --- a/addons/website_sale/models/website.py +++ b/addons/website_sale/models/website.py @@ -101,6 +101,11 @@ class Website(models.Model): ], default='small', required=True, ) + prevent_zero_price_sale = fields.Boolean(string="Hide 'Add To Cart' when price = 0") + prevent_zero_price_sale_text = fields.Char(string="Text to show instead of price", translate=True, + default="Not Available For Sale") + contact_us_button_url = fields.Char(string="Contact Us Button URL", translate=True, default="/contactus") + @api.depends('all_pricelist_ids') def _compute_pricelist_ids(self): for website in self: diff --git a/addons/website_sale/static/src/js/variant_mixin.js b/addons/website_sale/static/src/js/variant_mixin.js index 7fa78bb7b4c..712fedf1298 100644 --- a/addons/website_sale/static/src/js/variant_mixin.js +++ b/addons/website_sale/static/src/js/variant_mixin.js @@ -39,7 +39,24 @@ VariantMixin._onChangeCombination = function (ev, $parent, combination) { $product.data('product-tracking-info', combination['product_tracking_info']); $product.trigger('view_item_event', combination['product_tracking_info']); } - + const addToCart = $parent.find('#add_to_cart_wrap'); + const contactUsButton = $parent.find('#contact_us_wrapper'); + const productPrice = $parent.find('.product_price'); + const quantity = $parent.find('.css_quantity'); + const product_unavailable = $parent.find('#product_unavailable'); + if (combination.prevent_zero_price_sale) { + productPrice.removeClass('d-inline-block').addClass('d-none'); + quantity.removeClass('d-inline-flex').addClass('d-none'); + addToCart.removeClass('d-inline-flex').addClass('d-none'); + contactUsButton.removeClass('d-none').addClass('d-flex'); + product_unavailable.removeClass('d-none').addClass('d-flex') + } else { + productPrice.removeClass('d-none').addClass('d-inline-block'); + quantity.removeClass('d-none').addClass('d-inline-flex'); + addToCart.removeClass('d-none').addClass('d-inline-flex'); + contactUsButton.removeClass('d-flex').addClass('d-none'); + product_unavailable.removeClass('d-flex').addClass('d-none') + } originalOnChangeCombination.apply(this, [ev, $parent, combination]); }; diff --git a/addons/website_sale/tests/test_customize.py b/addons/website_sale/tests/test_customize.py index 3bf8cd5ae13..0a6686b2971 100644 --- a/addons/website_sale/tests/test_customize.py +++ b/addons/website_sale/tests/test_customize.py @@ -191,7 +191,7 @@ class TestUi(HttpCaseWithUserDemo, HttpCaseWithUserPortal): product_template = self.env['product.template'].create({ 'name': 'Dynamic Product', 'website_published': True, - 'list_price': 0, + 'list_price': 10, }) # set attribute and attribute values on the template diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml index c77fab0b17a..71d28718278 100644 --- a/addons/website_sale/views/res_config_settings_views.xml +++ b/addons/website_sale/views/res_config_settings_views.xml @@ -216,6 +216,23 @@
+
+
+ +
+
+
+

Shipping

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index e7c16227a67..162730b9635 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -194,7 +194,8 @@ - + + @@ -215,7 +216,7 @@ - + @@ -649,7 +650,7 @@