[IMP] website_sale_product_assortment: pre-commit auto fixes

website_sale_product_assortment/README.rst

@@ -17,18 +17,19 @@ eCommerce product assortment
  :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/16.0/website_sale_product_assortment
+ :target: https://github.com/OCA/e-commerce/tree/17.0/website_sale_product_assortment
  :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-16-0/e-commerce-16-0-website_sale_product_assortment
+ :target: https://translation.odoo-community.org/projects/e-commerce-17-0/e-commerce-17-0-website_sale_product_assortment
  :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=16.0
+ :target: https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=17.0
  :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module allows to set e-commerce restrictions on product assortments.
+This module allows to set e-commerce restrictions on product
+assortments.
 
 **Table of contents**
 
@@ -38,54 +39,56 @@ This module allows to set e-commerce restrictions on product assortments.
 Configuration
 =============
 
-To see this module working, you have to define a product assortment and select
-an option on the website availability field.
-
-#. **Don't apply restriction**: This option will not set any kind of restriction on
-product items.
-#. **Avoid to show non available products**: This option will hide on the e-commerce, the
-products that are not added to the products domain. If a product template has at least
-one allowed variant to show, the product will appear on the product items view but only
-that variants will be able to be bought.
-#. **Avoid selling not available products**: This option will restrict to buy the
-products that are added to the assortment on the e-commerce. To inform the clients,
-two more fields were added: "Message when unavailable" and "Assortment information".
-The first one will add a short description to the product item and the other one will set a
-detailed description on the product sheet. This second one is editable from the website editor.
+To see this module working, you have to define a product assortment and
+select an option on the website availability field.
+
+#. **Don't apply restriction**: This option will not set any kind of
+restriction on product items. #. **Avoid to show non available
+products**: This option will hide on the e-commerce, the products that
+are not added to the products domain. If a product template has at least
+one allowed variant to show, the product will appear on the product
+items view but only that variants will be able to be bought. #. **Avoid
+selling not available products**: This option will restrict to buy the
+products that are added to the assortment on the e-commerce. To inform
+the clients, two more fields were added: "Message when unavailable" and
+"Assortment information". The first one will add a short description to
+the product item and the other one will set a detailed description on
+the product sheet. This second one is editable from the website editor.
 
 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_assortment%0Aversion:%2016.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_assortment%0Aversion:%2017.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.
 
 Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Tecnativa
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* `Tecnativa <https://www.tecnativa.com>`_:
+- `Tecnativa <https://www.tecnativa.com>`__:
 
- * Carlos Roca
- * Pedro M. Baeza
- * Stefan Ungureanu
- * Pilar Vargas
+  -  Carlos Roca
+  -  Pedro M. Baeza
+  -  Stefan Ungureanu
+  -  Pilar Vargas
 
-* `Ooops <https://www.ooops404.com>`_:
- * Ashish Hirpara (https://ashish-hirpara.com)
+- `Ooops <https://www.ooops404.com>`__:
+
+ - Ashish Hirpara (https://ashish-hirpara.com)
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -105,6 +108,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-CarlosRoca13| 
 
-This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/16.0/website_sale_product_assortment>`_ project on GitHub.
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/17.0/website_sale_product_assortment>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_sale_product_assortment/__manifest__.py

@@ -3,7 +3,7 @@
 {
  "name": "eCommerce product assortment",
  "summary": "Use product assortments to display products available on e-commerce.",
- "version": "16.0.1.0.0",
+ "version": "17.0.1.0.0",
  "development_status": "Beta",
  "license": "AGPL-3",
  "category": "Website",

website_sale_product_assortment/controllers/website_sale.py

@@ -30,8 +30,7 @@ def _get_products_allowed(self):
  if (
  # Set active_test to False to allow filtering by partners
  # that are not active, (for example Public User)
- partner
- & assortment.with_context(active_test=False).all_partner_ids
+ partner & assortment.with_context(active_test=False).all_partner_ids
  ):
  assortment_restriction = True
  allowed_product_ids = allowed_product_ids.union(
@@ -58,7 +57,7 @@ def _get_search_options(
  min_price=0.0,
  max_price=0.0,
  conversion_rate=1,
- **post
+ **post,
  ):
  """Overriding _get_search_options method to avoid show product templates that
  has all their variants not allowed to be shown."""
@@ -69,7 +68,7 @@ def _get_search_options(
  min_price=min_price,
  max_price=max_price,
  conversion_rate=conversion_rate,
- **post
+ **post,
  )
  allowed_product_ids, assortment_restriction = self._get_products_allowed()
  if assortment_restriction:

website_sale_product_assortment/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"

website_sale_product_assortment/readme/CONFIGURE.md

@@ -0,0 +1,15 @@
+To see this module working, you have to define a product assortment and
+select an option on the website availability field.
+
+#\. **Don't apply restriction**: This option will not set any kind of
+restriction on product items. \#. **Avoid to show non available
+products**: This option will hide on the e-commerce, the products that
+are not added to the products domain. If a product template has at least
+one allowed variant to show, the product will appear on the product
+items view but only that variants will be able to be bought. \#. **Avoid
+selling not available products**: This option will restrict to buy the
+products that are added to the assortment on the e-commerce. To inform
+the clients, two more fields were added: "Message when unavailable" and
+"Assortment information". The first one will add a short description to
+the product item and the other one will set a detailed description on
+the product sheet. This second one is editable from the website editor.

website_sale_product_assortment/readme/CONTRIBUTORS.md

@@ -0,0 +1,9 @@
+- [Tecnativa](https://www.tecnativa.com):
+
+ > - Carlos Roca
+ > - Pedro M. Baeza
+ > - Stefan Ungureanu
+ > - Pilar Vargas
+
+- [Ooops](https://www.ooops404.com): 
+ - Ashish Hirpara (<https://ashish-hirpara.com>)

website_sale_product_assortment/readme/DESCRIPTION.md

@@ -0,0 +1,2 @@
+This module allows to set e-commerce restrictions on product
+assortments.

website_sale_product_assortment/static/description/index.html

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
  margin-left: 2em ;
  margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
  white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
  color: red }
 
 span.section-subtitle {
@@ -369,8 +369,9 @@ <h1 class="title">eCommerce product assortment</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:2d8807010bb9fc649f45e174777ff7e9dd0d2843032901734194c53123809266
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/16.0/website_sale_product_assortment"><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-16-0/e-commerce-16-0-website_sale_product_assortment"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module allows to set e-commerce restrictions on product assortments.</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/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/17.0/website_sale_product_assortment"><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-17-0/e-commerce-17-0-website_sale_product_assortment"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module allows to set e-commerce restrictions on product
+assortments.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -386,26 +387,27 @@ <h1 class="title">eCommerce product assortment</h1>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
-<p>To see this module working, you have to define a product assortment and select
-an option on the website availability field.</p>
-<p>#. <strong>Don’t apply restriction</strong>: This option will not set any kind of restriction on
-product items.
-#. <strong>Avoid to show non available products</strong>: This option will hide on the e-commerce, the
-products that are not added to the products domain. If a product template has at least
-one allowed variant to show, the product will appear on the product items view but only
-that variants will be able to be bought.
-#. <strong>Avoid selling not available products</strong>: This option will restrict to buy the
-products that are added to the assortment on the e-commerce. To inform the clients,
-two more fields were added: “Message when unavailable” and “Assortment information”.
-The first one will add a short description to the product item and the other one will set a
-detailed description on the product sheet. This second one is editable from the website editor.</p>
+<p>To see this module working, you have to define a product assortment and
+select an option on the website availability field.</p>
+<p>#. <strong>Don’t apply restriction</strong>: This option will not set any kind of
+restriction on product items. #. <strong>Avoid to show non available
+products</strong>: This option will hide on the e-commerce, the products that
+are not added to the products domain. If a product template has at least
+one allowed variant to show, the product will appear on the product
+items view but only that variants will be able to be bought. #. <strong>Avoid
+selling not available products</strong>: This option will restrict to buy the
+products that are added to the assortment on the e-commerce. To inform
+the clients, two more fields were added: “Message when unavailable” and
+“Assortment information”. The first one will add a short description to
+the product item and the other one will set a detailed description on
+the product sheet. This second one is editable from the website editor.</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <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_assortment%0Aversion:%2016.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_assortment%0Aversion:%2017.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">
@@ -429,26 +431,25 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 </ul>
 </blockquote>
 </li>
-<li><dl class="first docutils">
-<dt><a class="reference external" href="https://www.ooops404.com">Ooops</a>:</dt>
-<dd><ul class="first last simple">
+<li><p class="first"><a class="reference external" href="https://www.ooops404.com">Ooops</a>:</p>
+<ul class="simple">
 <li>Ashish Hirpara (<a class="reference external" href="https://ashish-hirpara.com">https://ashish-hirpara.com</a>)</li>
 </ul>
-</dd>
-</dl>
 </li>
 </ul>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <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>
+<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>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/CarlosRoca13"><img alt="CarlosRoca13" src="https://github.com/CarlosRoca13.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/16.0/website_sale_product_assortment">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/17.0/website_sale_product_assortment">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>

website_sale_product_assortment/static/src/js/assortment_list_preview.js

@@ -8,10 +8,8 @@ odoo.define("website_sale_product_assortment.assortment_preview", function (requ
  selector: "#products_grid",
 
  start: function () {
- return $.when.apply($, [
- this._super.apply(this, arguments),
- this.render_assortments(),
- ]);
+ this._super.apply(this, arguments);
+ this.render_assortments();
  },
  render_assortments: function () {
  const $products = $(".o_wsale_product_grid_wrapper");

website_sale_product_assortment/static/src/js/variant_mixin.js

@@ -20,7 +20,7 @@ odoo.define("website_sale_product_assortment.VariantMixin", function (require) {
  const isMainProduct =
  combination.product_id &&
  ($parent.is(".js_main_product") || $parent.is(".main_product")) &&
- combination.product_id === parseInt(product_id);
+ combination.product_id === parseInt(product_id, 10);
  if (!this.isWebsite || !isMainProduct) {
  return;
  }