Merge PR #819 into 16.0

Signed-off-by pedrobaeza
OCA · Aug 17, 2023 · c4a87d5 · c4a87d5
2 parents d9ebfa7 + eae8e4c
commit c4a87d5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/website_sale_hide_price/models/product_template.py b/website_sale_hide_price/models/product_template.py
@@ -44,8 +44,11 @@ def _search_render_results(self, fetch_fields, mapping, icon, limit):
         results_data = super()._search_render_results(
             fetch_fields, mapping, icon, limit
         )
+        website_show_price = (
+            self.env["website"].get_current_website().website_show_price
+        )
         for product, data in zip(self, results_data):
-            if product.website_hide_price:
+            if product.website_hide_price or not website_show_price:
                 data.update(
                     {
                         "price": "<span>%s</span>"

diff --git a/website_sale_hide_price/views/website_sale_template.xml b/website_sale_hide_price/views/website_sale_template.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+    <template id="products" inherit_id="website_sale.products">
+        <!-- adding website and website.website_show_price to t-cache in order to update cache if parameter modified
+             this is needed if you connect with a different user that should not see the prices
+             see https://github.com/OCA/e-commerce/issues/818 -->
+        <xpath
+            expr="//div[hasclass('o_wsale_products_grid_table_wrapper')]"
+            position="attributes"
+        >
+            <attribute
+                name="t-cache"
+            >pricelist,products,website,website.website_show_price</attribute>
+        </xpath>
+    </template>
     <template id="product_price" inherit_id="website_sale.product_price">
         <xpath expr="//div[@itemprop='offers']" position="attributes">
             <attribute name="t-if">
@@ -16,6 +29,14 @@
     </template>
     <!-- Hide Add To Cart Button and quantity selector if not website_show_price -->
     <template id="product" inherit_id="website_sale.product">
+        <!-- adding website, website.website_show_price and product.website_hide_price to t-cache in order to update cache if parameter modified
+             this is needed if you connect with a different user that should not see the prices
+             see https://github.com/OCA/e-commerce/issues/818 -->
+        <xpath expr="t[@t-cache='pricelist,product']" position="attributes">
+          <attribute
+                name="t-cache"
+            >pricelist,product,website,website.website_show_price,product.website_hide_price</attribute>
+        </xpath>
         <xpath expr="//a[@id='add_to_cart']" position="before">
             <t t-set="user_authenticated" t-value="user_id != website.user_id" />
             <div