[MIG] website_sale_order_type: Migration to 19.0

Author: Vicent-S73

website_sale_order_type/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
+
 =======================
 Website sale order type
 =======================
@@ -13,17 +17,17 @@ Website sale order type
 .. |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_order_type
+    :target: https://github.com/OCA/e-commerce/tree/19.0/website_sale_order_type
     :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_order_type
+    :target: https://translation.odoo-community.org/projects/e-commerce-19-0/e-commerce-19-0-website_sale_order_type
     :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|
@@ -61,7 +65,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_order_type%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_order_type%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.
 
@@ -85,6 +89,10 @@ Contributors
      - Stefan Ungureanu
      - Carlos Lopez
 
+- `Studio73 <https://www.studio73.es/>`__:
+
+     - Vicent Castells
+
 Maintainers
 -----------
 
@@ -106,6 +114,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-pilarvargas-tecnativa| 
 
-This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/18.0/website_sale_order_type>`_ project on GitHub.
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/19.0/website_sale_order_type>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_sale_order_type/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Website sale order type",
     "summary": "This module allows sale_order_type to work with website_sale.",
-    "version": "18.0.1.0.0",
+    "version": "19.0.1.0.0",
     "development_status": "Beta",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",

website_sale_order_type/models/website.py

@@ -1,20 +1,32 @@
 # Copyright 2023 Tecnativa - Pilar Vargas
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, models
+from odoo import models
 
 
 class Website(models.Model):
     _inherit = "website"
 
-    @api.model
-    def sale_get_payment_term(self, partner):
-        if partner.sale_type.payment_term_id:
-            return partner.sale_type.payment_term_id.id
-        return super().sale_get_payment_term(partner)
+    def _prepare_sale_order_values(self, partner_sudo):
+        self.ensure_one()
+        so_data = super()._prepare_sale_order_values(partner_sudo)
 
-    def _get_current_pricelist(self):
-        partner_sudo = self.env.user.partner_id
-        if partner_sudo.sale_type.pricelist_id:
-            return partner_sudo.sale_type.pricelist_id.id
-        return super()._get_current_pricelist()
+        sale_type = partner_sudo.sale_type
+        if sale_type:
+            so_data["type_id"] = sale_type.id
+            if sale_type.payment_term_id:
+                so_data["payment_term_id"] = sale_type.payment_term_id.id
+        return so_data
+
+    def get_pricelist_available(self, show_visible=False):
+        website = self.with_company(self.company_id)
+        partner_sudo = website.env.user.partner_id
+        sale_type_pricelist = partner_sudo.sale_type.pricelist_id
+        country_code = website._get_geoip_country_code()
+        if (
+            sale_type_pricelist
+            and sale_type_pricelist._is_available_on_website(website)
+            and sale_type_pricelist._is_available_in_country(country_code)
+        ):
+            return sale_type_pricelist
+        return super().get_pricelist_available(show_visible)

website_sale_order_type/readme/CONTRIBUTORS.md

@@ -6,3 +6,6 @@
   > - Pilar Vargas
   > - Stefan Ungureanu
   > - Carlos Lopez
+
+- [Studio73](https://www.studio73.es/):
+  > - Vicent Castells

website_sale_order_type/static/description/index.html

@@ -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>Website sale order type</title>
+<title>README.rst</title>
 <style type="text/css">
 
 /*
@@ -360,16 +360,21 @@
 </style>
 </head>
 <body>
-<div class="document" id="website-sale-order-type">
-<h1 class="title">Website sale order type</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="website-sale-order-type">
+<h1>Website sale order type</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:5f6d6f491b82d69808d11f2b0bc9db9610384f5e9b7c312b7c94712b26abcbec
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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_order_type"><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_order_type"><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_order_type"><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_order_type"><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 allows
 <a class="reference external" href="https://github.com/OCA/sale-workflow/tree/17.0/sale_order_type">sale_order_type</a>
 to work with websitesale.</p>
@@ -393,7 +398,7 @@ <h1 class="title">Website sale order type</h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
 <ol class="arabic simple">
 <li>In the backend (Sales -&gt; Customers) set a sale order type in any
 contact;</li>
@@ -404,23 +409,23 @@ <h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-2">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_order_type%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_order_type%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-3">Credits</a></h1>
+<h2><a class="toc-backref" href="#toc-entry-3">Credits</a></h2>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-4">Authors</a></h3>
 <ul class="simple">
 <li>Agile Business Group</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <ul>
 <li><p class="first">Simone Rubino &lt;<a class="reference external" href="mailto:simone.rubino&#64;agilebg.com">simone.rubino&#64;agilebg.com</a>&gt;</p>
 </li>
@@ -434,10 +439,17 @@ <h2><a class="toc-backref" href="#toc-entry-5">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>Vicent Castells</li>
+</ul>
+</blockquote>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<h3><a class="toc-backref" href="#toc-entry-6">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" />
@@ -447,10 +459,11 @@ <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 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/pilarvargas-tecnativa"><img alt="pilarvargas-tecnativa" src="https://github.com/pilarvargas-tecnativa.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/18.0/website_sale_order_type">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_order_type">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_order_type/static/tests/tours/website_sale_order_type_tour.esm.js

@@ -1,27 +1,25 @@
-/** @odoo-module */
 /* Copyright 2020 Tecnativa - João Marques
  * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
 
 import {registry} from "@web/core/registry";
 
 registry.category("web_tour.tours").add("website_sale_order_type_tour", {
     test: true,
-    url: "/shop",
+    url: "/shop?search=Test Product SO Type",
     steps: () => [
         {
-            trigger: ".oe_product_cart a:contains('Test Product SO Type')",
+            trigger: ".oe_product_cart a:text(Test Product SO Type)",
             run: "click",
+            expectUnloadPage: true,
         },
         {
             trigger: "#add_to_cart",
             run: "click",
         },
-        {
-            trigger: "a[href='/shop/cart']",
-        },
         {
             trigger: "sup.my_cart_quantity:contains('1')",
             run: "click",
+            expectUnloadPage: true,
         },
         {
             trigger: ".btn:contains('Checkout')",

website_sale_order_type/tests/test_website_sale_order_type.py

@@ -18,8 +18,14 @@ def setUpClass(cls):
             }
         )
         cls.partner = cls.env.ref("base.partner_admin")
+        cls.website = cls.env["website"].search(
+            [("company_id", "=", cls.env.company.id)], limit=1
+        )
         cls.sale_pricelist = cls.env["product.pricelist"].create(
-            {"name": "Test Pricelist"}
+            {
+                "name": "Test Pricelist",
+                "website_id": cls.website.id,
+            }
         )
         cls.sale_type = cls.create_sale_type()
 
@@ -62,3 +68,16 @@ def test_website_sale_order_type(self):
         self.assertEqual(created_order.type_id, self.sale_type)
         self.assertEqual(created_order.payment_term_id, self.sale_type.payment_term_id)
         self.assertEqual(created_order.pricelist_id, self.sale_type.pricelist_id)
+
+    def test_get_pricelist_available_filtered_by_sale_type(self):
+        if not self.env["res.groups"]._is_feature_enabled(
+            "product.group_product_pricelist"
+        ):
+            self.skipTest("Pricelist feature is disabled.")
+        self.partner.sale_type = self.sale_type
+        admin = self.env.ref("base.user_admin")
+        website = self.env["website"].get_current_website().with_user(admin)
+
+        pricelists = website.get_pricelist_available()
+
+        self.assertEqual(pricelists, self.sale_type.pricelist_id)