[MIG] website_sale_product_brand: Migration to 19.0

Author: Alexgars73

website_sale_product_brand/README.rst

@@ -1,3 +1,7 @@
+.. image:: https://odoo-community.org/readme-banner-image
+   :target: https://odoo-community.org/get-involved?utm_source=readme
+   :alt: Odoo Community Association
+
 ==================================
 Product Brand Filtering in Website
 ==================================
@@ -13,17 +17,17 @@ Product Brand Filtering in Website
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github
-    :target: https://github.com/OCA/e-commerce/tree/18.0/website_sale_product_brand
+    :target: https://github.com/OCA/e-commerce/tree/19.0/website_sale_product_brand
     :alt: OCA/e-commerce
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_product_brand
+    :target: https://translation.odoo-community.org/projects/e-commerce-19-0/e-commerce-19-0-website_sale_product_brand
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -80,7 +84,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/e-commerce/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_product_brand%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_product_brand%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -109,6 +113,10 @@ Contributors
      - Carlos López
      - Pilar Vargas
 
+- `Studio73 <https://www.studio73.es>`__:
+
+     - Alex Garcia <[alex@studio73.es]>
+
 Maintainers
 -----------
 
@@ -122,6 +130,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/18.0/website_sale_product_brand>`_ project on GitHub.
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/19.0/website_sale_product_brand>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_sale_product_brand/__manifest__.py

@@ -8,7 +8,7 @@
     "Tecnativa, "
     "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/e-commerce",
-    "version": "18.0.1.0.0",
+    "version": "19.0.1.0.0",
     "license": "AGPL-3",
     "depends": ["product_brand", "website_sale"],
     "data": [
@@ -17,10 +17,6 @@
         "views/product_brand.xml",
         "views/product_brand_views.xml",
     ],
-    "demo": [
-        "demo/product_brand_demo.xml",
-        "demo/product_product_demo.xml",
-    ],
     "assets": {
         "web.assets_frontend": [
             "/website_sale_product_brand/static/src/scss/website_sale_product_brand.scss"

website_sale_product_brand/controllers/main.py

@@ -2,8 +2,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import http
+from odoo.fields import Domain
 from odoo.http import request
-from odoo.osv import expression
 
 from odoo.addons.website_sale.controllers.main import QueryURL, WebsiteSale
 
@@ -28,7 +28,7 @@ def _get_search_options(
             conversion_rate=conversion_rate,
             **post,
         )
-        res["brand"] = request.context.get("brand_id")
+        res["brand"] = request.env.context.get("brand_id")
         return res
 
     def _get_search_domain(
@@ -37,9 +37,9 @@ def _get_search_domain(
         domain = super()._get_search_domain(
             search, category, attrib_values, search_in_description=search_in_description
         )
-        if "brand_id" in request.context:
-            domain = expression.AND(
-                [domain, [("product_brand_id", "=", request.context["brand_id"])]]
+        if "brand_id" in request.env.context:
+            domain = Domain.AND(
+                [domain, [("product_brand_id", "=", request.env.context["brand_id"])]]
             )
         return domain
 
@@ -68,7 +68,7 @@ def shop(
         **post,
     ):
         if brand:
-            context = dict(request.context)
+            context = dict(request.env.context)
             context.setdefault("brand_id", int(brand))
             request.update_context(**context)
         return super().shop(

website_sale_product_brand/demo/product_brand_demo.xml

@@ -11,3 +11,6 @@
   > - Carlos López
   > - Pilar Vargas
 
+- [Studio73](https://www.studio73.es):
+  > - Alex Garcia <[alex@studio73.es]>
+

website_sale_product_brand/demo/product_product_demo.xml

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>Product Brand Filtering in Website</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="product-brand-filtering-in-website">
-<h1 class="title">Product Brand Filtering in Website</h1>
+<div class="document">
 
+
+<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
+<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
+</a>
+<div class="section" id="product-brand-filtering-in-website">
+<h1>Product Brand Filtering in Website</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:b9e4d313bc036276fc48d47dc2feadb3931434c3cf8897951620af315ddeb02e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/18.0/website_sale_product_brand"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_product_brand"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/19.0/website_sale_product_brand"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/e-commerce-19-0/e-commerce-19-0-website_sale_product_brand"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to extend the functionality of product filtering
 on website. It will allow you to filter product based on its brand.</p>
 <p>While shopping online, we have seen various eShops having a feature to
@@ -392,7 +397,7 @@ <h1 class="title">Product Brand Filtering in Website</h1>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p>In order to hide brands from the e-commerce:</p>
 <ol class="arabic simple">
 <li>Go to <em>Website &gt; eCommerce &gt; Product brands</em></li>
@@ -401,7 +406,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 </ol>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
 <p>Shop by brand feature is available on various famous e-commerce websites
 like amazon, flipkart and many. Shop by brand feature enables you to
 display product relevant to that particular brand.</p>
@@ -422,24 +427,24 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 brand it will show product’s which is related to this brand.</p>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/e-commerce/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_product_brand%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_product_brand%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
 <ul class="simple">
 <li>Serpent Consulting Services Pvt. Ltd.</li>
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
 <ul>
 <li><p class="first">Jay Vora &lt;<a class="reference external" href="mailto:jay.vora&#64;serpentcs.com">jay.vora&#64;serpentcs.com</a>&gt;</p>
 </li>
@@ -457,21 +462,29 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 </ul>
 </blockquote>
 </li>
+<li><p class="first"><a class="reference external" href="https://www.studio73.es">Studio73</a>:</p>
+<blockquote>
+<ul class="simple">
+<li>Alex Garcia &lt;[<a class="reference external" href="mailto:alex&#64;studio73.es]">alex&#64;studio73.es]</a>&gt;</li>
+</ul>
+</blockquote>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
 </a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/18.0/website_sale_product_brand">OCA/e-commerce</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/19.0/website_sale_product_brand">OCA/e-commerce</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
 </div>
+</div>
 </body>
 </html>

website_sale_product_brand/readme/CONTRIBUTORS.md

@@ -9,6 +9,7 @@ registry.category("web_tour.tours").add("website_sale_product_brand", {
         {
             trigger: "a[href='/page/product_brands']",
             content: "Go to 'Product brand' page",
+            expectUnloadPage: true,
             run: "click",
         },
         {
@@ -19,11 +20,14 @@ registry.category("web_tour.tours").add("website_sale_product_brand", {
         {
             content: "Click to search Apple",
             trigger: 'form:has(input[name="search"]) button',
+            expectUnloadPage: true,
             run: "click",
         },
         {
             content: "select Apple",
-            trigger: 'section a div:contains("Apple")',
+            trigger: 'section a:has(span:contains("Apple"))',
+            expectUnloadPage: true,
+            run: "click",
         },
     ],
 });

website_sale_product_brand/static/description/index.html

@@ -1,6 +1,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import odoo.tests
+from odoo.tests import common as tests
 
 from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
 
@@ -11,6 +12,31 @@ class UICase(odoo.tests.HttpCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
+        tests.new_test_user(
+            cls.env,
+            login="portal",
+            password="portal",
+            groups="base.group_portal",
+        )
+        brand = (
+            cls.env["product.brand"]
+            .sudo()
+            .create(
+                {
+                    "name": "Apple",
+                    "is_published": True,
+                }
+            )
+        )
+        cls.env["product.template"].sudo().create(
+            {
+                "name": "Apple Test Product",
+                "sale_ok": True,
+                "list_price": 10.0,
+                "website_published": True,
+                "product_brand_id": brand.id,
+            }
+        )
 
     def test_ui_website(self):
         """Test frontend tour."""