From f90cfa95995015774a52077857d59673f76088d8 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo.llopis@tecnativa.com>
Date: Thu, 15 Apr 2021 13:28:22 +0100
Subject: [PATCH 01/19] [ADD] website_sale_resource_booking: eCommerce for
 resource bookings

This module extends the functionality of ``sale_resource_booking`` to support
the eCommerce use case and to allow your visitors to buy products that produce
a resource booking, and pre-book them before buying.

You can also set a timeout for those pre-bookings to expire if unpaid.

@Tecnativa TT28202
---
 website_sale_resource_booking/README.rst      | 118 +++++
 website_sale_resource_booking/__init__.py     |   2 +
 website_sale_resource_booking/__manifest__.py |  27 ++
 .../controllers/__init__.py                   |   1 +
 .../controllers/main.py                       | 112 +++++
 .../data/ir_cron_data.xml                     |  19 +
 website_sale_resource_booking/demo/assets.xml |  14 +
 website_sale_resource_booking/i18n/es.po      | 147 ++++++
 .../i18n/website_sale_resource_booking.pot    | 129 +++++
 .../models/__init__.py                        |   4 +
 .../models/product_template.py                |  32 ++
 .../models/resource_booking.py                | 126 +++++
 .../models/sale_order.py                      |  30 ++
 .../models/sale_order_line.py                 |  54 +++
 .../readme/CONTRIBUTORS.rst                   |   2 +
 .../readme/DESCRIPTION.rst                    |   5 +
 .../readme/INSTALL.rst                        |   4 +
 .../readme/USAGE.rst                          |  20 +
 .../static/description/icon.png               | Bin 0 -> 9455 bytes
 .../static/description/index.html             | 455 ++++++++++++++++++
 .../css/website_sale_resource_booking.scss    |  15 +
 .../static/src/js/tour_checkout.js            | 244 ++++++++++
 .../templates/assets.xml                      |  13 +
 .../templates/website_sale.xml                | 107 ++++
 .../tests/__init__.py                         |   1 +
 .../tests/test_ui.py                          | 115 +++++
 .../views/product_template_view.xml           |  19 +
 27 files changed, 1815 insertions(+)
 create mode 100644 website_sale_resource_booking/README.rst
 create mode 100644 website_sale_resource_booking/__init__.py
 create mode 100644 website_sale_resource_booking/__manifest__.py
 create mode 100644 website_sale_resource_booking/controllers/__init__.py
 create mode 100644 website_sale_resource_booking/controllers/main.py
 create mode 100644 website_sale_resource_booking/data/ir_cron_data.xml
 create mode 100644 website_sale_resource_booking/demo/assets.xml
 create mode 100644 website_sale_resource_booking/i18n/es.po
 create mode 100644 website_sale_resource_booking/i18n/website_sale_resource_booking.pot
 create mode 100644 website_sale_resource_booking/models/__init__.py
 create mode 100644 website_sale_resource_booking/models/product_template.py
 create mode 100644 website_sale_resource_booking/models/resource_booking.py
 create mode 100644 website_sale_resource_booking/models/sale_order.py
 create mode 100644 website_sale_resource_booking/models/sale_order_line.py
 create mode 100644 website_sale_resource_booking/readme/CONTRIBUTORS.rst
 create mode 100644 website_sale_resource_booking/readme/DESCRIPTION.rst
 create mode 100644 website_sale_resource_booking/readme/INSTALL.rst
 create mode 100644 website_sale_resource_booking/readme/USAGE.rst
 create mode 100644 website_sale_resource_booking/static/description/icon.png
 create mode 100644 website_sale_resource_booking/static/description/index.html
 create mode 100644 website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss
 create mode 100755 website_sale_resource_booking/static/src/js/tour_checkout.js
 create mode 100644 website_sale_resource_booking/templates/assets.xml
 create mode 100644 website_sale_resource_booking/templates/website_sale.xml
 create mode 100644 website_sale_resource_booking/tests/__init__.py
 create mode 100644 website_sale_resource_booking/tests/test_ui.py
 create mode 100644 website_sale_resource_booking/views/product_template_view.xml

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
new file mode 100644
index 0000000000..e6047fe4ca
--- /dev/null
+++ b/website_sale_resource_booking/README.rst
@@ -0,0 +1,118 @@
+================================================
+Sell resource booking products in your eCommerce
+================================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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
+    :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/12.0/website_sale_resource_booking
+    :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-12-0/e-commerce-12-0-website_sale_resource_booking
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/113/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module extends the functionality of ``sale_resource_booking`` to support
+the eCommerce use case and to allow your visitors to buy products that produce
+a resource booking, and pre-book them before buying.
+
+You can also set a timeout for those pre-bookings to expire if unpaid.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+To install this module, you need these dependencies:
+
+* ``resource_booking`` from https://github.com/OCA/calendar
+* ``sale_resource_booking`` from https://github.com/OCA/sale-workflow
+
+Usage
+=====
+
+To use this module, you need to know how to use ``sale_resource_booking`` and
+``resource_booking``. This document doesn't explain the details for those
+related modules.
+
+All products that you link to a resource booking type will allow pre-bookings
+if sold from your eCommerce. To configure those pre-bookings timeout:
+
+#. Go to the product form in the backend.
+#. Use the *Resource booking timeout* field, in the *Sales* tab.
+
+When you go to that product's eCommerce page, you'll see a little message above
+the *Add to cart* button, telling the user that they will be able to pre-book it
+before buying.
+
+When you add to your cart one (or more) bookable products, you will see in the
+eCommerce checkout wizard a new step that you will have to follow to be able to
+buy. This step will display a calendar with bookable slots for you to choose.
+
+When you are redirected to payment, make sure to pay before your pre-bookings
+expire!
+
+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 smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_resource_booking%0Aversion:%2012.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/>`__:
+  * Jairo Llopis
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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.
+
+.. |maintainer-Yajo| image:: https://github.com/Yajo.png?size=40px
+    :target: https://github.com/Yajo
+    :alt: Yajo
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-Yajo| 
+
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_sale_resource_booking/__init__.py b/website_sale_resource_booking/__init__.py
new file mode 100644
index 0000000000..f7209b1710
--- /dev/null
+++ b/website_sale_resource_booking/__init__.py
@@ -0,0 +1,2 @@
+from . import models
+from . import controllers
diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
new file mode 100644
index 0000000000..f8a01da60d
--- /dev/null
+++ b/website_sale_resource_booking/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    "name": "Sell resource booking products in your eCommerce",
+    "summary": "Let customers book resources temporarily before buying",
+    "version": "12.0.1.0.0",
+    "development_status": "Production/Stable",
+    "category": "Website",
+    "website": "https://github.com/OCA/e-commerce",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "maintainers": ["Yajo"],
+    "license": "AGPL-3",
+    "external_dependencies": {
+        "python": [],
+        "bin": [],
+    },
+    "depends": ["sale_resource_booking", "website_sale"],
+    "data": [
+        "data/ir_cron_data.xml",
+        "templates/assets.xml",
+        "templates/website_sale.xml",
+        "views/product_template_view.xml",
+    ],
+    "demo": [
+        "demo/assets.xml",
+    ],
+}
diff --git a/website_sale_resource_booking/controllers/__init__.py b/website_sale_resource_booking/controllers/__init__.py
new file mode 100644
index 0000000000..12a7e529b6
--- /dev/null
+++ b/website_sale_resource_booking/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
new file mode 100644
index 0000000000..0f1beff1a1
--- /dev/null
+++ b/website_sale_resource_booking/controllers/main.py
@@ -0,0 +1,112 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from datetime import datetime
+from dateutil.parser import isoparse
+from urllib.parse import quote_plus
+
+from ...website_sale.controllers import main
+
+from odoo import _
+from odoo.http import route, request
+from odoo.tests.common import Form
+from odoo.exceptions import ValidationError
+
+
+class WebsiteSale(main.WebsiteSale):
+    def _get_bookings(self):
+        """Obtain bookings from current cart."""
+        order = request.website.sale_get_order()
+        return order.mapped("order_line.resource_booking_ids")
+
+    def _get_indexed_booking(self, index):
+        """Get indexed booking from current cart.
+
+        :param int index: 1 is the 1st element.
+        """
+        bookings = self._get_bookings().sorted("id")
+        if index > len(bookings):
+            raise IndexError()
+        return bookings[index - 1]
+
+    def checkout_redirection(self, order):
+        """Redirect to scheduling bookings if still not done."""
+        order.order_line._sync_resource_bookings()
+        bookings = order.mapped("order_line.resource_booking_ids")
+        for booking in bookings:
+            if booking.state == "pending":
+                return request.redirect("/shop/booking/1/schedule")
+        return super().checkout_redirection(order)
+
+    @route(
+        [
+            "/shop/booking/<int:index>/schedule",
+            "/shop/booking/<int:index>/schedule/<int:year>/<int:month>",
+        ],
+        type="http",
+        auth="public",
+        website=True,
+        sitemap=False,
+    )
+    def booking_schedule(self, index, year=None, month=None, error=None, **post):
+        """Schedule pending bookings."""
+        # Proceed to checkout if there are no bookings in this cart
+        bookings = self._get_bookings().with_context(checkout_booking_index=index)
+        if not bookings:
+            return request.redirect("/shop/checkout")
+        # Proceed to checkout if we passed the last booking
+        try:
+            booking = self._get_indexed_booking(index).with_context(
+                checkout_booking_index=index
+            )
+        except IndexError:
+            return request.redirect("/shop/checkout")
+        count = len(bookings)
+        values = booking._get_calendar_context(year, month)
+        values.update(
+            {
+                "booking_index": index,
+                "bookings_count": count,
+                "error": error,
+                "website_sale_order": request.website.sale_get_order(),
+                "wizard_title": _("Pre-schedule your booking (%(index)d of %(total)d)")
+                % {"index": index, "total": count},
+            }
+        )
+        return request.render("website_sale_resource_booking.scheduling", values)
+
+    @route(
+        ["/shop/booking/<int:index>/confirm"],
+        type="http",
+        auth="public",
+        website=True,
+        sitemap=False,
+    )
+    def booking_confirm(self, index, partner_name, partner_email, when, **post):
+        """Pre-reserve resource booking."""
+        booking_sudo = (
+            self._get_indexed_booking(index)
+            .sudo()
+            .with_context(
+                # Avoid calendar notifications now, SO is still draft
+                dont_notify=True,
+                no_mail_to_attendees=True,
+            )
+        )
+        when_tz_aware = isoparse(when)
+        when_naive = datetime.utcfromtimestamp(when_tz_aware.timestamp())
+        try:
+            with Form(booking_sudo) as booking_form:
+                booking_form.start = when_naive
+        except ValidationError as error:
+            url = "/shop/booking/{}/schedule?error={}".format(
+                index, quote_plus(error.name)
+            )
+            return request.redirect(url)
+        # Store partner info to autocreate and autoconfirm later
+        booking_sudo.write(
+            {
+                "prereserved_name": partner_name,
+                "prereserved_email": partner_email,
+            }
+        )
+        return request.redirect("/shop/booking/{}/schedule".format(index + 1))
diff --git a/website_sale_resource_booking/data/ir_cron_data.xml b/website_sale_resource_booking/data/ir_cron_data.xml
new file mode 100644
index 0000000000..cc967bcf6a
--- /dev/null
+++ b/website_sale_resource_booking/data/ir_cron_data.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Tecnativa - Jairo Llopis
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<data noupdate="1">
+
+    <record forcecreate="True" id="cron_expire" model="ir.cron">
+        <field name="name">Auto-cancel expired resource bookings</field>
+        <field name="model_id" ref="resource_booking.model_resource_booking"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_cancel_expired()</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="interval_number">1</field>
+        <field name="interval_type">minutes</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
+</data>
diff --git a/website_sale_resource_booking/demo/assets.xml b/website_sale_resource_booking/demo/assets.xml
new file mode 100644
index 0000000000..e0a48728ef
--- /dev/null
+++ b/website_sale_resource_booking/demo/assets.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Tecnativa - Jairo Llopis
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<data>
+
+    <template id="assets_frontend_demo" inherit_id="website.assets_frontend">
+        <xpath expr=".">
+            <script type="text/javascript"
+                    src="/website_sale_resource_booking/static/src/js/tour_checkout.js"/>
+        </xpath>
+    </template>
+
+</data>
diff --git a/website_sale_resource_booking/i18n/es.po b/website_sale_resource_booking/i18n/es.po
new file mode 100644
index 0000000000..0f0b4f90ac
--- /dev/null
+++ b/website_sale_resource_booking/i18n/es.po
@@ -0,0 +1,147 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#       * website_sale_resource_booking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-08-09 08:39+0000\n"
+"PO-Revision-Date: 2021-08-09 09:39+0100\n"
+"Last-Translator: Jairo Llopis <jairo.llopis@tecnativa.com>\n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.4.3\n"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
+msgid ""
+"<i class=\"fa fa-calendar-check-o\"/>\n"
+"                From the cart, you will be able to make a pre-reservation, "
+"which will expire"
+msgstr ""
+"<i class=\"fa fa-calendar-check-o\"/>\n"
+"                Desde el carrito, podrá realizar una prereserva, la cual "
+"expirará"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
+msgid ""
+"<i class=\"fa fa-chevron-left\"/>\n"
+"                                    <span>Return to Cart</span>"
+msgstr ""
+"<i class=\"fa fa-chevron-left\"/>\n"
+"                                    <span>Volver al carrito</span>"
+
+#. module: website_sale_resource_booking
+#: model:ir.actions.server,name:website_sale_resource_booking.cron_expire_ir_actions_server
+#: model:ir.cron,cron_name:website_sale_resource_booking.cron_expire
+#: model:ir.cron,name:website_sale_resource_booking.cron_expire
+msgid "Auto-cancel expired resource bookings"
+msgstr "Autocancelar reservas/citas de recursos expiradas"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__expiration
+msgid "Expiration"
+msgstr "Expiración"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "If unpaid, this pre-reservation will expire"
+msgstr "Si no se paga a tiempo, esta prereserva expirará"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "Name"
+msgstr "Nombre"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "Please indicate the <strong>attendee</strong> details:"
+msgstr "Por favor indique los detalles <strong>del asistente</strong>:"
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_timeout
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_timeout
+msgid "Pre-booking timeout"
+msgstr "Validez de las prereservas"
+
+#. module: website_sale_resource_booking
+#: code:addons/website_sale_resource_booking/controllers/main.py:73
+#, python-format
+msgid "Pre-schedule your booking (%(index)d of %(total)d)"
+msgstr "Agende su prereserva (%(index)d de %(total)d)"
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_email
+msgid "Prereserved Email"
+msgstr "Correo electrónico prereservado"
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_name
+msgid "Prereserved Name"
+msgstr "Nombre prereservado"
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_resource_booking
+msgid "Resource Booking"
+msgstr "Reserva de recursos"
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_expiration
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_expiration
+msgid "Resource Booking Expiration"
+msgstr "Expiración de reservas/citas de recursos"
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea de pedido de venta"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.wizard_checkout
+msgid "Schedule bookings"
+msgstr "Agendar reservas/citas"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
+msgid "True"
+msgstr "Verdadero"
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,help:website_sale_resource_booking.field_product_product__resource_booking_timeout
+#: model:ir.model.fields,help:website_sale_resource_booking.field_product_template__resource_booking_timeout
+msgid ""
+"When resources are pre-booked, the booking will expire after this timeout if "
+"the quotation is not confirmed in time."
+msgstr ""
+"Cuando los recursos se prereservan, las reservas/citas expirarán tras este "
+"periodo de validez si el presupuesto no se confirma a tiempo."
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,help:website_sale_resource_booking.field_resource_booking__expiration
+msgid ""
+"When will this booking expire if its related quotation is not confirmed in "
+"time?"
+msgstr ""
+"¿Cuándo expirará esta reserva/cita, si su presupuesto vinculado no se "
+"confirma a tiempo?"
diff --git a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
new file mode 100644
index 0000000000..9243213776
--- /dev/null
+++ b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
@@ -0,0 +1,129 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#       * website_sale_resource_booking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-08-09 08:39+0000\n"
+"PO-Revision-Date: 2021-08-09 08:39+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
+msgid "<i class=\"fa fa-calendar-check-o\"/>\n"
+"                From the cart, you will be able to make a pre-reservation, which will expire"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
+msgid "<i class=\"fa fa-chevron-left\"/>\n"
+"                                    <span>Return to Cart</span>"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.actions.server,name:website_sale_resource_booking.cron_expire_ir_actions_server
+#: model:ir.cron,cron_name:website_sale_resource_booking.cron_expire
+#: model:ir.cron,name:website_sale_resource_booking.cron_expire
+msgid "Auto-cancel expired resource bookings"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "E-mail"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__expiration
+msgid "Expiration"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "If unpaid, this pre-reservation will expire"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "Name"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "Please indicate the <strong>attendee</strong> details:"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_timeout
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_timeout
+msgid "Pre-booking timeout"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: code:addons/website_sale_resource_booking/controllers/main.py:73
+#, python-format
+msgid "Pre-schedule your booking (%(index)d of %(total)d)"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_email
+msgid "Prereserved Email"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_name
+msgid "Prereserved Name"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_resource_booking
+msgid "Resource Booking"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_expiration
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_expiration
+msgid "Resource Booking Expiration"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order
+msgid "Sale Order"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.wizard_checkout
+msgid "Schedule bookings"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
+msgid "True"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,help:website_sale_resource_booking.field_product_product__resource_booking_timeout
+#: model:ir.model.fields,help:website_sale_resource_booking.field_product_template__resource_booking_timeout
+msgid "When resources are pre-booked, the booking will expire after this timeout if the quotation is not confirmed in time."
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,help:website_sale_resource_booking.field_resource_booking__expiration
+msgid "When will this booking expire if its related quotation is not confirmed in time?"
+msgstr ""
diff --git a/website_sale_resource_booking/models/__init__.py b/website_sale_resource_booking/models/__init__.py
new file mode 100644
index 0000000000..b6534f8077
--- /dev/null
+++ b/website_sale_resource_booking/models/__init__.py
@@ -0,0 +1,4 @@
+from . import product_template
+from . import resource_booking
+from . import sale_order
+from . import sale_order_line
diff --git a/website_sale_resource_booking/models/product_template.py b/website_sale_resource_booking/models/product_template.py
new file mode 100644
index 0000000000..14dd124188
--- /dev/null
+++ b/website_sale_resource_booking/models/product_template.py
@@ -0,0 +1,32 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import timedelta
+
+from odoo import fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    resource_booking_timeout = fields.Float(
+        "Pre-booking timeout",
+        default=1,
+        help=(
+            "When resources are pre-booked, the booking will expire after "
+            "this timeout if the quotation is not confirmed in time."
+        ),
+    )
+    resource_booking_expiration = fields.Datetime(
+        compute="_compute_resource_booking_expiration"
+    )
+
+    def _compute_resource_booking_expiration(self):
+        """When would the booking expire if placed right now."""
+        now = fields.Datetime.now()
+        for one in self:
+            if not one.resource_booking_type_id:
+                continue
+            one.resource_booking_expiration = now + timedelta(
+                hours=one.resource_booking_timeout or 0
+            )
diff --git a/website_sale_resource_booking/models/resource_booking.py b/website_sale_resource_booking/models/resource_booking.py
new file mode 100644
index 0000000000..d585e033bb
--- /dev/null
+++ b/website_sale_resource_booking/models/resource_booking.py
@@ -0,0 +1,126 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+from odoo.tests.common import Form
+
+
+class ResourceBooking(models.Model):
+    _inherit = "resource.booking"
+
+    expiration = fields.Datetime(
+        help=(
+            "When will this booking expire if its related quotation is "
+            "not confirmed in time?"
+        )
+    )
+
+    # Temporary fields to avoid overloading database with res.partner records
+    # for abandoned eCommerce carts
+    prereserved_name = fields.Char()
+    prereserved_email = fields.Char()
+
+    def _compute_access_url(self):
+        result = super()._compute_access_url()
+        index = self.env.context.get("checkout_booking_index")
+        if index and len(self) == 1:
+            self.access_url = "/shop/booking/%d" % index
+        return result
+
+    def _update_expiration(self):
+        """Update booking expiration."""
+        # Only update if booking is altered from the website
+        if not self.env.context.get("website_id"):
+            return
+        now = fields.Datetime.now()
+        for one in self:
+            # Only affects bookings related to sales
+            if not one.sale_order_line_id:
+                continue
+            delta = timedelta(
+                hours=one.sale_order_line_id.product_id.resource_booking_timeout
+            )
+            one.expiration = now + delta
+
+    def _confirm_prereservation(self):
+        """Convert prereservation data to actual partners, and confirm booking."""
+        affected = self.with_context(dont_notify=True).filtered(
+            lambda booking: booking.prereserved_name and booking.prereserved_email
+        )
+        for booking in affected:
+            booking.partner_id = (
+                self.env["res.partner"]
+                .with_context(force_email=True)
+                .find_or_create(
+                    "{} <{}>".format(
+                        booking.prereserved_name, booking.prereserved_email
+                    )
+                )
+            )
+            if booking.meeting_id:
+                booking.meeting_id.name = booking._get_name_formatted(
+                    booking.partner_id, booking.type_id
+                )
+        affected.write(
+            {
+                # Partners are already created, so this data is irrelevant now
+                "prereserved_name": False,
+                "prereserved_email": False,
+                # Anti-smartypants safety belt: rotate security token now
+                "access_token": False,
+            }
+        )
+        # You're confirming some eCommerce sale, so confirm bookings directly
+        affected.action_confirm()
+        # Notify them
+        for booking in affected:
+            share_f = Form(
+                self.env["portal.share"].with_context(
+                    active_id=booking.id,
+                    active_ids=booking.ids,
+                    active_model=booking._name,
+                    default_note=booking.requester_advice,
+                    default_partner_ids=[(4, booking.partner_id.id, 0)],
+                )
+            )
+            share = share_f.save()
+            # Put invitations in mail queue
+            share.with_context(
+                mail_notify_force_send=False, mail_create_nosubscribe=True
+            ).action_send_mail()
+
+    @api.model
+    def _cron_cancel_expired(self, domain=None):
+        """Autocancel expired bookings."""
+        domain = domain or []
+        expired = self.with_context(no_mail_to_attendees=True).search(
+            [
+                ("expiration", "<", fields.Datetime.now()),
+                ("state", "in", ("pending", "scheduled")),
+            ]
+            + domain
+        )
+        expired.action_cancel()
+        # Cleaning personal data that you will never need again
+        expired.write({"prereserved_name": False, "prereserved_email": False})
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        """Autosave default expiration date."""
+        to_update_indexes = []
+        for index, vals in enumerate(vals_list):
+            if vals.get("start") and not vals.get("expiration"):
+                to_update_indexes.append(index)
+        result = super().create(vals_list)
+        to_update_records = self.browse(prefetch=self._prefetch)
+        for index in to_update_indexes:
+            to_update_records |= result[index]
+        to_update_records._update_expiration()
+        return result
+
+    def write(self, vals):
+        """Autoupdate expiration date."""
+        result = super().write(vals)
+        if vals.get("start") and not vals.get("expiration"):
+            self._update_expiration()
+        return result
diff --git a/website_sale_resource_booking/models/sale_order.py b/website_sale_resource_booking/models/sale_order.py
new file mode 100644
index 0000000000..f6f93aa072
--- /dev/null
+++ b/website_sale_resource_booking/models/sale_order.py
@@ -0,0 +1,30 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+
+    @api.onchange("partner_id")
+    def onchange_partner_id(self):
+        """Update bookings partner when user creates account in checkout wizard."""
+        result = super().onchange_partner_id()
+        # Avoid sending calendar invites if user is in eCommerce checkout
+        _self = self.with_context(dont_notify=True)
+        for order in _self:
+            # We only care about eCommerce orders
+            if not order.website_id:
+                continue
+            for booking in order.resource_booking_ids:
+                website_partner = order.website_id.partner_id
+                if booking.partner_id != website_partner:
+                    continue
+                # Update partner if it was the public user (which is usually inactive)
+                if booking.meeting_id:
+                    booking.meeting_id.with_context(
+                        active_test=False
+                    ).partner_ids -= website_partner
+                booking.partner_id = order.partner_id
+        return result
diff --git a/website_sale_resource_booking/models/sale_order_line.py b/website_sale_resource_booking/models/sale_order_line.py
new file mode 100644
index 0000000000..17a5ff3f39
--- /dev/null
+++ b/website_sale_resource_booking/models/sale_order_line.py
@@ -0,0 +1,54 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    def _sync_resource_bookings(self):
+        """On eCommerce, a draft SO produces pending/scheduled bookings."""
+        result = super()._sync_resource_bookings()
+        # Do not alter backend behavior
+        for line in self.with_context(active_test=False):
+            order = line.order_id
+            # We only care about eCommerce orders
+            if not order.website_id:
+                continue
+            bookings = line.resource_booking_ids
+            # If paid, create missing partners
+            if order.state == "sale":
+                bookings._confirm_prereservation()
+                continue
+            # If it is still a cart, create pending bookings
+            if order.state != "draft":
+                continue
+            values = {
+                "sale_order_line_id": line.id,
+                "type_id": line.product_id.resource_booking_type_id.id,
+            }
+            context = {
+                "default_partner_id": line.order_id.partner_id.id,
+                "default_combination_id":
+                    line.product_id
+                    .resource_booking_type_combination_rel_id.combination_id.id,
+            }
+            # Assign prereservation data if user is logged in
+            prereserved_partner = order.partner_id - order.website_id.user_id.partner_id
+            if prereserved_partner:
+                context.update(
+                    {
+                        "default_prereserved_name": prereserved_partner.name,
+                        "default_prereserved_email": prereserved_partner.email,
+                    }
+                )
+            # Add/remove bookings if needed
+            self.env["resource.booking"]._cron_cancel_expired(
+                [("id", "in", bookings.ids)]
+            )
+            expected_amount = int(line.product_uom_qty) if values["type_id"] else 0
+            self.with_context(**context)._add_or_cancel_bookings(
+                bookings, expected_amount, values
+            )
+        return result
diff --git a/website_sale_resource_booking/readme/CONTRIBUTORS.rst b/website_sale_resource_booking/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..7d706c5de1
--- /dev/null
+++ b/website_sale_resource_booking/readme/CONTRIBUTORS.rst
@@ -0,0 +1,2 @@
+* `Tecnativa <https://www.tecnativa.com/>`__:
+  * Jairo Llopis
diff --git a/website_sale_resource_booking/readme/DESCRIPTION.rst b/website_sale_resource_booking/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..3329132690
--- /dev/null
+++ b/website_sale_resource_booking/readme/DESCRIPTION.rst
@@ -0,0 +1,5 @@
+This module extends the functionality of ``sale_resource_booking`` to support
+the eCommerce use case and to allow your visitors to buy products that produce
+a resource booking, and pre-book them before buying.
+
+You can also set a timeout for those pre-bookings to expire if unpaid.
diff --git a/website_sale_resource_booking/readme/INSTALL.rst b/website_sale_resource_booking/readme/INSTALL.rst
new file mode 100644
index 0000000000..575f995846
--- /dev/null
+++ b/website_sale_resource_booking/readme/INSTALL.rst
@@ -0,0 +1,4 @@
+To install this module, you need these dependencies:
+
+* ``resource_booking`` from https://github.com/OCA/calendar
+* ``sale_resource_booking`` from https://github.com/OCA/sale-workflow
diff --git a/website_sale_resource_booking/readme/USAGE.rst b/website_sale_resource_booking/readme/USAGE.rst
new file mode 100644
index 0000000000..e544f94b13
--- /dev/null
+++ b/website_sale_resource_booking/readme/USAGE.rst
@@ -0,0 +1,20 @@
+To use this module, you need to know how to use ``sale_resource_booking`` and
+``resource_booking``. This document doesn't explain the details for those
+related modules.
+
+All products that you link to a resource booking type will allow pre-bookings
+if sold from your eCommerce. To configure those pre-bookings timeout:
+
+#. Go to the product form in the backend.
+#. Use the *Resource booking timeout* field, in the *Sales* tab.
+
+When you go to that product's eCommerce page, you'll see a little message above
+the *Add to cart* button, telling the user that they will be able to pre-book it
+before buying.
+
+When you add to your cart one (or more) bookable products, you will see in the
+eCommerce checkout wizard a new step that you will have to follow to be able to
+buy. This step will display a calendar with bookable slots for you to choose.
+
+When you are redirected to payment, make sure to pay before your pre-bookings
+expire!
diff --git a/website_sale_resource_booking/static/description/icon.png b/website_sale_resource_booking/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}<C%<R2Kc9faym6aW`f0Dh5$js*d
z_}}Z!;XIG;_cPz`_vag-p{7Ve$Uq1H00~A(?iu(VaQlMefnU3&OozZXm@69d91cGG
z;O61r&je0NdamH#&)mKsXk?Zb_)B^>d0jUxM@u(PQx^-s)6<jB#=*|j%+$$(&(Xyy
zYgd8+09XKwoa}S2?48%%ZU#L~n^g{fE40h%YEx5by;GuJ(K|vI1uO;0m}=J7R4@Bs
z>97TX<v{QF=s?r`z`m$a0ZvrhBU7}{15RN9M`j!kv_Mp+3~{||YNuFzHNvhMYm3=Q
zo!q+OJ5(%-oNM^I^M%*luKMiVL`lo`bcKGymX7i3MIFWj1i|9+CGNvn`cu-RsK0Qh
zoYlwB>`ehR4?GS^qbkof1cslKgk<Uw6DeIxZyT_?=OwX|lwC*A?ac*gHF7jmS080$
z>U)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~!
zVpnB`o+K7|Al`Q_U<UrcmRnh6jExs}l(hZs0%T~Dnpu-NENdhioRv(T{Qmv>;eD$B
zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA
z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__
zc+blN2UAB0=617@>_<D4$IPL<k1zq(*VmlDPer&h1n6`AG;9A!_W=N$JthhQWXZ<i
zGURc6f<i*joK3xSWaOOXxAc8ES>u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_
zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I
z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz<Z(Qt1jC2cC|
z6WbMo9YgON{L#ZDl$sV4*<CP(>{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U
z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)(
z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH
zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW
z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx
zOGVPhVRTGPtv0o}RfVP;Nd(|CB)<HrC1(%ZOEd8PI?r9b_$Cp-${bh59Z_R7n&YCp
zl8lfMpes*8{FVm;oJH@0LLoWmxD59u?JwHz2iRrAaE0`Hc&g;t5~$P*kdeOZn9OJ3
zRczo@ZkWU)RG+hcfH~{49Vvb3D(W0wRX#|$cA0Iqy^VR~(4hqA2AFI-rK!FM!#fJ_
zGFI@iqJOPXZ!=VjTS3dMuu~9xU3K1&?th;$)cqM#WGxbDEyB$y`#9j%>I;*t&QO8h
zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9
zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz#
z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7t<dboft~zeDZwK=+l2bFWs5^+|r{J6GO9Cwl
z&SW58BRs?XdFLuhtzl7WLbQ#~z#`jAB3AbSUg6jW6@qVd2Q~9qN(izT1y*>F#6nHA
zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K=
z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS
zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C
zuVl&0duN<;uOsB3%T9Fp8t{ED108<?)`y_~Hnd9AUX7h-H?jVuU|}My+C=TjH(jKz
zqMVr0re3S$H@t{zI95qa)+Crz*5Zj}Ao%4Z><+W(nOZd?gDnfNBC3>M8WE61$So|P
zVvqH0SNtDTcs<xiU1;=a39$d&&l5EwoIH1db#`S9Kw!YC1jhR)VbCWMptlUUkpfif
zMzi-i8)WL?|C$*Q?iqbS{w<lA9XN(rD)VS<zn>UdzaMDpT=Ty0pDHHNL@Z0w$Y`XO
z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1
zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_
zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8
zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ>
zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}a<Xwa$pLotZk<
zsykXwQO37I=aXew7x=}YWiW)^p)|C#g+)an!@j?EcY8C0t)BlK#y{YLtkJ6=D6H-5
zp2*ANf@>RBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN
z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=<bK!vY7J*RP!&i_xU}i*o6o
z?xN*1<rEe1L2HBkCSgiYM3a|4w?Bo7CJL7?Eh;9An1m$1t?h1v92<Xg2(#)bjbL|o
zH_H0}!Og=1dOBynXHu>@hbCRcfT5ji<pmK_U*~T(A$I-*rM$8-BCv{=@=7F)2pdtU
z5==tp!}A*&Xgf{F>gwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h
zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&<KAVm#0W>BE*}XfU|H&(FssBqY=hPCt`d
zH?@s2>I(|;fcW&YM6#V<T#ysvE$@4oRO>#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB
zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz
z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I
zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R<sv-KjYb}UVFjITQ)VAEWu*)Lz7*-f^A*H
z<25#Ynt~-Qh?$wWx4$1=T2`j@bKp!)3IXh(LC@)%WGW$+j(tGz(6#bGw&K0j=Np@B
zt}@t$R`z(>?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X
zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD
z<sX7(ZJc+Q;#xP8uk`jnF@a^|TWw*55if6@@}%7lOBaGo9Ia-e?`RPQc^w^EWfhe}
zHWHTvDA+r}Xf5Yqpr;QU-88%QC9F_>#z-)AXwSRY?<M%E84!g*1GC?E>OPefw^iI+
z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd
z$<h)Fm>6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs
z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I
z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$
z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV<GYik+VfZene%bm(n6
z`r@rc^TVw7EN{|O7rORMlw)zt(Z#enc3joE#IIk!M)L8gk^go9E9AxiP9o#OqmvV>
z@;rlc*NRK7i3y5BETSKuumEN`Xu_8<BQ)z0!-JuC8x}?$qo8SEko}oUWNI(4h*VHO
zAi!Egy!f(o9aHs2dhSE6ki(be*&w&+WLOB<(b3T_Hide(NvVvLQV{BN|2?UJFaY*@
z9CXA5B_*8i5Bf6sn~d`R>GP1Ri=OK<SGIb#BCTo3qI#UBUg+dkR+2ilUwIg%XFV;l
z+>Q$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s
zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6
zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5<g6yi=XozU}zReXL{rA%c`$IQAs<ObZ
zep*ITZ0C(~W*`?XH^l1t7&+qigAfY9tVJ5DH!~jY>#ZRj8kg}dS7_V&^%#Do==#`u
zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK<aUZ^OhBu;1e6t#{
zxKehVgz`HT;A`FMivG<tq0OcrXwHUX_<$j<uk%m>#HN`!1vBJHnC+RM&yIh8{gG2q
zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH
zVWo*OwYElb#uyW{Imam6f2<eMTQj#)z8+N&ZY?tSPo%&2eVNU=4=?rlO<*9Twaxco
zEVE=Jh?_x>rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c
zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT
zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+
z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ
zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy
zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC)
zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#B<pkvWZft^C&
z;+zNo+VJNluxaDF!`gW+F0=MxsCQ~~#CYKa;ULfj5hTa8a6;d*(<eeQ7-ZQgz2et^
zf|7URfj;x*#HiF0wuBCOTEpbeD&kkENqolCm2#cQGHCeEC<&I3j+P6?sX?BPp4~46
zx-S~EJ>oo{AH8n$<d4loB?vL3RqXwK_COrQ6xRoWGOdFnWy(hhzrG8k;2k}8Zj&>a
zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x!
zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X
zZ3WYJtHp_ri(}SQAPjv+Y+0=<GD??Na(2AG`s>fH4krOP@S&=zZ-t1jW1o@}z;xk8
z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A
z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H
zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n=
z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~N<X{IYiJ3k=4u-u*nJEBnJ<OdI8P
zXmK`OYkO5a{YDhI3PL|H4m=p>Bvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK
z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z
zzCR$P#uktu+#!w)cX!<osOkId_HzAT-HD2N`M+v2l+zwdW%GgZbQMuhfE*hHjKXKg
z45hphqVETPDbX6wpTlZqza0gFaRGh`3L~0id)F6#%@9;w(e%PjzuD7@inuToA!B?F
zCMLJc!u{3N)s?lB-!11!GxXsCak8zQomO)gmn02f-5~OkMYnm~#jVwwYNw@LAv!KN
z-n`q1|AXw*TW>lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h
z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD
z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW
zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@
zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz
z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y<
zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X
zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6
zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V<h953|jk-C&|3)z%
ze&_30-6q1)a0(!xXqA+_t(WC`HA_yYaW@>`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6%
z2(}&uGRF;p9<Q%jdNy1%e7XTzyu7EEQT(5LrnvX~T%K!IuDyHY`ZneVJu#k_1T)xA
z*yxB?y4!pOJ$DTZzBm|8OIQq+AtV25aJ+X5EJjAu><tfuiNClI2BSoMgqLnU-5t95
zEnZ(^g~1RgD=UMB({c;$HujG&%DqGF;5jI~roRT+(rOoS$6f6SsURIuAVkAeIVc~{
z5ZxLN%m%Z*Sg;qYCf3<$dE6~&w_!EBx%yl4YC~LH{FCFNRBc_I>2eS*sE*o<YSPrx
z{M(reV{~jKue#Y6ZOnqJia{fQc!UxV4m)l389OmzR6A3|2!i<P{r82jKw+zq4%@ny
znopi6g!1Vx9Bml#a~KdL2lp2C)qSTKIh43vgycQHfQb_I!kQY&p;X@Bz|{^SXsW1K
zP&Ag1CW_r6u5-4=s(W>R$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(|
z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4<V=<
zfr<*%iOB1EY}w3tF2Cwl7a2OS&~Y-lu<s)T^9=OFU8(CeN|63BiMxf*)5gesGU<eZ
z9DigzL3+quZ1o2T<KAZbCGJx&lrl*e#}Dpv24bZO$B<Yoc5hbeP0y?@P%|Tvw||e%
zV#e^q0D2R_Oq_c+=x5vP&hg4k+df{o7$aNZCM>PdpwWDop%^}n;dD#K4s#DYA8SHZ
z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H
zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^W<wsNa}nUDpNk$q{>Yu2u5kubqmwp%drJ6
z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d}
z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A
zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&<F<Z7l=VnwB^RA&^APMi=Tn
zNc}%IJL~xB4OP6bJNwAw)~Ma2=UP0dhr%X=kco(it+@F<#$xrIJ8@|{Buh<)h`xg?
z_U}pe=3#zmDfdqE4`Hyn<!?&CfCp#GTeXo8;AYd1Opd&cXER8cBSOF3iFJ#XPgQVp
zZSiQf7V^Dt?ITs8aMF~e1hq0P@^oB)#byh|6q_7F1B%ST%WL~J?ySn>YOi-3|1QKB
z<?_cUy)V3go%%^l)lRa=dmY_XQG3Z{Q?52d$qG}vIe|EZbYEtrR$rh(iS)O#dU-(>
z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp
zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#<i<Zx(`=7k~{%`w&<EbG}U<
z0%E^8lyw>s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@<TSeYlROCt(gU?O((-qu
zs>QS0TEL_?njX|<LXnSC4TlId(D4W|GQ?L@$3Ue@N8p=l9-sC<=z(lPk;^sT(v2*k
zc~vp#Hp`mXjzhml2NMCh^h5)sqsan+jJ_l<a4w|G&ac02hrz8#6|kFraA~rta0}!q
zB4BE{QWY7MtxHn_xB);Avf#Lf<GG<A?Q3JVyc1p8^H}$8(Gn=_&F1!m8$sKyeue+L
z5&392wm+wO;_oXoTEJ=wxVXk}dt<d~CgUUMW_PPTe(c<7n18#mVaX)vK}-PzZq7<b
zNJbVTFaq(8ZLx|A*G$H3ugT2aVziDEGa66FVt@hr1|D{RWN6yuqlglM!rp^YG;UpG
zrnm?ek079l3VoOU^p%f^A9Yzn8IVX?^rB4LbgJ|PONhzM_0{P?S(V$OI=u5IBjfT#
z0ntLLnhg5$0fAHJaG6HCx4X7;RmvMtE}8C>@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6#
z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f#
zuT7fv<Q3o5LspCx-RPkzLw{VsDE>jSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC
zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv!
zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8<JV*@W33SMHM;w!OmUXar{O;_8j>ul%rG
z-<zwGD)!Y{+(T{%ob~79zpXX%zulyiy1_UHWvu@YqxKAK3e9GO6Os4R0Naujn>wfS
zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9
z^zP;K#|)$`^Rb{rnH<AdQ^(;gQMcF>GH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE#
z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz
zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8<!P
zAOHj?oPbjQ%hh|vE_1IMB)43eQpeLi&)R>etW=xJvni)8eHi`H$%#zn^WJ<U7gogJ
z?A^!2J~rI78JH|Ml2EldmKY5K8;Zx(FGcBdM<5oe#G+nd6dObqz@Af%%M*aBE_pn8
zXQo2`Bw*IwvP3#1Ev<%YocpBodO9+Rw~`5*CY3{L;qf1PxV!r%NI+#Q1f8GU7$~#U
zAA9$4&g-k=8BYi*3i@0^UX}nTQVyOf)8T(}G^Ti?Vqvk~bJRR#EAQ?u`dClPxk@{;
zxvO?%jSX`2{8|^z0*C5DR1Z^>5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t
z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN
zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01F<S%GT3P{Ck&Y*^gWuie`o_g+ZNDNIV|F
z)zEe|Ij*4$H1(<RLz0($;AD3VsUJwI@liw^?fh(V?VC`Sz7h`*Q<VYlhbHJ?&h+!W
zAJC)U;Lx_QRaSNFYbyi|7+MeNTgA+Znh}qFzf>mx5XbRo6+n|pP(&nodMoap^z{~q
ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k
zQ<WB5+u#`K#~J$81)#?BuTOKLk|+S>^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG
z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff
z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1
zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO
zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}2<F#{*|k0E{$&_`~)
zkzDcsi#!7r<a8lPUCMj?{CK;e|9#-xj>6NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$
zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV(<Rzgqw(Ze!7hEGKKx((>
z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb
zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4
z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_N<mojSrG!`
zgkqx4t<XLL6ZUppvjeV9PJ6dG>hT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{
zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*<bTMtKO;_Z)R
zRSOJrd5TFO0aO%#%-sNa{`SiQ^$$1^@oUd&^lB{MKZ>vIg?@fVFSmMpaw0qtTRbx}
z({Pg?#{2`sc9)M5N$*N|4;^t$+Q<Wh^yJ?FzJ*$wiB{j;CMy+?m1MbsJo0ubR==f9
z>P?#mo<zt1E6=Ilm*nbmYmpxfAj7*m*Wh@=7|;!%(-pviW`nuCktLveet9^$*y^>v
zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22
zc2Ix|App^>v6(3L_MCU0d3W##AB<Fxl*nmny6_RsCu%1a)so}}uCXSzwY70Y@uTxK
z=5nu(N*2HDbrIcL)t_*{*84mvmV_Y9<vxHJJ;0gUdNjyW)jDb|@|j*qR8;gsMa5Ir
z02fHv=%xyN9VLv_ZLL4y|F*p$S^^T47m{aok5{rmM{$s7^Xu2!_fo1$IG6kkG_Tgx
zFfjPm3;g>0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq
zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t<
z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k
z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp
z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{}
zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I

literal 0
HcmV?d00001

diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
new file mode 100644
index 0000000000..1178d946dd
--- /dev/null
+++ b/website_sale_resource_booking/static/description/index.html
@@ -0,0 +1,455 @@
+<?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>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<title>Sell resource booking products in your eCommerce</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* 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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="sell-resource-booking-products-in-your-ecommerce">
+<h1 class="title">Sell resource booking products in your eCommerce</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
+the eCommerce use case and to allow your visitors to buy products that produce
+a resource booking, and pre-book them before buying.</p>
+<p>You can also set a timeout for those pre-bookings to expire if unpaid.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="installation">
+<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<p>To install this module, you need these dependencies:</p>
+<ul class="simple">
+<li><tt class="docutils literal">resource_booking</tt> from <a class="reference external" href="https://github.com/OCA/calendar">https://github.com/OCA/calendar</a></li>
+<li><tt class="docutils literal">sale_resource_booking</tt> from <a class="reference external" href="https://github.com/OCA/sale-workflow">https://github.com/OCA/sale-workflow</a></li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<p>To use this module, you need to know how to use <tt class="docutils literal">sale_resource_booking</tt> and
+<tt class="docutils literal">resource_booking</tt>. This document doesn’t explain the details for those
+related modules.</p>
+<p>All products that you link to a resource booking type will allow pre-bookings
+if sold from your eCommerce. To configure those pre-bookings timeout:</p>
+<ol class="arabic simple">
+<li>Go to the product form in the backend.</li>
+<li>Use the <em>Resource booking timeout</em> field, in the <em>Sales</em> tab.</li>
+</ol>
+<p>When you go to that product’s eCommerce page, you’ll see a little message above
+the <em>Add to cart</em> button, telling the user that they will be able to pre-book it
+before buying.</p>
+<p>When you add to your cart one (or more) bookable products, you will see in the
+eCommerce checkout wizard a new step that you will have to follow to be able to
+buy. This step will display a calendar with bookable slots for you to choose.</p>
+<p>When you are redirected to payment, make sure to pay before your pre-bookings
+expire!</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id3">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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_resource_booking%0Aversion:%2012.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="#id4">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<ul class="simple">
+<li>Tecnativa</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.tecnativa.com/">Tecnativa</a>:
+* Jairo Llopis</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id7">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>
+<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" href="https://github.com/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking">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>
+</body>
+</html>
diff --git a/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss b/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss
new file mode 100644
index 0000000000..01511396d1
--- /dev/null
+++ b/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss
@@ -0,0 +1,15 @@
+/* Copyright 2021 Tecnativa - Jairo Llopis
+ * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
+
+.o_wizard_has_bookings + .progress-wizard {
+    .progress-wizard-step {
+        @include media-breakpoint-up(md) {
+            // 4 steps to buy
+            width: percentage(1/4);
+
+            .o_wizard_has_extra_step + & {
+                width: percentage(1/5);
+            }
+        }
+    }
+}
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.js b/website_sale_resource_booking/static/src/js/tour_checkout.js
new file mode 100755
index 0000000000..59638ac6af
--- /dev/null
+++ b/website_sale_resource_booking/static/src/js/tour_checkout.js
@@ -0,0 +1,244 @@
+/* Copyright 2021 Tecnativa - Jairo Llopis
+ * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
+
+odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
+    "use strict";
+
+    var tour = require("web_tour.tour");
+    var base = require("web_editor.base");
+
+    tour.register(
+        "website_sale_resource_booking_checkout",
+        {
+            url: "/shop?search=test not bookable product",
+            test: true,
+            wait_for: base.ready(),
+        },
+        [
+            // Add non-bookable product, to make sure we don't interfere
+            {
+                trigger: ".oe_product_cart a:contains('test not bookable product')",
+            },
+            {
+                trigger: "#add_to_cart",
+            },
+            {
+                trigger: ".btn:contains('Continue Shopping')",
+            },
+            {
+                trigger: ".oe_search_box",
+                run: "text test bookable product",
+            },
+            {
+                trigger: ".oe_search_button",
+            },
+            // Select bookable product
+            {
+                trigger: ".oe_product_cart a:contains('test bookable product')",
+            },
+            {
+                // Make sure it displays the booking message
+                extra_trigger:
+                    ".alert-info:containsTextLike('From the cart, you will be able to make a pre-reservation, which will expire in 1 hour')",
+                // Add one more
+                trigger: ".css_quantity .fa-plus",
+            },
+            // When there's 2 products, add another one
+            {
+                extra_trigger: ".css_quantity .quantity:propValue('2')",
+                trigger: ".css_quantity .fa-plus",
+            },
+            // When there's 3 products, add to cart
+            {
+                extra_trigger: ".css_quantity .quantity:propValue('3')",
+                trigger: "#add_to_cart",
+            },
+            {
+                // Check there's a booking step advertised in the checkout wizard
+                extra_trigger:
+                    ".progress-wizard-step.disabled:contains('Schedule bookings')",
+                // Go to next step
+                trigger: ".oe_cart .btn:contains('Process Checkout')",
+            },
+            // Booking 1 of 3
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    // Check we're in the correct booking step
+                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
+                    ":has(h3:contains('Pre-schedule your booking (1 of 3)'))",
+                    // We're using freezegun, so date is hardcoded
+                    ":has(.o_booking_calendar:contains('February 2021'))",
+                ].join(""),
+                // No free slots on February, go to March as suggested
+                trigger:
+                    ".alert-danger:contains('No free slots found this month.') a:contains('Try next month')",
+            },
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    // Check we're in the correct booking step
+                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
+                    ":has(h3:contains('Pre-schedule your booking (1 of 3)'))",
+                    ":has(.o_booking_calendar:contains('March 2021'))",
+                ].join(""),
+                // Open dropdown for March 1st
+                trigger: "#dropdown-trigger-2021-03-01",
+            },
+            // Select 09:00
+            {
+                trigger:
+                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:00')",
+            },
+            // Enter Mr. A details, and confirm
+            {
+                trigger: ".modal-dialog input[name=partner_name]",
+                run: "text Mr. A",
+            },
+            {
+                trigger: ".modal-dialog input[name=partner_email]",
+                run: "text mr.a@example.com",
+            },
+            {
+                // Check we have an alert about payment timeout
+                extra_trigger:
+                    ".alert-warning:containsTextLike('If unpaid, this pre-reservation will expire in 1 hour')",
+                trigger: ".modal-dialog .btn:contains('Confirm booking')",
+            },
+            // Booking 2 of 3 (almost same as above)
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
+                    ":has(h3:contains('Pre-schedule your booking (2 of 3)'))",
+                    ":has(.o_booking_calendar:contains('February 2021'))",
+                ].join(""),
+                trigger:
+                    ".alert-danger:contains('No free slots found this month.') a:contains('Try next month')",
+            },
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
+                    ":has(h3:contains('Pre-schedule your booking (2 of 3)'))",
+                    ":has(.o_booking_calendar:contains('March 2021'))",
+                ].join(""),
+                trigger: "#dropdown-trigger-2021-03-01",
+            },
+            {
+                trigger:
+                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:00')",
+            },
+            // Enter Mr. B details, and confirm
+            {
+                trigger: ".modal-dialog input[name=partner_name]",
+                run: "text Mr. B",
+            },
+            {
+                trigger: ".modal-dialog input[name=partner_email]",
+                run: "text mr.b@example.com",
+            },
+            {
+                extra_trigger:
+                    ".alert-warning:containsTextLike('If unpaid, this pre-reservation will expire in 1 hour')",
+                trigger: ".modal-dialog .btn:contains('Confirm booking')",
+            },
+            // Booking 3 of 3
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
+                    ":has(h3:contains('Pre-schedule your booking (3 of 3)'))",
+                    ":has(.o_booking_calendar:contains('February 2021'))",
+                ].join(""),
+                trigger:
+                    ".alert-danger:contains('No free slots found this month.') a:contains('Try next month')",
+            },
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
+                    ":has(h3:contains('Pre-schedule your booking (3 of 3)'))",
+                    ":has(.o_booking_calendar:contains('March 2021'))",
+                    ":has(tfoot:containsTextLike('All times are displayed using this timezone: UTC'))",
+                ].join(""),
+                trigger: "#dropdown-trigger-2021-03-01",
+            },
+            {
+                // This time 09:00 is full because RBT has only 2 RBC available, and thus we can't see it
+                extra_trigger:
+                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu:not(:has(button:contains('09:00')))",
+                trigger:
+                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:30')",
+            },
+            // Enter Mr. C details, and confirm
+            {
+                trigger: ".modal-dialog input[name=partner_name]",
+                run: "text Mr. C",
+            },
+            {
+                trigger: ".modal-dialog input[name=partner_email]",
+                run: "text mr.c@example.com",
+            },
+            {
+                extra_trigger:
+                    ".alert-warning:containsTextLike('If unpaid, this pre-reservation will expire in 1 hour')",
+                trigger: ".modal-dialog .btn:contains('Confirm booking')",
+            },
+            // Fill buyer address
+            {
+                extra_trigger: [
+                    ".oe_website_sale",
+                    ":has(.progress-wizard-step.complete:contains('Schedule bookings'))",
+                    ":has(.progress-wizard-step.active:contains('Address'))",
+                ].join(""),
+                trigger: ".oe_website_sale input[name=name]",
+                run: "text Mr. A",
+            },
+            {
+                trigger: ".oe_website_sale input[name=email]",
+                run: "text mr.a@example.com",
+            },
+            {
+                trigger: ".oe_website_sale input[name=phone]",
+                run: "text +32 485 118.218",
+            },
+            {
+                trigger: ".oe_website_sale input[name=street]",
+                run: "text Street A",
+            },
+            {
+                trigger: ".oe_website_sale input[name=city]",
+                run: "text City A",
+            },
+            {
+                trigger: ".oe_website_sale select[name=country_id]",
+                run: "text Fiji",
+            },
+            {
+                trigger: ".oe_website_sale",
+                run: function () {
+                    // Integration with website_sale_vat_required
+                    $(".oe_website_sale input[name=vat]").val("US01234567891");
+                    // Integration with website_sale_require_legal
+                    $(".oe_website_sale input[name=accepted_legal_terms]").prop(
+                        "checked",
+                        true
+                    );
+                },
+            },
+            {
+                trigger: ".oe_website_sale .btn:contains('Next')",
+            },
+            {
+                trigger: '#payment_method label:contains("Wire Transfer")',
+            },
+            // No need to wait for payment for this test case; that's tested elsewhere
+            {
+                extra_trigger:
+                    '#payment_method label:contains("Wire Transfer") input:checked,#payment_method:not(:has("input:radio:visible"))',
+                trigger: 'button[id="o_payment_form_pay"]:visible:not(:disabled)',
+            },
+        ]
+    );
+});
diff --git a/website_sale_resource_booking/templates/assets.xml b/website_sale_resource_booking/templates/assets.xml
new file mode 100644
index 0000000000..91138c9814
--- /dev/null
+++ b/website_sale_resource_booking/templates/assets.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Tecnativa - Jairo Llopis
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<data>
+
+    <template id="assets_frontend" inherit_id="website.assets_frontend">
+        <xpath expr=".">
+            <link rel="stylesheet" href="/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss" />
+        </xpath>
+    </template>
+
+</data>
diff --git a/website_sale_resource_booking/templates/website_sale.xml b/website_sale_resource_booking/templates/website_sale.xml
new file mode 100644
index 0000000000..e1a05edb62
--- /dev/null
+++ b/website_sale_resource_booking/templates/website_sale.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Tecnativa - Jairo Llopis
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<data>
+
+    <!-- Inform buyer about the upcoming reservation step -->
+    <template id="product" inherit_id="website_sale.product">
+        <xpath expr="//a[@id='add_to_cart']" position="before">
+            <div t-if="product.resource_booking_type_id" role="alert" class="alert alert-info mt8 mb0">
+                <i class="fa fa-calendar-check-o" />
+                From the cart, you will be able to make a pre-reservation, which will expire
+                <strong t-field="product.resource_booking_expiration" t-options='{"widget": "relative"}' />
+            </div>
+        </xpath>
+    </template>
+
+    <template id="wizard_checkout" inherit_id="website_sale.wizard_checkout" priority="50">
+        <!-- Add a "flag element" to trigger style variation -->
+        <xpath expr="//div[hasclass('wizard')]/div" position="before">
+            <span class="o_wizard_has_bookings d-none" t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')" />
+        </xpath>
+        <xpath expr="//div[@id='wizard-step10']" position="after">
+            <t t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')">
+                <a class="no-decoration" t-att-href="step &gt; 15 and '/shop/booking/1/schedule'">
+                    <div id="wizard-step15" t-attf-class="progress-wizard-step #{'active' if step == 15 else 'complete' if step &gt; 15 else 'disabled'}">
+                        <div class="progress-wizard-bar d-none d-md-block" />
+                        <span class="progress-wizard-dot d-none d-md-inline-block"></span>
+                        <div class="text-center progress-wizard-steplabel">Schedule bookings</div>
+                    </div>
+                </a>
+            </t>
+        </xpath>
+    </template>
+
+    <template id="scheduling_calendar" name="Resource Booking Calendar for Checkout" primary="True" inherit_id="resource_booking.scheduling_calendar">
+        <!-- Ask partner data before confirmation -->
+        <xpath expr="//div[hasclass('modal-body')]//p" position="before">
+            <p>Please indicate the <strong>attendee</strong> details:</p>
+            <div class="form-group row">
+                <label class="col-sm-2 col-form-label" t-attf-for="partner-name-#{int(slot.timestamp())}">Name</label>
+                <div class="col-sm-10">
+                    <input type="text" class="form-control" t-attf-id="partner-name-#{int(slot.timestamp())}" required="required" name="partner_name" t-att-value="booking.prereserved_name" />
+                </div>
+            </div>
+            <div class="form-group row">
+                <label class="col-sm-2 col-form-label" t-attf-for="partner-email-#{int(slot.timestamp())}">E-mail</label>
+                <div class="col-sm-10">
+                    <input type="email" class="form-control" t-attf-id="partner-email-#{int(slot.timestamp())}" required="required" name="partner_email" t-att-value="booking.prereserved_email" />
+                </div>
+            </div>
+        </xpath>
+
+        <!-- Inform about checkout timeout -->
+        <xpath expr="//ul" position="after">
+            <div class="alert alert-warning">
+                If unpaid, this pre-reservation will expire
+                <strong t-field="booking.sale_order_line_id.product_id.resource_booking_expiration" t-options='{"widget": "relative"}' />
+            </div>
+        </xpath>
+    </template>
+
+    <template id="scheduling" name="Schedule Bookings">
+        <t t-call="website.layout">
+            <t t-set="no_footer">1</t>
+            <div id="wrap">
+                <div class="container oe_website_sale py-2">
+                    <div class="row">
+                        <div class="col-12">
+                            <t t-call="website_sale.wizard_checkout">
+                                <t t-set="step" t-value="15" />
+                            </t>
+                        </div>
+                        <div class="col-12 col-xl-auto order-xl-2 d-none d-xl-block">
+                            <t t-call="website_sale.cart_summary">
+                                <t t-set="hide_coupon">True</t>
+                                <t t-set="redirect" t-valuef="/shop/cart" />
+                            </t>
+                        </div>
+                        <div class="col-12 col-xl order-xl-1 oe_cart">
+                            <h3 t-esc="wizard_title" />
+
+                            <div class="oe_structure" id="oe_structure_website_sale_resource_booking_10" />
+
+                            <!-- Error alert -->
+                            <t t-if="error">
+                                <t t-call="resource_booking.alert_availability_lost" />
+                            </t>
+
+                            <!-- Scheduling calendar -->
+                            <t t-call="website_sale_resource_booking.scheduling_calendar" />
+
+                            <div class="d-flex justify-content-between mt-3">
+                                <a role="button" href="/shop/cart" class="btn btn-secondary mb32">
+                                    <i class="fa fa-chevron-left"/>
+                                    <span>Return to Cart</span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="oe_structure" id="oe_structure_website_sale_resource_booking_20" />
+        </t>
+    </template>
+
+</data>
diff --git a/website_sale_resource_booking/tests/__init__.py b/website_sale_resource_booking/tests/__init__.py
new file mode 100644
index 0000000000..6dab214ac8
--- /dev/null
+++ b/website_sale_resource_booking/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_ui
diff --git a/website_sale_resource_booking/tests/test_ui.py b/website_sale_resource_booking/tests/test_ui.py
new file mode 100644
index 0000000000..29e7dbcd34
--- /dev/null
+++ b/website_sale_resource_booking/tests/test_ui.py
@@ -0,0 +1,115 @@
+# Copyright 2021 Tecnativa - Jairo Llopis
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+import time
+
+from datetime import datetime
+from freezegun import freeze_time
+
+from odoo.tests.common import HttpCase, Form
+from ...resource_booking.tests.common import create_test_data
+
+
+@freeze_time("2021-02-26 09:00:00", tick=True)
+class UICase(HttpCase):
+    def setUp(self):
+        super().setUp()
+        create_test_data(self)
+        self.product = self.env["product.product"].create(
+            {
+                "list_price": 100,
+                "name": "test bookable product",
+                "resource_booking_type_id": self.rbt.id,
+                "website_published": True,
+            }
+        )
+        self.normal_product = self.env["product.product"].create(
+            {
+                "list_price": 50,
+                "name": "test not bookable product",
+                "website_published": True,
+            }
+        )
+        # Clean up pending emails, to avoid polluting tests
+        self.env["mail.mail"].search([("state", "=", "outgoing")]).unlink()
+
+    def test_checkout(self):
+        """Booking checkout tour."""
+        tour = "website_sale_resource_booking_checkout"
+        # A visitor called Mr. A buys 3 booking products
+        self.browser_js(
+            url_path="/shop?search=test not bookable product",
+            code="odoo.__DEBUG__.services['web_tour.tour'].run('%s')" % tour,
+            ready="odoo.__DEBUG__.services['web_tour.tour'].tours.%s.ready" % tour,
+        )
+        # Find Mr. A's cart
+        so = self.env["sale.order"].search([("partner_id", "=", "Mr. A")])
+        bookings = so.resource_booking_ids
+        # It's linked to 3 scheduled bookings, that belong to him
+        self.assertEqual(len(bookings), 3)
+        self.assertEqual(bookings.mapped("state"), ["scheduled"] * 3)
+        self.assertEqual(bookings.mapped("partner_id"), so.partner_id)
+        # Confirm sale (which would happen automatically if paid online)
+        so.action_confirm()
+        # Now the 3 bookings are linked to the partners filled at checkout
+        self.assertEqual(
+            set(bookings.mapped("partner_id.name")), {"Mr. A", "Mr. B", "Mr. C"}
+        )
+        self.assertEqual(
+            set(bookings.mapped("partner_id.email")),
+            {"mr.a@example.com", "mr.b@example.com", "mr.c@example.com"},
+        )
+        # One of those partners is the same that bought
+        self.assertIn(so.partner_id, bookings.mapped("partner_id"))
+        # The mail queue, later, will send the expected notifications to see
+        # resource bookings in portal, but not to event attendance
+        pending_mails = self.env["mail.mail"].search([("state", "=", "outgoing")])
+        self.assertLessEqual(
+            set(pending_mails.mapped("subject")),
+            {
+                # Calendar invitations with attached .ics file
+                "Invitation to Mr. A - Test resource booking type",
+                "Invitation to Mr. B - Test resource booking type",
+                "Invitation to Mr. C - Test resource booking type",
+                # Portal invitations with tokenized link
+                "You are invited to access Mr. A - Test resource booking type "
+                "- March-01-2021 at (08-00 AM To 08-30 AM) (UTC)",
+                "You are invited to access Mr. B - Test resource booking type "
+                "- March-01-2021 at (08-00 AM To 08-30 AM) (UTC)",
+                "You are invited to access Mr. C - Test resource booking type "
+                "- March-01-2021 at (08-30 AM To 09-00 AM) (UTC)",
+            },
+        )
+
+    def test_expiration_cron(self):
+        """Abandoned cart expires bookings."""
+        website = self.env["website"].get_current_website()
+        cron = self.browse_ref("website_sale_resource_booking.cron_expire")
+        # Set product expiration to 2 second (approx... you know... floats)
+        self.product.resource_booking_timeout = 2 / 60 / 60
+        # Emulate a cart
+        order = (
+            self.env["sale.order"]
+            .with_context(website_id=website.id)
+            .create(
+                {
+                    "website_id": website.id,
+                    "partner_id": self.partner.id,
+                    "order_line": [
+                        (0, 0, {"product_id": self.product.id, "product_uom_qty": 2})
+                    ],
+                }
+            )
+        )
+        self.assertEqual(len(order.resource_booking_ids), 2)
+        # Emulate the user prereserved both bookings
+        dt = datetime(2021, 3, 1, 9)
+        bookings = order.resource_booking_ids
+        for booking in bookings:
+            with Form(booking) as booking_f:
+                booking_f.start = dt
+        self.assertEqual(bookings.mapped("state"), ["scheduled"] * 2)
+        # Expiration cron does its job
+        time.sleep(3)
+        cron.method_direct_trigger()
+        self.assertEqual(bookings.mapped("state"), ["canceled"] * 2)
diff --git a/website_sale_resource_booking/views/product_template_view.xml b/website_sale_resource_booking/views/product_template_view.xml
new file mode 100644
index 0000000000..c2564724c0
--- /dev/null
+++ b/website_sale_resource_booking/views/product_template_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 Tecnativa - Jairo Llopis
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<data>
+
+    <record id="product_template_form_view" model="ir.ui.view">
+        <field name="name">Display booking expiration</field>
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="sale_resource_booking.product_template_form_view" />
+        <field name="groups_id" eval="[(4, ref('resource_booking.group_user'), 0)]" />
+        <field name="arch" type="xml">
+            <group name='booking' position='inside'>
+                <field name="resource_booking_timeout" widget="float_time" attrs="{'invisible': [('resource_booking_type_id', '=', False)]}" />
+            </group>
+        </field>
+    </record>
+
+</data>

From 87f2f7d16791dda030aead70feb157fe581a4985 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo.llopis@tecnativa.com>
Date: Tue, 11 May 2021 09:39:52 +0100
Subject: [PATCH 02/19] [FIX] website_sale_resource_booking: expire only once

Before this patch, when a resource.booking was canceled due to being expired, reactivating it would immediately cancel it again when cron ran again.

@Tecnativa TT29651

[UPD] Update website_sale_resource_booking.pot

[UPD] README.rst
---
 website_sale_resource_booking/README.rst      |  4 +-
 website_sale_resource_booking/__manifest__.py |  4 --
 .../controllers/main.py                       |  4 +-
 .../i18n/website_sale_resource_booking.pot    |  7 ++-
 .../models/resource_booking.py                | 48 +++++--------------
 .../models/sale_order_line.py                 |  9 +++-
 .../static/description/index.html             |  4 +-
 7 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index e6047fe4ca..b6b72c94f7 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -7,9 +7,9 @@ Sell resource booking products in your eCommerce
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Beta
+    :alt: Production/Stable
 .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index f8a01da60d..d4a400d87c 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -10,10 +10,6 @@
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "maintainers": ["Yajo"],
     "license": "AGPL-3",
-    "external_dependencies": {
-        "python": [],
-        "bin": [],
-    },
     "depends": ["sale_resource_booking", "website_sale"],
     "data": [
         "data/ir_cron_data.xml",
diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
index 0f1beff1a1..04e14cc751 100644
--- a/website_sale_resource_booking/controllers/main.py
+++ b/website_sale_resource_booking/controllers/main.py
@@ -105,8 +105,10 @@ def booking_confirm(self, index, partner_name, partner_email, when, **post):
         # Store partner info to autocreate and autoconfirm later
         booking_sudo.write(
             {
-                "prereserved_name": partner_name,
+                "expiration": booking_sudo.sale_order_line_id
+                    .product_id.resource_booking_expiration,
                 "prereserved_email": partner_email,
+                "prereserved_name": partner_name,
             }
         )
         return request.redirect("/shop/booking/{}/schedule".format(index + 1))
diff --git a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
index 9243213776..e45eca4140 100644
--- a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
+++ b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
@@ -1,13 +1,11 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#       * website_sale_resource_booking
+#	* website_sale_resource_booking
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-09 08:39+0000\n"
-"PO-Revision-Date: 2021-08-09 08:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,7 +64,7 @@ msgid "Pre-booking timeout"
 msgstr ""
 
 #. module: website_sale_resource_booking
-#: code:addons/website_sale_resource_booking/controllers/main.py:73
+#: code:addons/website_sale_resource_booking/controllers/main.py:71
 #, python-format
 msgid "Pre-schedule your booking (%(index)d of %(total)d)"
 msgstr ""
@@ -127,3 +125,4 @@ msgstr ""
 #: model:ir.model.fields,help:website_sale_resource_booking.field_resource_booking__expiration
 msgid "When will this booking expire if its related quotation is not confirmed in time?"
 msgstr ""
+
diff --git a/website_sale_resource_booking/models/resource_booking.py b/website_sale_resource_booking/models/resource_booking.py
index d585e033bb..557efd1f1c 100644
--- a/website_sale_resource_booking/models/resource_booking.py
+++ b/website_sale_resource_booking/models/resource_booking.py
@@ -27,21 +27,6 @@ def _compute_access_url(self):
             self.access_url = "/shop/booking/%d" % index
         return result
 
-    def _update_expiration(self):
-        """Update booking expiration."""
-        # Only update if booking is altered from the website
-        if not self.env.context.get("website_id"):
-            return
-        now = fields.Datetime.now()
-        for one in self:
-            # Only affects bookings related to sales
-            if not one.sale_order_line_id:
-                continue
-            delta = timedelta(
-                hours=one.sale_order_line_id.product_id.resource_booking_timeout
-            )
-            one.expiration = now + delta
-
     def _confirm_prereservation(self):
         """Convert prereservation data to actual partners, and confirm booking."""
         affected = self.with_context(dont_notify=True).filtered(
@@ -63,9 +48,10 @@ def _confirm_prereservation(self):
                 )
         affected.write(
             {
+                "expiration": False,
                 # Partners are already created, so this data is irrelevant now
-                "prereserved_name": False,
                 "prereserved_email": False,
+                "prereserved_name": False,
                 # Anti-smartypants safety belt: rotate security token now
                 "access_token": False,
             }
@@ -101,26 +87,14 @@ def _cron_cancel_expired(self, domain=None):
             + domain
         )
         expired.action_cancel()
-        # Cleaning personal data that you will never need again
-        expired.write({"prereserved_name": False, "prereserved_email": False})
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        """Autosave default expiration date."""
-        to_update_indexes = []
-        for index, vals in enumerate(vals_list):
-            if vals.get("start") and not vals.get("expiration"):
-                to_update_indexes.append(index)
-        result = super().create(vals_list)
-        to_update_records = self.browse(prefetch=self._prefetch)
-        for index in to_update_indexes:
-            to_update_records |= result[index]
-        to_update_records._update_expiration()
-        return result
+    def action_cancel(self):
+        """Clean personal/cron data that you will never need again.
 
-    def write(self, vals):
-        """Autoupdate expiration date."""
-        result = super().write(vals)
-        if vals.get("start") and not vals.get("expiration"):
-            self._update_expiration()
-        return result
+        Keeping this information without a clear purpose would incur into legal
+        obligations in some countries, so it's better to just dump it.
+        """
+        self.write(
+            {"prereserved_name": False, "prereserved_email": False, "expiration": False}
+        )
+        return super().action_cancel()
diff --git a/website_sale_resource_booking/models/sale_order_line.py b/website_sale_resource_booking/models/sale_order_line.py
index 17a5ff3f39..4ae5d78008 100644
--- a/website_sale_resource_booking/models/sale_order_line.py
+++ b/website_sale_resource_booking/models/sale_order_line.py
@@ -21,10 +21,15 @@ def _sync_resource_bookings(self):
             if order.state == "sale":
                 bookings._confirm_prereservation()
                 continue
-            # If it is still a cart, create pending bookings
-            if order.state != "draft":
+            # Continue if it is not an eCommerce cart
+            if (
+                order.state != "draft"
+                and order.env.context.get("website_id") == order.website_id.id
+            ):
                 continue
+            # It is still a cart, so let's create pending bookings
             values = {
+                "expiration": line.product_id.resource_booking_expiration,
                 "sale_order_line_id": line.id,
                 "type_id": line.product_id.resource_booking_type_id.id,
             }
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index 1178d946dd..a7ee4203a8 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Sell resource booking products in your eCommerce</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
 the eCommerce use case and to allow your visitors to buy products that produce
 a resource booking, and pre-book them before buying.</p>

From a7000c0a3451b9d8f6eaaaccf59c3f1a1bc963e3 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Fri, 10 Dec 2021 13:30:40 +0100
Subject: [PATCH 03/19] [FIX] website_sale_resource_booking: Make sure resource
 booking partner is accessible

If someone introduces a different email address for the resource
booking, a partner with such email is searched and if not found,
created, which is correct in theory.

But the core method used for that goal (`find_or_create` in
`res.partner`) is not taking multi-company into account, searching
partners only matching by mail, and creating them in the default
company.

Due to this, this commits changes the resource booking partner
population code to perform the search and creation controlling the
involved company.

TT33276
---
 website_sale_resource_booking/__manifest__.py |  2 +-
 .../models/resource_booking.py                | 23 ++++++++++++-------
 .../models/sale_order_line.py                 |  4 +++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index d4a400d87c..e0b19dd10f 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Sell resource booking products in your eCommerce",
     "summary": "Let customers book resources temporarily before buying",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",
diff --git a/website_sale_resource_booking/models/resource_booking.py b/website_sale_resource_booking/models/resource_booking.py
index 557efd1f1c..e2809c811b 100644
--- a/website_sale_resource_booking/models/resource_booking.py
+++ b/website_sale_resource_booking/models/resource_booking.py
@@ -33,15 +33,22 @@ def _confirm_prereservation(self):
             lambda booking: booking.prereserved_name and booking.prereserved_email
         )
         for booking in affected:
-            booking.partner_id = (
-                self.env["res.partner"]
-                .with_context(force_email=True)
-                .find_or_create(
-                    "{} <{}>".format(
-                        booking.prereserved_name, booking.prereserved_email
-                    )
-                )
+            company_id = self.env.context.get(
+                "force_company", self.env.user.company_id.id,
             )
+            partner = self.env["res.partner"].search([
+                ("email", "=ilike", booking.prereserved_email),
+                ("|"),
+                ("company_id", "=", False),
+                ("company_id", "=", company_id),
+            ], limit=1)
+            if not partner:
+                partner = self.env["res.partner"].create({
+                    "name": booking.prereserved_name,
+                    "email": booking.prereserved_email,
+                    "company_id": company_id,
+                })
+            booking.partner_id = partner.id
             if booking.meeting_id:
                 booking.meeting_id.name = booking._get_name_formatted(
                     booking.partner_id, booking.type_id
diff --git a/website_sale_resource_booking/models/sale_order_line.py b/website_sale_resource_booking/models/sale_order_line.py
index 4ae5d78008..f52bf475e3 100644
--- a/website_sale_resource_booking/models/sale_order_line.py
+++ b/website_sale_resource_booking/models/sale_order_line.py
@@ -19,7 +19,9 @@ def _sync_resource_bookings(self):
             bookings = line.resource_booking_ids
             # If paid, create missing partners
             if order.state == "sale":
-                bookings._confirm_prereservation()
+                bookings.with_context(
+                    force_company=order.company_id.id
+                )._confirm_prereservation()
                 continue
             # Continue if it is not an eCommerce cart
             if (

From 199e0ea9fa8bab256c1268fe4b59e028846e879d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 2 Feb 2022 09:05:26 +0100
Subject: [PATCH 04/19] [IMP] website_sale_resource_booking: black, isort,
 prettier

---
 website_sale_resource_booking/__manifest__.py |   4 +-
 .../controllers/main.py                       |  12 +-
 .../data/ir_cron_data.xml                     |  11 +-
 website_sale_resource_booking/demo/assets.xml |  11 +-
 .../models/resource_booking.py                |  27 ++--
 .../models/sale_order_line.py                 |   4 +-
 .../static/src/js/tour_checkout.js            |   4 +-
 .../templates/assets.xml                      |  10 +-
 .../templates/website_sale.xml                | 117 +++++++++++++-----
 .../tests/test_ui.py                          |   5 +-
 .../views/product_template_view.xml           |  16 ++-
 11 files changed, 138 insertions(+), 83 deletions(-)

diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index e0b19dd10f..186bf9042a 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -17,7 +17,5 @@
         "templates/website_sale.xml",
         "views/product_template_view.xml",
     ],
-    "demo": [
-        "demo/assets.xml",
-    ],
+    "demo": ["demo/assets.xml",],
 }
diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
index 04e14cc751..bcfea7b30b 100644
--- a/website_sale_resource_booking/controllers/main.py
+++ b/website_sale_resource_booking/controllers/main.py
@@ -1,15 +1,16 @@
 # Copyright 2021 Tecnativa - Jairo Llopis
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from datetime import datetime
-from dateutil.parser import isoparse
 from urllib.parse import quote_plus
 
-from ...website_sale.controllers import main
+from dateutil.parser import isoparse
 
 from odoo import _
-from odoo.http import route, request
-from odoo.tests.common import Form
 from odoo.exceptions import ValidationError
+from odoo.http import request, route
+from odoo.tests.common import Form
+
+from ...website_sale.controllers import main
 
 
 class WebsiteSale(main.WebsiteSale):
@@ -105,8 +106,7 @@ def booking_confirm(self, index, partner_name, partner_email, when, **post):
         # Store partner info to autocreate and autoconfirm later
         booking_sudo.write(
             {
-                "expiration": booking_sudo.sale_order_line_id
-                    .product_id.resource_booking_expiration,
+                "expiration": booking_sudo.sale_order_line_id.product_id.resource_booking_expiration,
                 "prereserved_email": partner_email,
                 "prereserved_name": partner_name,
             }
diff --git a/website_sale_resource_booking/data/ir_cron_data.xml b/website_sale_resource_booking/data/ir_cron_data.xml
index cc967bcf6a..e559ef4d0f 100644
--- a/website_sale_resource_booking/data/ir_cron_data.xml
+++ b/website_sale_resource_booking/data/ir_cron_data.xml
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
 <data noupdate="1">
-
     <record forcecreate="True" id="cron_expire" model="ir.cron">
         <field name="name">Auto-cancel expired resource bookings</field>
-        <field name="model_id" ref="resource_booking.model_resource_booking"/>
+        <field name="model_id" ref="resource_booking.model_resource_booking" />
         <field name="state">code</field>
         <field name="code">model._cron_cancel_expired()</field>
-        <field name="user_id" ref="base.user_root"/>
+        <field name="user_id" ref="base.user_root" />
         <field name="interval_number">1</field>
         <field name="interval_type">minutes</field>
         <field name="numbercall">-1</field>
-        <field name="doall" eval="False"/>
+        <field name="doall" eval="False" />
     </record>
-
 </data>
diff --git a/website_sale_resource_booking/demo/assets.xml b/website_sale_resource_booking/demo/assets.xml
index e0a48728ef..962940dfd1 100644
--- a/website_sale_resource_booking/demo/assets.xml
+++ b/website_sale_resource_booking/demo/assets.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
 <data>
-
     <template id="assets_frontend_demo" inherit_id="website.assets_frontend">
         <xpath expr=".">
-            <script type="text/javascript"
-                    src="/website_sale_resource_booking/static/src/js/tour_checkout.js"/>
+            <script
+                type="text/javascript"
+                src="/website_sale_resource_booking/static/src/js/tour_checkout.js"
+            />
         </xpath>
     </template>
-
 </data>
diff --git a/website_sale_resource_booking/models/resource_booking.py b/website_sale_resource_booking/models/resource_booking.py
index e2809c811b..4f15e64381 100644
--- a/website_sale_resource_booking/models/resource_booking.py
+++ b/website_sale_resource_booking/models/resource_booking.py
@@ -36,18 +36,23 @@ def _confirm_prereservation(self):
             company_id = self.env.context.get(
                 "force_company", self.env.user.company_id.id,
             )
-            partner = self.env["res.partner"].search([
-                ("email", "=ilike", booking.prereserved_email),
-                ("|"),
-                ("company_id", "=", False),
-                ("company_id", "=", company_id),
-            ], limit=1)
+            partner = self.env["res.partner"].search(
+                [
+                    ("email", "=ilike", booking.prereserved_email),
+                    ("|"),
+                    ("company_id", "=", False),
+                    ("company_id", "=", company_id),
+                ],
+                limit=1,
+            )
             if not partner:
-                partner = self.env["res.partner"].create({
-                    "name": booking.prereserved_name,
-                    "email": booking.prereserved_email,
-                    "company_id": company_id,
-                })
+                partner = self.env["res.partner"].create(
+                    {
+                        "name": booking.prereserved_name,
+                        "email": booking.prereserved_email,
+                        "company_id": company_id,
+                    }
+                )
             booking.partner_id = partner.id
             if booking.meeting_id:
                 booking.meeting_id.name = booking._get_name_formatted(
diff --git a/website_sale_resource_booking/models/sale_order_line.py b/website_sale_resource_booking/models/sale_order_line.py
index f52bf475e3..68c2263c5d 100644
--- a/website_sale_resource_booking/models/sale_order_line.py
+++ b/website_sale_resource_booking/models/sale_order_line.py
@@ -37,9 +37,7 @@ def _sync_resource_bookings(self):
             }
             context = {
                 "default_partner_id": line.order_id.partner_id.id,
-                "default_combination_id":
-                    line.product_id
-                    .resource_booking_type_combination_rel_id.combination_id.id,
+                "default_combination_id": line.product_id.resource_booking_type_combination_rel_id.combination_id.id,
             }
             # Assign prereservation data if user is logged in
             prereserved_partner = order.partner_id - order.website_id.user_id.partner_id
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.js b/website_sale_resource_booking/static/src/js/tour_checkout.js
index 59638ac6af..68a41055a8 100755
--- a/website_sale_resource_booking/static/src/js/tour_checkout.js
+++ b/website_sale_resource_booking/static/src/js/tour_checkout.js
@@ -1,7 +1,7 @@
 /* Copyright 2021 Tecnativa - Jairo Llopis
  * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
 
-odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
+odoo.define("website_sale_resource_booking.tour_checkout", function(require) {
     "use strict";
 
     var tour = require("web_tour.tour");
@@ -217,7 +217,7 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
             },
             {
                 trigger: ".oe_website_sale",
-                run: function () {
+                run: function() {
                     // Integration with website_sale_vat_required
                     $(".oe_website_sale input[name=vat]").val("US01234567891");
                     // Integration with website_sale_require_legal
diff --git a/website_sale_resource_booking/templates/assets.xml b/website_sale_resource_booking/templates/assets.xml
index 91138c9814..03ec33f14a 100644
--- a/website_sale_resource_booking/templates/assets.xml
+++ b/website_sale_resource_booking/templates/assets.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
 <data>
-
     <template id="assets_frontend" inherit_id="website.assets_frontend">
         <xpath expr=".">
-            <link rel="stylesheet" href="/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss" />
+            <link
+                rel="stylesheet"
+                href="/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss"
+            />
         </xpath>
     </template>
-
 </data>
diff --git a/website_sale_resource_booking/templates/website_sale.xml b/website_sale_resource_booking/templates/website_sale.xml
index e1a05edb62..2c95bef3e8 100644
--- a/website_sale_resource_booking/templates/website_sale.xml
+++ b/website_sale_resource_booking/templates/website_sale.xml
@@ -1,65 +1,111 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
 <data>
-
     <!-- Inform buyer about the upcoming reservation step -->
     <template id="product" inherit_id="website_sale.product">
         <xpath expr="//a[@id='add_to_cart']" position="before">
-            <div t-if="product.resource_booking_type_id" role="alert" class="alert alert-info mt8 mb0">
+            <div
+                t-if="product.resource_booking_type_id"
+                role="alert"
+                class="alert alert-info mt8 mb0"
+            >
                 <i class="fa fa-calendar-check-o" />
                 From the cart, you will be able to make a pre-reservation, which will expire
-                <strong t-field="product.resource_booking_expiration" t-options='{"widget": "relative"}' />
+                <strong
+                    t-field="product.resource_booking_expiration"
+                    t-options='{"widget": "relative"}'
+                />
             </div>
         </xpath>
     </template>
-
-    <template id="wizard_checkout" inherit_id="website_sale.wizard_checkout" priority="50">
+    <template
+        id="wizard_checkout"
+        inherit_id="website_sale.wizard_checkout"
+        priority="50"
+    >
         <!-- Add a "flag element" to trigger style variation -->
         <xpath expr="//div[hasclass('wizard')]/div" position="before">
-            <span class="o_wizard_has_bookings d-none" t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')" />
+            <span
+                class="o_wizard_has_bookings d-none"
+                t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')"
+            />
         </xpath>
         <xpath expr="//div[@id='wizard-step10']" position="after">
-            <t t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')">
-                <a class="no-decoration" t-att-href="step &gt; 15 and '/shop/booking/1/schedule'">
-                    <div id="wizard-step15" t-attf-class="progress-wizard-step #{'active' if step == 15 else 'complete' if step &gt; 15 else 'disabled'}">
+            <t
+                t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')"
+            >
+                <a
+                    class="no-decoration"
+                    t-att-href="step &gt; 15 and '/shop/booking/1/schedule'"
+                >
+                    <div
+                        id="wizard-step15"
+                        t-attf-class="progress-wizard-step #{'active' if step == 15 else 'complete' if step &gt; 15 else 'disabled'}"
+                    >
                         <div class="progress-wizard-bar d-none d-md-block" />
-                        <span class="progress-wizard-dot d-none d-md-inline-block"></span>
-                        <div class="text-center progress-wizard-steplabel">Schedule bookings</div>
+                        <span class="progress-wizard-dot d-none d-md-inline-block" />
+                        <div
+                            class="text-center progress-wizard-steplabel"
+                        >Schedule bookings</div>
                     </div>
                 </a>
             </t>
         </xpath>
     </template>
-
-    <template id="scheduling_calendar" name="Resource Booking Calendar for Checkout" primary="True" inherit_id="resource_booking.scheduling_calendar">
+    <template
+        id="scheduling_calendar"
+        name="Resource Booking Calendar for Checkout"
+        primary="True"
+        inherit_id="resource_booking.scheduling_calendar"
+    >
         <!-- Ask partner data before confirmation -->
         <xpath expr="//div[hasclass('modal-body')]//p" position="before">
             <p>Please indicate the <strong>attendee</strong> details:</p>
             <div class="form-group row">
-                <label class="col-sm-2 col-form-label" t-attf-for="partner-name-#{int(slot.timestamp())}">Name</label>
+                <label
+                    class="col-sm-2 col-form-label"
+                    t-attf-for="partner-name-#{int(slot.timestamp())}"
+                >Name</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" t-attf-id="partner-name-#{int(slot.timestamp())}" required="required" name="partner_name" t-att-value="booking.prereserved_name" />
+                    <input
+                        type="text"
+                        class="form-control"
+                        t-attf-id="partner-name-#{int(slot.timestamp())}"
+                        required="required"
+                        name="partner_name"
+                        t-att-value="booking.prereserved_name"
+                    />
                 </div>
             </div>
             <div class="form-group row">
-                <label class="col-sm-2 col-form-label" t-attf-for="partner-email-#{int(slot.timestamp())}">E-mail</label>
+                <label
+                    class="col-sm-2 col-form-label"
+                    t-attf-for="partner-email-#{int(slot.timestamp())}"
+                >E-mail</label>
                 <div class="col-sm-10">
-                    <input type="email" class="form-control" t-attf-id="partner-email-#{int(slot.timestamp())}" required="required" name="partner_email" t-att-value="booking.prereserved_email" />
+                    <input
+                        type="email"
+                        class="form-control"
+                        t-attf-id="partner-email-#{int(slot.timestamp())}"
+                        required="required"
+                        name="partner_email"
+                        t-att-value="booking.prereserved_email"
+                    />
                 </div>
             </div>
         </xpath>
-
         <!-- Inform about checkout timeout -->
         <xpath expr="//ul" position="after">
             <div class="alert alert-warning">
                 If unpaid, this pre-reservation will expire
-                <strong t-field="booking.sale_order_line_id.product_id.resource_booking_expiration" t-options='{"widget": "relative"}' />
+                <strong
+                    t-field="booking.sale_order_line_id.product_id.resource_booking_expiration"
+                    t-options='{"widget": "relative"}'
+                />
             </div>
         </xpath>
     </template>
-
     <template id="scheduling" name="Schedule Bookings">
         <t t-call="website.layout">
             <t t-set="no_footer">1</t>
@@ -79,20 +125,25 @@
                         </div>
                         <div class="col-12 col-xl order-xl-1 oe_cart">
                             <h3 t-esc="wizard_title" />
-
-                            <div class="oe_structure" id="oe_structure_website_sale_resource_booking_10" />
-
+                            <div
+                                class="oe_structure"
+                                id="oe_structure_website_sale_resource_booking_10"
+                            />
                             <!-- Error alert -->
                             <t t-if="error">
                                 <t t-call="resource_booking.alert_availability_lost" />
                             </t>
-
                             <!-- Scheduling calendar -->
-                            <t t-call="website_sale_resource_booking.scheduling_calendar" />
-
+                            <t
+                                t-call="website_sale_resource_booking.scheduling_calendar"
+                            />
                             <div class="d-flex justify-content-between mt-3">
-                                <a role="button" href="/shop/cart" class="btn btn-secondary mb32">
-                                    <i class="fa fa-chevron-left"/>
+                                <a
+                                    role="button"
+                                    href="/shop/cart"
+                                    class="btn btn-secondary mb32"
+                                >
+                                    <i class="fa fa-chevron-left" />
                                     <span>Return to Cart</span>
                                 </a>
                             </div>
@@ -100,8 +151,10 @@
                     </div>
                 </div>
             </div>
-            <div class="oe_structure" id="oe_structure_website_sale_resource_booking_20" />
+            <div
+                class="oe_structure"
+                id="oe_structure_website_sale_resource_booking_20"
+            />
         </t>
     </template>
-
 </data>
diff --git a/website_sale_resource_booking/tests/test_ui.py b/website_sale_resource_booking/tests/test_ui.py
index 29e7dbcd34..ed96c4c53e 100644
--- a/website_sale_resource_booking/tests/test_ui.py
+++ b/website_sale_resource_booking/tests/test_ui.py
@@ -2,11 +2,12 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import time
-
 from datetime import datetime
+
 from freezegun import freeze_time
 
-from odoo.tests.common import HttpCase, Form
+from odoo.tests.common import Form, HttpCase
+
 from ...resource_booking.tests.common import create_test_data
 
 
diff --git a/website_sale_resource_booking/views/product_template_view.xml b/website_sale_resource_booking/views/product_template_view.xml
index c2564724c0..a516953f13 100644
--- a/website_sale_resource_booking/views/product_template_view.xml
+++ b/website_sale_resource_booking/views/product_template_view.xml
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-
 <data>
-
     <record id="product_template_form_view" model="ir.ui.view">
         <field name="name">Display booking expiration</field>
         <field name="model">product.template</field>
-        <field name="inherit_id" ref="sale_resource_booking.product_template_form_view" />
+        <field
+            name="inherit_id"
+            ref="sale_resource_booking.product_template_form_view"
+        />
         <field name="groups_id" eval="[(4, ref('resource_booking.group_user'), 0)]" />
         <field name="arch" type="xml">
             <group name='booking' position='inside'>
-                <field name="resource_booking_timeout" widget="float_time" attrs="{'invisible': [('resource_booking_type_id', '=', False)]}" />
+                <field
+                    name="resource_booking_timeout"
+                    widget="float_time"
+                    attrs="{'invisible': [('resource_booking_type_id', '=', False)]}"
+                />
             </group>
         </field>
     </record>
-
 </data>

From 4a8bd70ca279b335eb1654a530ad49d3b6c42857 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo.llopis@tecnativa.com>
Date: Mon, 8 Nov 2021 10:53:03 +0000
Subject: [PATCH 05/19] [MIG] website_sale_resource_booking: Migration to 13.0

Depends on https://github.com/OCA/sale-workflow/pull/1763 and https://github.com/OCA/calendar/pull/60.

@Tecnativa TT31328
---
 website_sale_resource_booking/README.rst      | 10 ++++----
 website_sale_resource_booking/__manifest__.py |  4 +--
 .../controllers/main.py                       |  3 ++-
 .../i18n/website_sale_resource_booking.pot    | 25 +++++++++++--------
 .../models/product_template.py                |  4 ++-
 .../models/sale_order_line.py                 |  4 ++-
 .../static/description/index.html             |  6 ++---
 .../static/src/js/tour_checkout.js            |  2 --
 .../tests/test_ui.py                          | 14 +++++------
 9 files changed, 39 insertions(+), 33 deletions(-)
 mode change 100755 => 100644 website_sale_resource_booking/static/src/js/tour_checkout.js

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index b6b72c94f7..f66fa1848e 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -14,13 +14,13 @@ Sell resource booking products in your eCommerce
     :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/12.0/website_sale_resource_booking
+    :target: https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking
     :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-12-0/e-commerce-12-0-website_sale_resource_booking
+    :target: https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_sale_resource_booking
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/113/12.0
+    :target: https://runbot.odoo-community.org/runbot/113/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -74,7 +74,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_resource_booking%0Aversion:%2012.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_resource_booking%0Aversion:%2013.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.
 
@@ -113,6 +113,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-Yajo| 
 
-This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking>`_ project on GitHub.
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index 186bf9042a..5e80ccde53 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Sell resource booking products in your eCommerce",
     "summary": "Let customers book resources temporarily before buying",
-    "version": "12.0.1.0.1",
+    "version": "13.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",
@@ -17,5 +17,5 @@
         "templates/website_sale.xml",
         "views/product_template_view.xml",
     ],
-    "demo": ["demo/assets.xml",],
+    "demo": ["demo/assets.xml"],
 }
diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
index bcfea7b30b..e5bf1e6ea9 100644
--- a/website_sale_resource_booking/controllers/main.py
+++ b/website_sale_resource_booking/controllers/main.py
@@ -104,9 +104,10 @@ def booking_confirm(self, index, partner_name, partner_email, when, **post):
             )
             return request.redirect(url)
         # Store partner info to autocreate and autoconfirm later
+        product = booking_sudo.sale_order_line_id.product_id
         booking_sudo.write(
             {
-                "expiration": booking_sudo.sale_order_line_id.product_id.resource_booking_expiration,
+                "expiration": product.resource_booking_expiration,
                 "prereserved_email": partner_email,
                 "prereserved_name": partner_name,
             }
diff --git a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
index e45eca4140..c55269f000 100644
--- a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
+++ b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* website_sale_resource_booking
+# 	* website_sale_resource_booking
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,13 +15,15 @@ msgstr ""
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
-msgid "<i class=\"fa fa-calendar-check-o\"/>\n"
+msgid ""
+"<i class=\"fa fa-calendar-check-o\"/>\n"
 "                From the cart, you will be able to make a pre-reservation, which will expire"
 msgstr ""
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
-msgid "<i class=\"fa fa-chevron-left\"/>\n"
+msgid ""
+"<i class=\"fa fa-chevron-left\"/>\n"
 "                                    <span>Return to Cart</span>"
 msgstr ""
 
@@ -64,7 +66,7 @@ msgid "Pre-booking timeout"
 msgstr ""
 
 #. module: website_sale_resource_booking
-#: code:addons/website_sale_resource_booking/controllers/main.py:71
+#: code:addons/website_sale_resource_booking/controllers/main.py:0
 #, python-format
 msgid "Pre-schedule your booking (%(index)d of %(total)d)"
 msgstr ""
@@ -97,7 +99,7 @@ msgstr ""
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order
-msgid "Sale Order"
+msgid "Sales Order"
 msgstr ""
 
 #. module: website_sale_resource_booking
@@ -118,11 +120,14 @@ msgstr ""
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,help:website_sale_resource_booking.field_product_product__resource_booking_timeout
 #: model:ir.model.fields,help:website_sale_resource_booking.field_product_template__resource_booking_timeout
-msgid "When resources are pre-booked, the booking will expire after this timeout if the quotation is not confirmed in time."
+msgid ""
+"When resources are pre-booked, the booking will expire after this timeout if"
+" the quotation is not confirmed in time."
 msgstr ""
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,help:website_sale_resource_booking.field_resource_booking__expiration
-msgid "When will this booking expire if its related quotation is not confirmed in time?"
+msgid ""
+"When will this booking expire if its related quotation is not confirmed in "
+"time?"
 msgstr ""
-
diff --git a/website_sale_resource_booking/models/product_template.py b/website_sale_resource_booking/models/product_template.py
index 14dd124188..289b773782 100644
--- a/website_sale_resource_booking/models/product_template.py
+++ b/website_sale_resource_booking/models/product_template.py
@@ -3,7 +3,7 @@
 
 from datetime import timedelta
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class ProductTemplate(models.Model):
@@ -21,8 +21,10 @@ class ProductTemplate(models.Model):
         compute="_compute_resource_booking_expiration"
     )
 
+    @api.depends("resource_booking_type_id", "resource_booking_timeout")
     def _compute_resource_booking_expiration(self):
         """When would the booking expire if placed right now."""
+        self.resource_booking_expiration = False
         now = fields.Datetime.now()
         for one in self:
             if not one.resource_booking_type_id:
diff --git a/website_sale_resource_booking/models/sale_order_line.py b/website_sale_resource_booking/models/sale_order_line.py
index 68c2263c5d..76aab01b6b 100644
--- a/website_sale_resource_booking/models/sale_order_line.py
+++ b/website_sale_resource_booking/models/sale_order_line.py
@@ -35,9 +35,11 @@ def _sync_resource_bookings(self):
                 "sale_order_line_id": line.id,
                 "type_id": line.product_id.resource_booking_type_id.id,
             }
+            rbc_rel = line.product_id.resource_booking_type_combination_rel_id
             context = {
                 "default_partner_id": line.order_id.partner_id.id,
-                "default_combination_id": line.product_id.resource_booking_type_combination_rel_id.combination_id.id,
+                "default_combination_auto_assign": not rbc_rel,
+                "default_combination_id": rbc_rel.combination_id.id,
             }
             # Assign prereservation data if user is logged in
             prereserved_partner = order.partner_id - order.website_id.user_id.partner_id
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index a7ee4203a8..0104e42977 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-12-0/e-commerce-12-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
 the eCommerce use case and to allow your visitors to buy products that produce
 a resource booking, and pre-book them before buying.</p>
@@ -419,7 +419,7 @@ <h1><a class="toc-backref" href="#id3">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_resource_booking%0Aversion:%2012.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_resource_booking%0Aversion:%2013.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">
@@ -446,7 +446,7 @@ <h2><a class="toc-backref" href="#id7">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" href="https://github.com/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/12.0/website_sale_resource_booking">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/13.0/website_sale_resource_booking">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>
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.js b/website_sale_resource_booking/static/src/js/tour_checkout.js
old mode 100755
new mode 100644
index 68a41055a8..8cbdcec0dd
--- a/website_sale_resource_booking/static/src/js/tour_checkout.js
+++ b/website_sale_resource_booking/static/src/js/tour_checkout.js
@@ -5,14 +5,12 @@ odoo.define("website_sale_resource_booking.tour_checkout", function(require) {
     "use strict";
 
     var tour = require("web_tour.tour");
-    var base = require("web_editor.base");
 
     tour.register(
         "website_sale_resource_booking_checkout",
         {
             url: "/shop?search=test not bookable product",
             test: true,
-            wait_for: base.ready(),
         },
         [
             // Add non-bookable product, to make sure we don't interfere
diff --git a/website_sale_resource_booking/tests/test_ui.py b/website_sale_resource_booking/tests/test_ui.py
index ed96c4c53e..5d0f47441d 100644
--- a/website_sale_resource_booking/tests/test_ui.py
+++ b/website_sale_resource_booking/tests/test_ui.py
@@ -36,12 +36,10 @@ def setUp(self):
 
     def test_checkout(self):
         """Booking checkout tour."""
-        tour = "website_sale_resource_booking_checkout"
         # A visitor called Mr. A buys 3 booking products
-        self.browser_js(
-            url_path="/shop?search=test not bookable product",
-            code="odoo.__DEBUG__.services['web_tour.tour'].run('%s')" % tour,
-            ready="odoo.__DEBUG__.services['web_tour.tour'].tours.%s.ready" % tour,
+        self.start_tour(
+            "/shop?search=test not bookable product",
+            "website_sale_resource_booking_checkout",
         )
         # Find Mr. A's cart
         so = self.env["sale.order"].search([("partner_id", "=", "Mr. A")])
@@ -74,11 +72,11 @@ def test_checkout(self):
                 "Invitation to Mr. C - Test resource booking type",
                 # Portal invitations with tokenized link
                 "You are invited to access Mr. A - Test resource booking type "
-                "- March-01-2021 at (08-00 AM To 08-30 AM) (UTC)",
+                "- 03/01/2021 at (09:00:00 To 09:30:00) (UTC)",
                 "You are invited to access Mr. B - Test resource booking type "
-                "- March-01-2021 at (08-00 AM To 08-30 AM) (UTC)",
+                "- 03/01/2021 at (09:00:00 To 09:30:00) (UTC)",
                 "You are invited to access Mr. C - Test resource booking type "
-                "- March-01-2021 at (08-30 AM To 09-00 AM) (UTC)",
+                "- 03/01/2021 at (09:30:00 To 10:00:00) (UTC)",
             },
         )
 

From 01cc729fc65f1c4f1ca1813ffa119cc0fd3f8b0c Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Thu, 12 May 2022 12:16:55 +0200
Subject: [PATCH 06/19] [FIX] website_sale_resource_booking: calendar context

The eCommerce customers should see the calendar available appointments
in the calendar tz context. Otherwise it could lead to confussions.

TT36661
---
 website_sale_resource_booking/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
index e5bf1e6ea9..136cbcdce7 100644
--- a/website_sale_resource_booking/controllers/main.py
+++ b/website_sale_resource_booking/controllers/main.py
@@ -62,7 +62,9 @@ def booking_schedule(self, index, year=None, month=None, error=None, **post):
         except IndexError:
             return request.redirect("/shop/checkout")
         count = len(bookings)
-        values = booking._get_calendar_context(year, month)
+        values = booking.with_context(
+            tz=booking.type_id.resource_calendar_id.tz
+        )._get_calendar_context(year, month)
         values.update(
             {
                 "booking_index": index,

From d3eafc5b8e1d507dfa1222f4946e8e0f807aafcd Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Fri, 13 May 2022 09:33:11 +0200
Subject: [PATCH 07/19] [FIX] website_sale_resource_booking: Proper license

Can't depend on Beta.
---
 website_sale_resource_booking/README.rst                    | 4 ++--
 website_sale_resource_booking/__manifest__.py               | 4 ++--
 website_sale_resource_booking/static/description/index.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index f66fa1848e..2bc4ffd79c 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -7,9 +7,9 @@ Sell resource booking products in your eCommerce
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Production/Stable
+    :alt: Beta
 .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index 5e80ccde53..dd3e9be7b3 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -3,8 +3,8 @@
 {
     "name": "Sell resource booking products in your eCommerce",
     "summary": "Let customers book resources temporarily before buying",
-    "version": "13.0.1.0.0",
-    "development_status": "Production/Stable",
+    "version": "13.0.1.0.2",
+    "development_status": "Beta",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",
     "author": "Tecnativa, Odoo Community Association (OCA)",
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index 0104e42977..196dc92749 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
 the eCommerce use case and to allow your visitors to buy products that produce
 a resource booking, and pre-book them before buying.</p>

From 72af1b26e5525e3566e50a681831af3aef53c5ce Mon Sep 17 00:00:00 2001
From: Stefan <stefan.ungureanu@tecnativa.com>
Date: Mon, 3 Apr 2023 08:50:19 +0200
Subject: [PATCH 08/19] [IMP] website_sale_resource_booking: black, isort,
 prettier

---
 website_sale_resource_booking/models/resource_booking.py     | 3 ++-
 website_sale_resource_booking/static/src/js/tour_checkout.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/website_sale_resource_booking/models/resource_booking.py b/website_sale_resource_booking/models/resource_booking.py
index 4f15e64381..cf28f3965d 100644
--- a/website_sale_resource_booking/models/resource_booking.py
+++ b/website_sale_resource_booking/models/resource_booking.py
@@ -34,7 +34,8 @@ def _confirm_prereservation(self):
         )
         for booking in affected:
             company_id = self.env.context.get(
-                "force_company", self.env.user.company_id.id,
+                "force_company",
+                self.env.user.company_id.id,
             )
             partner = self.env["res.partner"].search(
                 [
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.js b/website_sale_resource_booking/static/src/js/tour_checkout.js
index 8cbdcec0dd..57ae6dd0d9 100644
--- a/website_sale_resource_booking/static/src/js/tour_checkout.js
+++ b/website_sale_resource_booking/static/src/js/tour_checkout.js
@@ -1,7 +1,7 @@
 /* Copyright 2021 Tecnativa - Jairo Llopis
  * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
 
-odoo.define("website_sale_resource_booking.tour_checkout", function(require) {
+odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
     "use strict";
 
     var tour = require("web_tour.tour");
@@ -215,7 +215,7 @@ odoo.define("website_sale_resource_booking.tour_checkout", function(require) {
             },
             {
                 trigger: ".oe_website_sale",
-                run: function() {
+                run: function () {
                     // Integration with website_sale_vat_required
                     $(".oe_website_sale input[name=vat]").val("US01234567891");
                     // Integration with website_sale_require_legal

From d6c3ca0e110885e1d4d57c3a882e4ca16cc25552 Mon Sep 17 00:00:00 2001
From: Stefan <stefan.ungureanu@tecnativa.com>
Date: Mon, 3 Apr 2023 08:50:53 +0200
Subject: [PATCH 09/19] [MIG] website_sale_resource_booking: Migration to 15.0

---
 website_sale_resource_booking/README.rst      | 18 ++++++-----
 website_sale_resource_booking/__manifest__.py | 12 +++++--
 website_sale_resource_booking/demo/assets.xml | 13 --------
 website_sale_resource_booking/i18n/es.po      |  4 +--
 .../models/sale_order_line.py                 |  4 +--
 .../readme/CONTRIBUTORS.rst                   |  4 ++-
 .../static/description/index.html             | 15 +++++----
 .../static/src/js/tour_checkout.js            | 32 +++++++++----------
 .../templates/assets.xml                      | 13 --------
 .../tests/test_ui.py                          | 24 ++++++++++----
 10 files changed, 66 insertions(+), 73 deletions(-)
 delete mode 100644 website_sale_resource_booking/demo/assets.xml
 delete mode 100644 website_sale_resource_booking/templates/assets.xml

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index 2bc4ffd79c..686ed441c2 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -14,14 +14,14 @@ Sell resource booking products in your eCommerce
     :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/13.0/website_sale_resource_booking
+    :target: https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking
     :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-13-0/e-commerce-13-0-website_sale_resource_booking
+    :target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/113/13.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/e-commerce&target_branch=15.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -74,7 +74,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 smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_resource_booking%0Aversion:%2013.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_resource_booking%0Aversion:%2015.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.
 
@@ -89,8 +89,10 @@ Authors
 Contributors
 ~~~~~~~~~~~~
 
-* `Tecnativa <https://www.tecnativa.com/>`__:
+* `Tecnativa <https://www.tecnativa.com>`_:
+
   * Jairo Llopis
+  * Stefan Ungureanu
 
 Maintainers
 ~~~~~~~~~~~
@@ -113,6 +115,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-Yajo| 
 
-This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking>`_ project on GitHub.
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index dd3e9be7b3..8fa9f4abe1 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Sell resource booking products in your eCommerce",
     "summary": "Let customers book resources temporarily before buying",
-    "version": "13.0.1.0.2",
+    "version": "15.0.1.0.0",
     "development_status": "Beta",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",
@@ -13,9 +13,15 @@
     "depends": ["sale_resource_booking", "website_sale"],
     "data": [
         "data/ir_cron_data.xml",
-        "templates/assets.xml",
         "templates/website_sale.xml",
         "views/product_template_view.xml",
     ],
-    "demo": ["demo/assets.xml"],
+    "assets": {
+        "web.assets_frontend": [
+            "/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss"
+        ],
+        "web.assets_tests": [
+            "/website_sale_resource_booking/static/src/js/tour_checkout.js",
+        ],
+    },
 }
diff --git a/website_sale_resource_booking/demo/assets.xml b/website_sale_resource_booking/demo/assets.xml
deleted file mode 100644
index 962940dfd1..0000000000
--- a/website_sale_resource_booking/demo/assets.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2021 Tecnativa - Jairo Llopis
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<data>
-    <template id="assets_frontend_demo" inherit_id="website.assets_frontend">
-        <xpath expr=".">
-            <script
-                type="text/javascript"
-                src="/website_sale_resource_booking/static/src/js/tour_checkout.js"
-            />
-        </xpath>
-    </template>
-</data>
diff --git a/website_sale_resource_booking/i18n/es.po b/website_sale_resource_booking/i18n/es.po
index 0f0b4f90ac..ec6cc78745 100644
--- a/website_sale_resource_booking/i18n/es.po
+++ b/website_sale_resource_booking/i18n/es.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-08-09 08:39+0000\n"
-"PO-Revision-Date: 2021-08-09 09:39+0100\n"
+"PO-Revision-Date: 2023-07-06 15:56+0200\n"
 "Last-Translator: Jairo Llopis <jairo.llopis@tecnativa.com>\n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
diff --git a/website_sale_resource_booking/models/sale_order_line.py b/website_sale_resource_booking/models/sale_order_line.py
index 76aab01b6b..3050b2ac32 100644
--- a/website_sale_resource_booking/models/sale_order_line.py
+++ b/website_sale_resource_booking/models/sale_order_line.py
@@ -19,9 +19,7 @@ def _sync_resource_bookings(self):
             bookings = line.resource_booking_ids
             # If paid, create missing partners
             if order.state == "sale":
-                bookings.with_context(
-                    force_company=order.company_id.id
-                )._confirm_prereservation()
+                bookings.with_company(order.company_id.id)._confirm_prereservation()
                 continue
             # Continue if it is not an eCommerce cart
             if (
diff --git a/website_sale_resource_booking/readme/CONTRIBUTORS.rst b/website_sale_resource_booking/readme/CONTRIBUTORS.rst
index 7d706c5de1..bdf9d224a9 100644
--- a/website_sale_resource_booking/readme/CONTRIBUTORS.rst
+++ b/website_sale_resource_booking/readme/CONTRIBUTORS.rst
@@ -1,2 +1,4 @@
-* `Tecnativa <https://www.tecnativa.com/>`__:
+* `Tecnativa <https://www.tecnativa.com>`_:
+
   * Jairo Llopis
+  * Stefan Ungureanu
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index 196dc92749..3bd4261501 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Sell resource booking products in your eCommerce</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-13-0/e-commerce-13-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/e-commerce&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
 the eCommerce use case and to allow your visitors to buy products that produce
 a resource booking, and pre-book them before buying.</p>
@@ -419,7 +419,7 @@ <h1><a class="toc-backref" href="#id3">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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_resource_booking%0Aversion:%2013.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_resource_booking%0Aversion:%2015.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">
@@ -433,8 +433,11 @@ <h2><a class="toc-backref" href="#id5">Authors</a></h2>
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
-<li><a class="reference external" href="https://www.tecnativa.com/">Tecnativa</a>:
-* Jairo Llopis</li>
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Jairo Llopis</li>
+<li>Stefan Ungureanu</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -446,7 +449,7 @@ <h2><a class="toc-backref" href="#id7">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" href="https://github.com/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/13.0/website_sale_resource_booking">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/15.0/website_sale_resource_booking">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>
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.js b/website_sale_resource_booking/static/src/js/tour_checkout.js
index 57ae6dd0d9..a55c8401aa 100644
--- a/website_sale_resource_booking/static/src/js/tour_checkout.js
+++ b/website_sale_resource_booking/static/src/js/tour_checkout.js
@@ -20,9 +20,6 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
             {
                 trigger: "#add_to_cart",
             },
-            {
-                trigger: ".btn:contains('Continue Shopping')",
-            },
             {
                 trigger: ".oe_search_box",
                 run: "text test bookable product",
@@ -51,6 +48,9 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
                 extra_trigger: ".css_quantity .quantity:propValue('3')",
                 trigger: "#add_to_cart",
             },
+            {
+                trigger: "a[href='/shop/cart']",
+            },
             {
                 // Check there's a booking step advertised in the checkout wizard
                 extra_trigger:
@@ -184,19 +184,6 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
                 trigger: ".modal-dialog .btn:contains('Confirm booking')",
             },
             // Fill buyer address
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    ":has(.progress-wizard-step.complete:contains('Schedule bookings'))",
-                    ":has(.progress-wizard-step.active:contains('Address'))",
-                ].join(""),
-                trigger: ".oe_website_sale input[name=name]",
-                run: "text Mr. A",
-            },
-            {
-                trigger: ".oe_website_sale input[name=email]",
-                run: "text mr.a@example.com",
-            },
             {
                 trigger: ".oe_website_sale input[name=phone]",
                 run: "text +32 485 118.218",
@@ -209,6 +196,10 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
                 trigger: ".oe_website_sale input[name=city]",
                 run: "text City A",
             },
+            {
+                trigger: ".oe_website_sale input[name=zip]",
+                run: "text 18503",
+            },
             {
                 trigger: ".oe_website_sale select[name=country_id]",
                 run: "text Fiji",
@@ -228,6 +219,12 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
             {
                 trigger: ".oe_website_sale .btn:contains('Next')",
             },
+            {
+                trigger: "a[href='/shop/confirm_order']",
+            },
+            {
+                trigger: ".oe_website_sale .btn:contains('Pay Now')",
+            },
             {
                 trigger: '#payment_method label:contains("Wire Transfer")',
             },
@@ -235,7 +232,8 @@ odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
             {
                 extra_trigger:
                     '#payment_method label:contains("Wire Transfer") input:checked,#payment_method:not(:has("input:radio:visible"))',
-                trigger: 'button[id="o_payment_form_pay"]:visible:not(:disabled)',
+                trigger:
+                    'button[name="o_payment_submit_button"]:visible:not(:disabled)',
             },
         ]
     );
diff --git a/website_sale_resource_booking/templates/assets.xml b/website_sale_resource_booking/templates/assets.xml
deleted file mode 100644
index 03ec33f14a..0000000000
--- a/website_sale_resource_booking/templates/assets.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2021 Tecnativa - Jairo Llopis
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<data>
-    <template id="assets_frontend" inherit_id="website.assets_frontend">
-        <xpath expr=".">
-            <link
-                rel="stylesheet"
-                href="/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss"
-            />
-        </xpath>
-    </template>
-</data>
diff --git a/website_sale_resource_booking/tests/test_ui.py b/website_sale_resource_booking/tests/test_ui.py
index 5d0f47441d..f82e08b3e1 100644
--- a/website_sale_resource_booking/tests/test_ui.py
+++ b/website_sale_resource_booking/tests/test_ui.py
@@ -6,12 +6,13 @@
 
 from freezegun import freeze_time
 
-from odoo.tests.common import Form, HttpCase
+from odoo.tests.common import Form, HttpCase, tagged
 
 from ...resource_booking.tests.common import create_test_data
 
 
 @freeze_time("2021-02-26 09:00:00", tick=True)
+@tagged("post_install", "-at_install")
 class UICase(HttpCase):
     def setUp(self):
         super().setUp()
@@ -31,6 +32,17 @@ def setUp(self):
                 "website_published": True,
             }
         )
+        # If the created user has the same name as the invited users,
+        # the invitation does not reach the user.
+        self.user = self.env["res.users"].create(
+            {
+                "name": "user",
+                "email": "test@example.com",
+                "login": "booking_test_user",
+                "password": "booking_test_user",
+                "groups_id": [(4, self.env.ref("base.group_user").id, 0)],
+            }
+        )
         # Clean up pending emails, to avoid polluting tests
         self.env["mail.mail"].search([("state", "=", "outgoing")]).unlink()
 
@@ -40,9 +52,9 @@ def test_checkout(self):
         self.start_tour(
             "/shop?search=test not bookable product",
             "website_sale_resource_booking_checkout",
-        )
-        # Find Mr. A's cart
-        so = self.env["sale.order"].search([("partner_id", "=", "Mr. A")])
+            login="booking_test_user",
+        )  # Find Mr. A's cart
+        so = self.env["sale.order"].search([("partner_id", "=", "user")])
         bookings = so.resource_booking_ids
         # It's linked to 3 scheduled bookings, that belong to him
         self.assertEqual(len(bookings), 3)
@@ -58,12 +70,10 @@ def test_checkout(self):
             set(bookings.mapped("partner_id.email")),
             {"mr.a@example.com", "mr.b@example.com", "mr.c@example.com"},
         )
-        # One of those partners is the same that bought
-        self.assertIn(so.partner_id, bookings.mapped("partner_id"))
         # The mail queue, later, will send the expected notifications to see
         # resource bookings in portal, but not to event attendance
         pending_mails = self.env["mail.mail"].search([("state", "=", "outgoing")])
-        self.assertLessEqual(
+        self.assertGreaterEqual(
             set(pending_mails.mapped("subject")),
             {
                 # Calendar invitations with attached .ics file

From ba5f8b6f2533ab4cdc0b967f5b68b751795d831d Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Fri, 7 Jul 2023 07:33:07 +0000
Subject: [PATCH 10/19] [UPD] Update website_sale_resource_booking.pot

---
 website_sale_resource_booking/README.rst             |  6 +++---
 .../i18n/website_sale_resource_booking.pot           | 12 ++++++------
 .../static/description/index.html                    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index 686ed441c2..f4ba63e93f 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -19,9 +19,9 @@ Sell resource booking products in your eCommerce
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/e-commerce&target_branch=15.0
-    :alt: Try me on Runboat
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/113/15.0
+    :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
diff --git a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
index c55269f000..977879507a 100644
--- a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
+++ b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -27,6 +27,11 @@ msgid ""
 "                                    <span>Return to Cart</span>"
 msgstr ""
 
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order
+msgid "Allowing sale_order_type to work with website_sale."
+msgstr ""
+
 #. module: website_sale_resource_booking
 #: model:ir.actions.server,name:website_sale_resource_booking.cron_expire_ir_actions_server
 #: model:ir.cron,cron_name:website_sale_resource_booking.cron_expire
@@ -97,11 +102,6 @@ msgstr ""
 msgid "Resource Booking Expiration"
 msgstr ""
 
-#. module: website_sale_resource_booking
-#: model:ir.model,name:website_sale_resource_booking.model_sale_order
-msgid "Sales Order"
-msgstr ""
-
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
 msgid "Sales Order Line"
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index 3bd4261501..75de315f92 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Sell resource booking products in your eCommerce</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/e-commerce&amp;target_branch=15.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" 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" 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" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
 the eCommerce use case and to allow your visitors to buy products that produce
 a resource booking, and pre-book them before buying.</p>

From d0c9d94d23525b1895e5a5b778c42d0c61d51422 Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Fri, 11 Aug 2023 17:00:55 +0000
Subject: [PATCH 11/19] [UPD] Update website_sale_resource_booking.pot

---
 .../i18n/website_sale_resource_booking.pot             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
index 977879507a..8ede4f7dc7 100644
--- a/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
+++ b/website_sale_resource_booking/i18n/website_sale_resource_booking.pot
@@ -27,11 +27,6 @@ msgid ""
 "                                    <span>Return to Cart</span>"
 msgstr ""
 
-#. module: website_sale_resource_booking
-#: model:ir.model,name:website_sale_resource_booking.model_sale_order
-msgid "Allowing sale_order_type to work with website_sale."
-msgstr ""
-
 #. module: website_sale_resource_booking
 #: model:ir.actions.server,name:website_sale_resource_booking.cron_expire_ir_actions_server
 #: model:ir.cron,cron_name:website_sale_resource_booking.cron_expire
@@ -102,6 +97,11 @@ msgstr ""
 msgid "Resource Booking Expiration"
 msgstr ""
 
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
 msgid "Sales Order Line"

From caff37002d3577eae12f1b862d49e54abf46a944 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 11 Aug 2023 17:01:07 +0000
Subject: [PATCH 12/19] Update translation files

---
 website_sale_resource_booking/README.rst      | 15 ++++---
 website_sale_resource_booking/i18n/es.po      |  9 ++--
 .../static/description/index.html             | 44 ++++++++++---------
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index f4ba63e93f..48c8c8cbfa 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -2,10 +2,13 @@
 Sell resource booking products in your eCommerce
 ================================================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:9b6b3d77f1d829501674dd9c406dfc235fe5419aa62949514db588d608f5e484
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -19,11 +22,11 @@ Sell resource booking products in your eCommerce
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
     :target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/113/15.0
-    :alt: Try me on Runbot
+.. |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=15.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module extends the functionality of ``sale_resource_booking`` to support
 the eCommerce use case and to allow your visitors to buy products that produce
@@ -73,7 +76,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 smashing it by providing a detailed and welcomed
+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_resource_booking%0Aversion:%2015.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.
diff --git a/website_sale_resource_booking/i18n/es.po b/website_sale_resource_booking/i18n/es.po
index ec6cc78745..268401dc7d 100644
--- a/website_sale_resource_booking/i18n/es.po
+++ b/website_sale_resource_booking/i18n/es.po
@@ -76,7 +76,7 @@ msgid "Pre-booking timeout"
 msgstr "Validez de las prereservas"
 
 #. module: website_sale_resource_booking
-#: code:addons/website_sale_resource_booking/controllers/main.py:73
+#: code:addons/website_sale_resource_booking/controllers/main.py:0
 #, python-format
 msgid "Pre-schedule your booking (%(index)d of %(total)d)"
 msgstr "Agende su prereserva (%(index)d de %(total)d)"
@@ -109,8 +109,8 @@ msgstr "Expiración de reservas/citas de recursos"
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order
-msgid "Sale Order"
-msgstr "Pedido de venta"
+msgid "Sales Order"
+msgstr ""
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
@@ -145,3 +145,6 @@ msgid ""
 msgstr ""
 "¿Cuándo expirará esta reserva/cita, si su presupuesto vinculado no se "
 "confirma a tiempo?"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index 75de315f92..5e7009ba5a 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Sell resource booking products in your eCommerce</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,8 +366,10 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:9b6b3d77f1d829501674dd9c406dfc235fe5419aa62949514db588d608f5e484
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/113/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-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/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking"><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-15-0/e-commerce-15-0-website_sale_resource_booking"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
 the eCommerce use case and to allow your visitors to buy products that produce
 a resource booking, and pre-book them before buying.</p>
@@ -375,19 +377,19 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
-<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
+<li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id1">Installation</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 <p>To install this module, you need these dependencies:</p>
 <ul class="simple">
 <li><tt class="docutils literal">resource_booking</tt> from <a class="reference external" href="https://github.com/OCA/calendar">https://github.com/OCA/calendar</a></li>
@@ -395,7 +397,7 @@ <h1><a class="toc-backref" href="#id1">Installation</a></h1>
 </ul>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>To use this module, you need to know how to use <tt class="docutils literal">sale_resource_booking</tt> and
 <tt class="docutils literal">resource_booking</tt>. This document doesn’t explain the details for those
 related modules.</p>
@@ -415,23 +417,23 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 expire!</p>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">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 smashing it by providing a detailed and welcomed
+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_resource_booking%0Aversion:%2015.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="#id4">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id5">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
 <li>Jairo Llopis</li>
@@ -441,14 +443,14 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">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>
 <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" href="https://github.com/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
+<p><a class="reference external image-reference" href="https://github.com/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
 <p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking">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>

From 6063861be760401e9ad5b7f11a90a77aae82a419 Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Wed, 4 Oct 2023 16:31:19 +0000
Subject: [PATCH 13/19] Translated using Weblate (Spanish)

Currently translated at 100.0% (21 of 21 strings)

Translation: e-commerce-15.0/e-commerce-15.0-website_sale_resource_booking
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking/es/
---
 website_sale_resource_booking/i18n/es.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/website_sale_resource_booking/i18n/es.po b/website_sale_resource_booking/i18n/es.po
index 268401dc7d..ec1357a6a0 100644
--- a/website_sale_resource_booking/i18n/es.po
+++ b/website_sale_resource_booking/i18n/es.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-08-09 08:39+0000\n"
-"PO-Revision-Date: 2023-07-06 15:56+0200\n"
-"Last-Translator: Jairo Llopis <jairo.llopis@tecnativa.com>\n"
+"PO-Revision-Date: 2023-10-09 07:57+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: \n"
-"Language: es_ES\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
@@ -110,7 +110,7 @@ msgstr "Expiración de reservas/citas de recursos"
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Orden de Venta"
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order_line

From 14804957b00fcc1f0ab1d19b3dc542c9451bb330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Augusto=20D=2E=20Lisb=C3=B4a?= <augusto.diniz.l@gmail.com>
Date: Fri, 26 Apr 2024 12:55:27 +0000
Subject: [PATCH 14/19] Added translation using Weblate (Portuguese (Brazil))

---
 website_sale_resource_booking/i18n/pt_BR.po | 134 ++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 website_sale_resource_booking/i18n/pt_BR.po

diff --git a/website_sale_resource_booking/i18n/pt_BR.po b/website_sale_resource_booking/i18n/pt_BR.po
new file mode 100644
index 0000000000..94e0857b09
--- /dev/null
+++ b/website_sale_resource_booking/i18n/pt_BR.po
@@ -0,0 +1,134 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* website_sale_resource_booking
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
+msgid ""
+"<i class=\"fa fa-calendar-check-o\"/>\n"
+"                From the cart, you will be able to make a pre-reservation, which will expire"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
+msgid ""
+"<i class=\"fa fa-chevron-left\"/>\n"
+"                                    <span>Return to Cart</span>"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.actions.server,name:website_sale_resource_booking.cron_expire_ir_actions_server
+#: model:ir.cron,cron_name:website_sale_resource_booking.cron_expire
+#: model:ir.cron,name:website_sale_resource_booking.cron_expire
+msgid "Auto-cancel expired resource bookings"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "E-mail"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__expiration
+msgid "Expiration"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "If unpaid, this pre-reservation will expire"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "Name"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
+msgid "Please indicate the <strong>attendee</strong> details:"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_timeout
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_timeout
+msgid "Pre-booking timeout"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: code:addons/website_sale_resource_booking/controllers/main.py:0
+#, python-format
+msgid "Pre-schedule your booking (%(index)d of %(total)d)"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_email
+msgid "Prereserved Email"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_name
+msgid "Prereserved Name"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_resource_booking
+msgid "Resource Booking"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_expiration
+#: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_expiration
+msgid "Resource Booking Expiration"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.wizard_checkout
+msgid "Schedule bookings"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
+msgid "True"
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,help:website_sale_resource_booking.field_product_product__resource_booking_timeout
+#: model:ir.model.fields,help:website_sale_resource_booking.field_product_template__resource_booking_timeout
+msgid ""
+"When resources are pre-booked, the booking will expire after this timeout if"
+" the quotation is not confirmed in time."
+msgstr ""
+
+#. module: website_sale_resource_booking
+#: model:ir.model.fields,help:website_sale_resource_booking.field_resource_booking__expiration
+msgid ""
+"When will this booking expire if its related quotation is not confirmed in "
+"time?"
+msgstr ""

From 77fb80506567e52d6eead12887f0b5eebb168610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Augusto=20D=2E=20Lisb=C3=B4a?= <augusto.diniz.l@gmail.com>
Date: Fri, 26 Apr 2024 12:56:20 +0000
Subject: [PATCH 15/19] Translated using Weblate (Portuguese (Brazil))

Currently translated at 47.6% (10 of 21 strings)

Translation: e-commerce-15.0/e-commerce-15.0-website_sale_resource_booking
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking/pt_BR/
---
 website_sale_resource_booking/i18n/pt_BR.po | 25 +++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/website_sale_resource_booking/i18n/pt_BR.po b/website_sale_resource_booking/i18n/pt_BR.po
index 94e0857b09..b8ff5f79ea 100644
--- a/website_sale_resource_booking/i18n/pt_BR.po
+++ b/website_sale_resource_booking/i18n/pt_BR.po
@@ -6,13 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2024-04-26 13:03+0000\n"
+"Last-Translator: \"Augusto D. Lisbôa\" <augusto.diniz.l@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.product
@@ -20,6 +22,9 @@ msgid ""
 "<i class=\"fa fa-calendar-check-o\"/>\n"
 "                From the cart, you will be able to make a pre-reservation, which will expire"
 msgstr ""
+"<i class=\"fa fa-calendar-check-o\"/>\n"
+"                No carrinho você poderá fazer uma pré-reserva, que irá "
+"expirar"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
@@ -27,50 +32,52 @@ msgid ""
 "<i class=\"fa fa-chevron-left\"/>\n"
 "                                    <span>Return to Cart</span>"
 msgstr ""
+"<i class=\"fa fa-chevron-left\"/>\n"
+"                                    <span>Voltar ao carrinho</span>"
 
 #. module: website_sale_resource_booking
 #: model:ir.actions.server,name:website_sale_resource_booking.cron_expire_ir_actions_server
 #: model:ir.cron,cron_name:website_sale_resource_booking.cron_expire
 #: model:ir.cron,name:website_sale_resource_booking.cron_expire
 msgid "Auto-cancel expired resource bookings"
-msgstr ""
+msgstr "Cancelar automaticamente reservas expiradas"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__expiration
 msgid "Expiration"
-msgstr ""
+msgstr "Expiração"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
 msgid "If unpaid, this pre-reservation will expire"
-msgstr ""
+msgstr "Se não for paga, esta pré-reserva irá expirar"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling_calendar
 msgid "Please indicate the <strong>attendee</strong> details:"
-msgstr ""
+msgstr "Indique os dados do <strong>participante</strong>:"
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_timeout
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_timeout
 msgid "Pre-booking timeout"
-msgstr ""
+msgstr "Tempo limite de pré-reserva"
 
 #. module: website_sale_resource_booking
 #: code:addons/website_sale_resource_booking/controllers/main.py:0
 #, python-format
 msgid "Pre-schedule your booking (%(index)d of %(total)d)"
-msgstr ""
+msgstr "Pré-agende sua reserva (%(index)d de %(total)d)"
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_email

From 5658ed153c09484510a51e57d6a02d1f2f1b14c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Augusto=20D=2E=20Lisb=C3=B4a?= <augusto.diniz.l@gmail.com>
Date: Fri, 26 Apr 2024 13:07:48 +0000
Subject: [PATCH 16/19] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (21 of 21 strings)

Translation: e-commerce-15.0/e-commerce-15.0-website_sale_resource_booking
Translate-URL: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_resource_booking/pt_BR/
---
 website_sale_resource_booking/i18n/pt_BR.po | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/website_sale_resource_booking/i18n/pt_BR.po b/website_sale_resource_booking/i18n/pt_BR.po
index b8ff5f79ea..990884a725 100644
--- a/website_sale_resource_booking/i18n/pt_BR.po
+++ b/website_sale_resource_booking/i18n/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-04-26 13:03+0000\n"
+"PO-Revision-Date: 2024-04-26 15:36+0000\n"
 "Last-Translator: \"Augusto D. Lisbôa\" <augusto.diniz.l@gmail.com>\n"
 "Language-Team: none\n"
 "Language: pt_BR\n"
@@ -82,48 +82,48 @@ msgstr "Pré-agende sua reserva (%(index)d de %(total)d)"
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_email
 msgid "Prereserved Email"
-msgstr ""
+msgstr "Email da pré-reserva"
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_resource_booking__prereserved_name
 msgid "Prereserved Name"
-msgstr ""
+msgstr "Nome da pré-reserva"
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Template do Produto"
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_resource_booking
 msgid "Resource Booking"
-msgstr ""
+msgstr "Agendamento do Recurso"
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_product__resource_booking_expiration
 #: model:ir.model.fields,field_description:website_sale_resource_booking.field_product_template__resource_booking_expiration
 msgid "Resource Booking Expiration"
-msgstr ""
+msgstr "Expiração do agendamento"
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de Venda"
 
 #. module: website_sale_resource_booking
 #: model:ir.model,name:website_sale_resource_booking.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linha do Pedido de Venda"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.wizard_checkout
 msgid "Schedule bookings"
-msgstr ""
+msgstr "Agendar reservas"
 
 #. module: website_sale_resource_booking
 #: model_terms:ir.ui.view,arch_db:website_sale_resource_booking.scheduling
 msgid "True"
-msgstr ""
+msgstr "Verdadeiro"
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,help:website_sale_resource_booking.field_product_product__resource_booking_timeout
@@ -132,6 +132,8 @@ msgid ""
 "When resources are pre-booked, the booking will expire after this timeout if"
 " the quotation is not confirmed in time."
 msgstr ""
+"O agendamento da pré-reserva expirará após este tempo caso o orçamento não "
+"seja confirmado."
 
 #. module: website_sale_resource_booking
 #: model:ir.model.fields,help:website_sale_resource_booking.field_resource_booking__expiration
@@ -139,3 +141,5 @@ msgid ""
 "When will this booking expire if its related quotation is not confirmed in "
 "time?"
 msgstr ""
+"Quando esta reserva expirará se a cotação relacionada não for confirmada a "
+"tempo?"

From 567a2d5de1fbbcdde8ea447cdfb9f1a029da059a Mon Sep 17 00:00:00 2001
From: Carlos Lopez <carlos.lopez@tecnativa.com>
Date: Fri, 30 May 2025 06:53:36 -0500
Subject: [PATCH 17/19] [FIX] website_sale_*: make tests more resilient and
 compatible with website_sale_product_configurator

Many tests use the product "Customizable Desk". When the module
`website_sale_product_configurator` is installed (it's auto-installed),
it adds optional products to "Customizable Desk". As a result, a popup
is displayed when adding the product to the cart, and some tours fail
because they expect the product to be added in a single step.

This commit ensures the tests run correctly by removing optional
products when the module is installed.
---
 website_sale_resource_booking/tests/test_ui.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website_sale_resource_booking/tests/test_ui.py b/website_sale_resource_booking/tests/test_ui.py
index f82e08b3e1..b39a644478 100644
--- a/website_sale_resource_booking/tests/test_ui.py
+++ b/website_sale_resource_booking/tests/test_ui.py
@@ -53,6 +53,7 @@ def test_checkout(self):
             "/shop?search=test not bookable product",
             "website_sale_resource_booking_checkout",
             login="booking_test_user",
+            step_delay=300,
         )  # Find Mr. A's cart
         so = self.env["sale.order"].search([("partner_id", "=", "user")])
         bookings = so.resource_booking_ids

From 1c4ce78f38abff43e3bba6628cbe04b6abc6da96 Mon Sep 17 00:00:00 2001
From: Anusha <anusha.pp@calin.co.in>
Date: Mon, 21 Jul 2025 06:21:10 +0200
Subject: [PATCH 18/19] [IMP] website_sale_resource_booking: pre-commit auto
 fixes

---
 website_sale_resource_booking/README.rst      | 65 ++++++++++---------
 .../controllers/main.py                       |  6 +-
 website_sale_resource_booking/pyproject.toml  |  3 +
 .../readme/CONTRIBUTORS.md                    |  3 +
 .../readme/CONTRIBUTORS.rst                   |  4 --
 .../readme/DESCRIPTION.md                     |  6 ++
 .../readme/DESCRIPTION.rst                    |  5 --
 .../readme/INSTALL.md                         |  4 ++
 .../readme/INSTALL.rst                        |  4 --
 website_sale_resource_booking/readme/USAGE.md | 22 +++++++
 .../readme/USAGE.rst                          | 20 ------
 .../static/description/index.html             | 53 ++++++++-------
 .../templates/website_sale.xml                | 12 ++--
 13 files changed, 109 insertions(+), 98 deletions(-)
 create mode 100644 website_sale_resource_booking/pyproject.toml
 create mode 100644 website_sale_resource_booking/readme/CONTRIBUTORS.md
 delete mode 100644 website_sale_resource_booking/readme/CONTRIBUTORS.rst
 create mode 100644 website_sale_resource_booking/readme/DESCRIPTION.md
 delete mode 100644 website_sale_resource_booking/readme/DESCRIPTION.rst
 create mode 100644 website_sale_resource_booking/readme/INSTALL.md
 delete mode 100644 website_sale_resource_booking/readme/INSTALL.rst
 create mode 100644 website_sale_resource_booking/readme/USAGE.md
 delete mode 100644 website_sale_resource_booking/readme/USAGE.rst

diff --git a/website_sale_resource_booking/README.rst b/website_sale_resource_booking/README.rst
index 48c8c8cbfa..7b749bd89d 100644
--- a/website_sale_resource_booking/README.rst
+++ b/website_sale_resource_booking/README.rst
@@ -17,20 +17,21 @@ Sell resource booking products in your eCommerce
     :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/15.0/website_sale_resource_booking
+    :target: https://github.com/OCA/e-commerce/tree/18.0/website_sale_resource_booking
     :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-15-0/e-commerce-15-0-website_sale_resource_booking
+    :target: https://translation.odoo-community.org/projects/e-commerce-18-0/e-commerce-18-0-website_sale_resource_booking
     :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=15.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module extends the functionality of ``sale_resource_booking`` to support
-the eCommerce use case and to allow your visitors to buy products that produce
-a resource booking, and pre-book them before buying.
+This module extends the functionality of ``sale_resource_booking`` to
+support the eCommerce use case and to allow your visitors to buy
+products that produce a resource booking, and pre-book them before
+buying.
 
 You can also set a timeout for those pre-bookings to expire if unpaid.
 
@@ -44,32 +45,34 @@ Installation
 
 To install this module, you need these dependencies:
 
-* ``resource_booking`` from https://github.com/OCA/calendar
-* ``sale_resource_booking`` from https://github.com/OCA/sale-workflow
+- ``resource_booking`` from https://github.com/OCA/calendar
+- ``sale_resource_booking`` from https://github.com/OCA/sale-workflow
 
 Usage
 =====
 
-To use this module, you need to know how to use ``sale_resource_booking`` and
-``resource_booking``. This document doesn't explain the details for those
-related modules.
+To use this module, you need to know how to use
+``sale_resource_booking`` and ``resource_booking``. This document
+doesn't explain the details for those related modules.
 
-All products that you link to a resource booking type will allow pre-bookings
-if sold from your eCommerce. To configure those pre-bookings timeout:
+All products that you link to a resource booking type will allow
+pre-bookings if sold from your eCommerce. To configure those
+pre-bookings timeout:
 
-#. Go to the product form in the backend.
-#. Use the *Resource booking timeout* field, in the *Sales* tab.
+1. Go to the product form in the backend.
+2. Use the *Resource booking timeout* field, in the *Sales* tab.
 
-When you go to that product's eCommerce page, you'll see a little message above
-the *Add to cart* button, telling the user that they will be able to pre-book it
-before buying.
+When you go to that product's eCommerce page, you'll see a little
+message above the *Add to cart* button, telling the user that they will
+be able to pre-book it before buying.
 
-When you add to your cart one (or more) bookable products, you will see in the
-eCommerce checkout wizard a new step that you will have to follow to be able to
-buy. This step will display a calendar with bookable slots for you to choose.
+When you add to your cart one (or more) bookable products, you will see
+in the eCommerce checkout wizard a new step that you will have to follow
+to be able to buy. This step will display a calendar with bookable slots
+for you to choose.
 
-When you are redirected to payment, make sure to pay before your pre-bookings
-expire!
+When you are redirected to payment, make sure to pay before your
+pre-bookings expire!
 
 Bug Tracker
 ===========
@@ -77,7 +80,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_resource_booking%0Aversion:%2015.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_resource_booking%0Aversion:%2018.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,20 +88,20 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Tecnativa
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* `Tecnativa <https://www.tecnativa.com>`_:
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-  * Jairo Llopis
-  * Stefan Ungureanu
+  - Jairo Llopis
+  - Stefan Ungureanu
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -118,6 +121,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-Yajo| 
 
-This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking>`_ project on GitHub.
+This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/18.0/website_sale_resource_booking>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
index 136cbcdce7..7d957372ef 100644
--- a/website_sale_resource_booking/controllers/main.py
+++ b/website_sale_resource_booking/controllers/main.py
@@ -101,9 +101,7 @@ def booking_confirm(self, index, partner_name, partner_email, when, **post):
             with Form(booking_sudo) as booking_form:
                 booking_form.start = when_naive
         except ValidationError as error:
-            url = "/shop/booking/{}/schedule?error={}".format(
-                index, quote_plus(error.name)
-            )
+            url = f"/shop/booking/{index}/schedule?error={quote_plus(error.name)}"
             return request.redirect(url)
         # Store partner info to autocreate and autoconfirm later
         product = booking_sudo.sale_order_line_id.product_id
@@ -114,4 +112,4 @@ def booking_confirm(self, index, partner_name, partner_email, when, **post):
                 "prereserved_name": partner_name,
             }
         )
-        return request.redirect("/shop/booking/{}/schedule".format(index + 1))
+        return request.redirect(f"/shop/booking/{index + 1}/schedule")
diff --git a/website_sale_resource_booking/pyproject.toml b/website_sale_resource_booking/pyproject.toml
new file mode 100644
index 0000000000..4231d0cccb
--- /dev/null
+++ b/website_sale_resource_booking/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/website_sale_resource_booking/readme/CONTRIBUTORS.md b/website_sale_resource_booking/readme/CONTRIBUTORS.md
new file mode 100644
index 0000000000..3541fd95f3
--- /dev/null
+++ b/website_sale_resource_booking/readme/CONTRIBUTORS.md
@@ -0,0 +1,3 @@
+- [Tecnativa](https://www.tecnativa.com):
+  - Jairo Llopis
+  - Stefan Ungureanu
diff --git a/website_sale_resource_booking/readme/CONTRIBUTORS.rst b/website_sale_resource_booking/readme/CONTRIBUTORS.rst
deleted file mode 100644
index bdf9d224a9..0000000000
--- a/website_sale_resource_booking/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-* `Tecnativa <https://www.tecnativa.com>`_:
-
-  * Jairo Llopis
-  * Stefan Ungureanu
diff --git a/website_sale_resource_booking/readme/DESCRIPTION.md b/website_sale_resource_booking/readme/DESCRIPTION.md
new file mode 100644
index 0000000000..0ddbdd7846
--- /dev/null
+++ b/website_sale_resource_booking/readme/DESCRIPTION.md
@@ -0,0 +1,6 @@
+This module extends the functionality of `sale_resource_booking` to
+support the eCommerce use case and to allow your visitors to buy
+products that produce a resource booking, and pre-book them before
+buying.
+
+You can also set a timeout for those pre-bookings to expire if unpaid.
diff --git a/website_sale_resource_booking/readme/DESCRIPTION.rst b/website_sale_resource_booking/readme/DESCRIPTION.rst
deleted file mode 100644
index 3329132690..0000000000
--- a/website_sale_resource_booking/readme/DESCRIPTION.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-This module extends the functionality of ``sale_resource_booking`` to support
-the eCommerce use case and to allow your visitors to buy products that produce
-a resource booking, and pre-book them before buying.
-
-You can also set a timeout for those pre-bookings to expire if unpaid.
diff --git a/website_sale_resource_booking/readme/INSTALL.md b/website_sale_resource_booking/readme/INSTALL.md
new file mode 100644
index 0000000000..32da9a56f6
--- /dev/null
+++ b/website_sale_resource_booking/readme/INSTALL.md
@@ -0,0 +1,4 @@
+To install this module, you need these dependencies:
+
+- `resource_booking` from <https://github.com/OCA/calendar>
+- `sale_resource_booking` from <https://github.com/OCA/sale-workflow>
diff --git a/website_sale_resource_booking/readme/INSTALL.rst b/website_sale_resource_booking/readme/INSTALL.rst
deleted file mode 100644
index 575f995846..0000000000
--- a/website_sale_resource_booking/readme/INSTALL.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-To install this module, you need these dependencies:
-
-* ``resource_booking`` from https://github.com/OCA/calendar
-* ``sale_resource_booking`` from https://github.com/OCA/sale-workflow
diff --git a/website_sale_resource_booking/readme/USAGE.md b/website_sale_resource_booking/readme/USAGE.md
new file mode 100644
index 0000000000..3f096fc2ca
--- /dev/null
+++ b/website_sale_resource_booking/readme/USAGE.md
@@ -0,0 +1,22 @@
+To use this module, you need to know how to use `sale_resource_booking`
+and `resource_booking`. This document doesn't explain the details for
+those related modules.
+
+All products that you link to a resource booking type will allow
+pre-bookings if sold from your eCommerce. To configure those
+pre-bookings timeout:
+
+1.  Go to the product form in the backend.
+2.  Use the *Resource booking timeout* field, in the *Sales* tab.
+
+When you go to that product's eCommerce page, you'll see a little
+message above the *Add to cart* button, telling the user that they will
+be able to pre-book it before buying.
+
+When you add to your cart one (or more) bookable products, you will see
+in the eCommerce checkout wizard a new step that you will have to follow
+to be able to buy. This step will display a calendar with bookable slots
+for you to choose.
+
+When you are redirected to payment, make sure to pay before your
+pre-bookings expire!
diff --git a/website_sale_resource_booking/readme/USAGE.rst b/website_sale_resource_booking/readme/USAGE.rst
deleted file mode 100644
index e544f94b13..0000000000
--- a/website_sale_resource_booking/readme/USAGE.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-To use this module, you need to know how to use ``sale_resource_booking`` and
-``resource_booking``. This document doesn't explain the details for those
-related modules.
-
-All products that you link to a resource booking type will allow pre-bookings
-if sold from your eCommerce. To configure those pre-bookings timeout:
-
-#. Go to the product form in the backend.
-#. Use the *Resource booking timeout* field, in the *Sales* tab.
-
-When you go to that product's eCommerce page, you'll see a little message above
-the *Add to cart* button, telling the user that they will be able to pre-book it
-before buying.
-
-When you add to your cart one (or more) bookable products, you will see in the
-eCommerce checkout wizard a new step that you will have to follow to be able to
-buy. This step will display a calendar with bookable slots for you to choose.
-
-When you are redirected to payment, make sure to pay before your pre-bookings
-expire!
diff --git a/website_sale_resource_booking/static/description/index.html b/website_sale_resource_booking/static/description/index.html
index 5e7009ba5a..d8885acaa4 100644
--- a/website_sale_resource_booking/static/description/index.html
+++ b/website_sale_resource_booking/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,10 +369,11 @@ <h1 class="title">Sell resource booking products in your eCommerce</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:9b6b3d77f1d829501674dd9c406dfc235fe5419aa62949514db588d608f5e484
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/15.0/website_sale_resource_booking"><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-15-0/e-commerce-15-0-website_sale_resource_booking"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to support
-the eCommerce use case and to allow your visitors to buy products that produce
-a resource booking, and pre-book them before buying.</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/18.0/website_sale_resource_booking"><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_resource_booking"><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>This module extends the functionality of <tt class="docutils literal">sale_resource_booking</tt> to
+support the eCommerce use case and to allow your visitors to buy
+products that produce a resource booking, and pre-book them before
+buying.</p>
 <p>You can also set a timeout for those pre-bookings to expire if unpaid.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -398,30 +399,32 @@ <h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
-<p>To use this module, you need to know how to use <tt class="docutils literal">sale_resource_booking</tt> and
-<tt class="docutils literal">resource_booking</tt>. This document doesn’t explain the details for those
-related modules.</p>
-<p>All products that you link to a resource booking type will allow pre-bookings
-if sold from your eCommerce. To configure those pre-bookings timeout:</p>
+<p>To use this module, you need to know how to use
+<tt class="docutils literal">sale_resource_booking</tt> and <tt class="docutils literal">resource_booking</tt>. This document
+doesn’t explain the details for those related modules.</p>
+<p>All products that you link to a resource booking type will allow
+pre-bookings if sold from your eCommerce. To configure those
+pre-bookings timeout:</p>
 <ol class="arabic simple">
 <li>Go to the product form in the backend.</li>
 <li>Use the <em>Resource booking timeout</em> field, in the <em>Sales</em> tab.</li>
 </ol>
-<p>When you go to that product’s eCommerce page, you’ll see a little message above
-the <em>Add to cart</em> button, telling the user that they will be able to pre-book it
-before buying.</p>
-<p>When you add to your cart one (or more) bookable products, you will see in the
-eCommerce checkout wizard a new step that you will have to follow to be able to
-buy. This step will display a calendar with bookable slots for you to choose.</p>
-<p>When you are redirected to payment, make sure to pay before your pre-bookings
-expire!</p>
+<p>When you go to that product’s eCommerce page, you’ll see a little
+message above the <em>Add to cart</em> button, telling the user that they will
+be able to pre-book it before buying.</p>
+<p>When you add to your cart one (or more) bookable products, you will see
+in the eCommerce checkout wizard a new step that you will have to follow
+to be able to buy. This step will display a calendar with bookable slots
+for you to choose.</p>
+<p>When you are redirected to payment, make sure to pay before your
+pre-bookings expire!</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-3">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_resource_booking%0Aversion:%2015.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_resource_booking%0Aversion:%2018.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">
@@ -445,13 +448,15 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">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/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_resource_booking">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/18.0/website_sale_resource_booking">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>
diff --git a/website_sale_resource_booking/templates/website_sale.xml b/website_sale_resource_booking/templates/website_sale.xml
index 2c95bef3e8..7ff761b4b9 100644
--- a/website_sale_resource_booking/templates/website_sale.xml
+++ b/website_sale_resource_booking/templates/website_sale.xml
@@ -13,9 +13,9 @@
                 <i class="fa fa-calendar-check-o" />
                 From the cart, you will be able to make a pre-reservation, which will expire
                 <strong
-                    t-field="product.resource_booking_expiration"
-                    t-options='{"widget": "relative"}'
-                />
+                t-field="product.resource_booking_expiration"
+                t-options='{"widget": "relative"}'
+            />
             </div>
         </xpath>
     </template>
@@ -100,9 +100,9 @@
             <div class="alert alert-warning">
                 If unpaid, this pre-reservation will expire
                 <strong
-                    t-field="booking.sale_order_line_id.product_id.resource_booking_expiration"
-                    t-options='{"widget": "relative"}'
-                />
+                t-field="booking.sale_order_line_id.product_id.resource_booking_expiration"
+                t-options='{"widget": "relative"}'
+            />
             </div>
         </xpath>
     </template>

From 3d476ff9c40b554f1b3707ce3fbbc80c5064bf5d Mon Sep 17 00:00:00 2001
From: Anusha <anusha.pp@calin.co.in>
Date: Mon, 21 Jul 2025 06:32:59 +0200
Subject: [PATCH 19/19] [MIG] website_sale_resource_booking: Migration to 18.0

---
 website_sale_resource_booking/__manifest__.py |   7 +-
 .../controllers/main.py                       |  44 +++-
 .../data/ir_cron_data.xml                     |   2 -
 .../models/__init__.py                        |   1 +
 .../models/resource_booking.py                |  18 +-
 .../models/sale_order.py                      |   8 +-
 .../models/website.py                         |  27 ++
 .../css/website_sale_resource_booking.scss    |  15 --
 .../static/src/js/tour_checkout.esm.js        | 177 +++++++++++++
 .../static/src/js/tour_checkout.js            | 240 ------------------
 .../templates/website_sale.xml                |  44 +---
 .../tests/test_ui.py                          | 178 ++++++++++---
 .../views/product_template_view.xml           |   4 +-
 13 files changed, 388 insertions(+), 377 deletions(-)
 create mode 100644 website_sale_resource_booking/models/website.py
 delete mode 100644 website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss
 create mode 100644 website_sale_resource_booking/static/src/js/tour_checkout.esm.js
 delete mode 100644 website_sale_resource_booking/static/src/js/tour_checkout.js

diff --git a/website_sale_resource_booking/__manifest__.py b/website_sale_resource_booking/__manifest__.py
index 8fa9f4abe1..e109d07a23 100644
--- a/website_sale_resource_booking/__manifest__.py
+++ b/website_sale_resource_booking/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Sell resource booking products in your eCommerce",
     "summary": "Let customers book resources temporarily before buying",
-    "version": "15.0.1.0.0",
+    "version": "18.0.1.0.0",
     "development_status": "Beta",
     "category": "Website",
     "website": "https://github.com/OCA/e-commerce",
@@ -17,11 +17,8 @@
         "views/product_template_view.xml",
     ],
     "assets": {
-        "web.assets_frontend": [
-            "/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss"
-        ],
         "web.assets_tests": [
-            "/website_sale_resource_booking/static/src/js/tour_checkout.js",
+            "/website_sale_resource_booking/static/src/js/tour_checkout.esm.js",
         ],
     },
 }
diff --git a/website_sale_resource_booking/controllers/main.py b/website_sale_resource_booking/controllers/main.py
index 7d957372ef..a9f1b48573 100644
--- a/website_sale_resource_booking/controllers/main.py
+++ b/website_sale_resource_booking/controllers/main.py
@@ -1,6 +1,6 @@
 # Copyright 2021 Tecnativa - Jairo Llopis
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from datetime import datetime
+from datetime import timezone
 from urllib.parse import quote_plus
 
 from dateutil.parser import isoparse
@@ -8,7 +8,6 @@
 from odoo import _
 from odoo.exceptions import ValidationError
 from odoo.http import request, route
-from odoo.tests.common import Form
 
 from ...website_sale.controllers import main
 
@@ -17,6 +16,7 @@ class WebsiteSale(main.WebsiteSale):
     def _get_bookings(self):
         """Obtain bookings from current cart."""
         order = request.website.sale_get_order()
+        order = order.with_context(active_test=False)
         return order.mapped("order_line.resource_booking_ids")
 
     def _get_indexed_booking(self, index):
@@ -29,14 +29,25 @@ def _get_indexed_booking(self, index):
             raise IndexError()
         return bookings[index - 1]
 
-    def checkout_redirection(self, order):
+    def _booking_redirection(self, booking, index):
+        """Call this method in /schedule and /confirm to redirect if
+        the booking has expired.
+        """
+        if not booking.active:
+            msg = _("Booking has expired")
+            url = f"/shop/booking/{index}/schedule?error={quote_plus(msg)}"
+            booking.sale_order_line_id._sync_resource_bookings()  # re-active
+            return request.redirect(url)
+
+    def _check_cart(self, order_sudo):
         """Redirect to scheduling bookings if still not done."""
-        order.order_line._sync_resource_bookings()
-        bookings = order.mapped("order_line.resource_booking_ids")
-        for booking in bookings:
-            if booking.state == "pending":
-                return request.redirect("/shop/booking/1/schedule")
-        return super().checkout_redirection(order)
+        order_sudo.order_line._sync_resource_bookings()
+        bookings = order_sudo.mapped("order_line.resource_booking_ids").filtered(
+            lambda r: r.state == "pending"
+        )
+        if bookings:
+            return request.redirect("/shop/booking/1/schedule")
+        return super()._check_cart(order_sudo)
 
     @route(
         [
@@ -61,6 +72,9 @@ def booking_schedule(self, index, year=None, month=None, error=None, **post):
             )
         except IndexError:
             return request.redirect("/shop/checkout")
+        redirection = self._booking_redirection(booking, index)
+        if redirection:
+            return redirection
         count = len(bookings)
         values = booking.with_context(
             tz=booking.type_id.resource_calendar_id.tz
@@ -95,13 +109,17 @@ def booking_confirm(self, index, partner_name, partner_email, when, **post):
                 no_mail_to_attendees=True,
             )
         )
+        if not booking_sudo:
+            return request.redirect("/shop/checkout")
+        redirection = self._booking_redirection(booking_sudo, index)
+        if redirection:
+            return redirection
         when_tz_aware = isoparse(when)
-        when_naive = datetime.utcfromtimestamp(when_tz_aware.timestamp())
+        when_naive = when_tz_aware.astimezone(timezone.utc).replace(tzinfo=None)
         try:
-            with Form(booking_sudo) as booking_form:
-                booking_form.start = when_naive
+            booking_sudo.start = when_naive
         except ValidationError as error:
-            url = f"/shop/booking/{index}/schedule?error={quote_plus(error.name)}"
+            url = f"/shop/booking/{index}/schedule?error={quote_plus(str(error))}"
             return request.redirect(url)
         # Store partner info to autocreate and autoconfirm later
         product = booking_sudo.sale_order_line_id.product_id
diff --git a/website_sale_resource_booking/data/ir_cron_data.xml b/website_sale_resource_booking/data/ir_cron_data.xml
index e559ef4d0f..e42e66960a 100644
--- a/website_sale_resource_booking/data/ir_cron_data.xml
+++ b/website_sale_resource_booking/data/ir_cron_data.xml
@@ -10,7 +10,5 @@
         <field name="user_id" ref="base.user_root" />
         <field name="interval_number">1</field>
         <field name="interval_type">minutes</field>
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False" />
     </record>
 </data>
diff --git a/website_sale_resource_booking/models/__init__.py b/website_sale_resource_booking/models/__init__.py
index b6534f8077..c19c3be4c1 100644
--- a/website_sale_resource_booking/models/__init__.py
+++ b/website_sale_resource_booking/models/__init__.py
@@ -2,3 +2,4 @@
 from . import resource_booking
 from . import sale_order
 from . import sale_order_line
+from . import website
diff --git a/website_sale_resource_booking/models/resource_booking.py b/website_sale_resource_booking/models/resource_booking.py
index cf28f3965d..e7f55d5e7a 100644
--- a/website_sale_resource_booking/models/resource_booking.py
+++ b/website_sale_resource_booking/models/resource_booking.py
@@ -2,7 +2,6 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
-from odoo.tests.common import Form
 
 
 class ResourceBooking(models.Model):
@@ -73,16 +72,13 @@ def _confirm_prereservation(self):
         affected.action_confirm()
         # Notify them
         for booking in affected:
-            share_f = Form(
-                self.env["portal.share"].with_context(
-                    active_id=booking.id,
-                    active_ids=booking.ids,
-                    active_model=booking._name,
-                    default_note=booking.requester_advice,
-                    default_partner_ids=[(4, booking.partner_id.id, 0)],
-                )
-            )
-            share = share_f.save()
+            share_vals = {
+                "note": booking.requester_advice,
+                "partner_ids": [(4, booking.partner_id.id)],
+                "res_model": booking._name,
+                "res_id": booking.id,
+            }
+            share = self.env["portal.share"].create(share_vals)
             # Put invitations in mail queue
             share.with_context(
                 mail_notify_force_send=False, mail_create_nosubscribe=True
diff --git a/website_sale_resource_booking/models/sale_order.py b/website_sale_resource_booking/models/sale_order.py
index f6f93aa072..94542ccff1 100644
--- a/website_sale_resource_booking/models/sale_order.py
+++ b/website_sale_resource_booking/models/sale_order.py
@@ -8,10 +8,10 @@ class SaleOrder(models.Model):
     _inherit = "sale.order"
 
     @api.onchange("partner_id")
-    def onchange_partner_id(self):
-        """Update bookings partner when user creates account in checkout wizard."""
-        result = super().onchange_partner_id()
-        # Avoid sending calendar invites if user is in eCommerce checkout
+    def _onchange_partner_id_warning(self):
+        """Update booking partner when user creates accounts in checkout wizard."""
+        result = super()._onchange_partner_id_warning()
+        # Avoid sending calendar invites if a user is in eCommerce checkout
         _self = self.with_context(dont_notify=True)
         for order in _self:
             # We only care about eCommerce orders
diff --git a/website_sale_resource_booking/models/website.py b/website_sale_resource_booking/models/website.py
new file mode 100644
index 0000000000..a67e73b9f6
--- /dev/null
+++ b/website_sale_resource_booking/models/website.py
@@ -0,0 +1,27 @@
+# Copyright 2025 Tecnativa - Víctor Martínez
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo import _lt, models
+
+
+class Website(models.Model):
+    _inherit = "website"
+
+    def _get_checkout_step_list(self):
+        steps = super()._get_checkout_step_list()
+        order = self.sale_get_order()
+        if order.mapped("order_line.product_id.resource_booking_type_id"):
+            booking_step_structure = {
+                "name": _lt("Schedule bookings"),
+                "current_href": "/shop/booking/1/schedule",
+                "back_button": _lt("Back to cart"),
+                "back_button_href": "/shop/cart",
+            }
+            steps.insert(
+                1, ("website_sale_resource_booking.scheduling", booking_step_structure)
+            )
+            steps[0][1]["main_button"] = booking_step_structure["name"]
+            steps[0][1]["main_button_href"] = booking_step_structure["current_href"]
+            steps[2][1]["back_button"] = booking_step_structure["name"]
+            steps[2][1]["back_button_href"] = booking_step_structure["current_href"]
+        return steps
diff --git a/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss b/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss
deleted file mode 100644
index 01511396d1..0000000000
--- a/website_sale_resource_booking/static/src/css/website_sale_resource_booking.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Tecnativa - Jairo Llopis
- * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
-
-.o_wizard_has_bookings + .progress-wizard {
-    .progress-wizard-step {
-        @include media-breakpoint-up(md) {
-            // 4 steps to buy
-            width: percentage(1/4);
-
-            .o_wizard_has_extra_step + & {
-                width: percentage(1/5);
-            }
-        }
-    }
-}
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.esm.js b/website_sale_resource_booking/static/src/js/tour_checkout.esm.js
new file mode 100644
index 0000000000..fcc44eaac2
--- /dev/null
+++ b/website_sale_resource_booking/static/src/js/tour_checkout.esm.js
@@ -0,0 +1,177 @@
+/** @odoo-module */
+/* Copyright 2021 Tecnativa - Jairo Llopis
+   Copyright 2025 Tecnativa - Víctor Martínez
+ * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
+
+import {registry} from "@web/core/registry";
+import * as tourUtils from "@website_sale/js/tours/tour_utils";
+
+registry.category("web_tour.tours").add("website_sale_resource_booking", {
+    url: "/shop",
+    steps: () => [
+        ...tourUtils.searchProduct("test not bookable product"),
+        {
+            content: "select test not bookable product",
+            trigger: '.oe_product_cart:first a:contains("test not bookable product")',
+            run: "click",
+        },
+        {
+            content: "click on add to cart",
+            trigger: '#product_detail form[action^="/shop/cart/update"] #add_to_cart',
+            run: "click",
+        },
+        ...tourUtils.searchProduct("test bookable product"),
+        {
+            trigger: 'form input[name="search"]',
+            run: "edit test bookable product",
+        },
+        {
+            trigger: 'form:has(input[name="search"]) .oe_search_button',
+        },
+        {
+            content: "select test bookable product",
+            trigger: '.oe_product_cart:first a:contains("test bookable product")',
+            run: "click",
+        },
+        {
+            content: "change quantity",
+            trigger:
+                '#product_detail form[action^="/shop/cart/update"] input[name=add_qty]',
+            run: "edit 3",
+        },
+        {
+            content: "click on add to cart",
+            trigger: '#product_detail form[action^="/shop/cart/update"] #add_to_cart',
+            run: "click",
+        },
+
+        tourUtils.goToCart({quantity: 4}),
+        {
+            // Go to next step
+            trigger: "a[name='website_sale_main_button']:contains('Schedule bookings')",
+            run: "click",
+        },
+        {
+            content: "Calendar is loaded",
+            trigger: ".o_booking_calendar",
+        },
+        {
+            content: "Validate calendar title is shown",
+            trigger: "h3:contains('Pre-schedule your booking')",
+        },
+        {
+            content: "Try next month if no slots",
+            trigger: ".alert-danger a:contains('Try next month')",
+            run: "click",
+        },
+        {
+            content: "Open March 1 calendar dropdown",
+            trigger: "#dropdown-trigger-2021-03-01",
+            run: "click",
+        },
+        {
+            trigger:
+                ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:00')",
+            run: "click",
+        },
+        {
+            trigger:
+                '.modal.show input[name="partner_name"], .modal input[name="partner_name"]',
+            run: "edit Mr. A",
+        },
+        {
+            trigger:
+                '.modal.show input[name="partner_email"], .modal input[name="partner_email"], .modal input[name="email"]',
+            run: "edit mr.a@example.com",
+        },
+        {
+            trigger: ".modal-dialog .btn:contains('Confirm booking')",
+            run: "click",
+        },
+        // Booking 2 of 3 (almost same as above)
+        {
+            content: "Try next month if no slots",
+            trigger: ".alert-danger a:contains('Try next month')",
+            run: "click",
+        },
+        {
+            content: "Open March 1 calendar dropdown",
+            trigger: "#dropdown-trigger-2021-03-01",
+            run: "click",
+        },
+
+        {
+            trigger:
+                ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:00')",
+            run: "click",
+        },
+        // Enter Mr. B details, and confirm
+        {
+            trigger:
+                '.modal.show input[name="partner_name"], .modal input[name="partner_name"]',
+            run: "edit Mr. B",
+        },
+        {
+            trigger:
+                '.modal.show input[name="partner_email"], .modal input[name="partner_email"], .modal input[name="email"]',
+            run: "edit mr.b@example.com",
+        },
+        {
+            trigger: ".modal-dialog .btn:contains('Confirm booking')",
+            run: "click",
+        },
+        {
+            content: "Try next month if no slots",
+            trigger: ".alert-danger a:contains('Try next month')",
+            run: "click",
+        },
+        {
+            content: "Open March 1 calendar dropdown",
+            trigger: "#dropdown-trigger-2021-03-01",
+            run: "click",
+        },
+
+        {
+            trigger:
+                ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:30')",
+            run: "click",
+        },
+        // Enter Mr. B details, and confirm
+        {
+            trigger:
+                '.modal.show input[name="partner_name"], .modal input[name="partner_name"]',
+            run: "edit Mr. C",
+        },
+        {
+            trigger:
+                '.modal.show input[name="partner_email"], .modal input[name="partner_email"], .modal input[name="email"]',
+            run: "edit mr.c@example.com",
+        },
+        {
+            trigger: ".modal-dialog .btn:contains('Confirm booking')",
+            run: "click",
+        },
+        tourUtils.goToCheckout(),
+        {
+            trigger: ".oe_website_sale",
+            run: function () {
+                $('input[name="phone"]').val("+32 485 118.218");
+                $('input[name="street"]').val("Street A");
+                $('input[name="city"]').val("City A");
+                $('input[name="zip"]').val("18503");
+                $("#country_id option:eq(1)").attr("selected", true);
+                // Integration with website_sale_vat_required
+                $('input[name="vat"]').val("US01234567891");
+                // Integration with website_sale_require_legal
+                $(".oe_website_sale input[name=accepted_legal_terms]").prop(
+                    "checked",
+                    true
+                );
+            },
+        },
+        {
+            trigger: ".btn-primary:contains('Save address')",
+        },
+        tourUtils.goToCheckout(),
+    ],
+});
diff --git a/website_sale_resource_booking/static/src/js/tour_checkout.js b/website_sale_resource_booking/static/src/js/tour_checkout.js
deleted file mode 100644
index a55c8401aa..0000000000
--- a/website_sale_resource_booking/static/src/js/tour_checkout.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright 2021 Tecnativa - Jairo Llopis
- * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
-
-odoo.define("website_sale_resource_booking.tour_checkout", function (require) {
-    "use strict";
-
-    var tour = require("web_tour.tour");
-
-    tour.register(
-        "website_sale_resource_booking_checkout",
-        {
-            url: "/shop?search=test not bookable product",
-            test: true,
-        },
-        [
-            // Add non-bookable product, to make sure we don't interfere
-            {
-                trigger: ".oe_product_cart a:contains('test not bookable product')",
-            },
-            {
-                trigger: "#add_to_cart",
-            },
-            {
-                trigger: ".oe_search_box",
-                run: "text test bookable product",
-            },
-            {
-                trigger: ".oe_search_button",
-            },
-            // Select bookable product
-            {
-                trigger: ".oe_product_cart a:contains('test bookable product')",
-            },
-            {
-                // Make sure it displays the booking message
-                extra_trigger:
-                    ".alert-info:containsTextLike('From the cart, you will be able to make a pre-reservation, which will expire in 1 hour')",
-                // Add one more
-                trigger: ".css_quantity .fa-plus",
-            },
-            // When there's 2 products, add another one
-            {
-                extra_trigger: ".css_quantity .quantity:propValue('2')",
-                trigger: ".css_quantity .fa-plus",
-            },
-            // When there's 3 products, add to cart
-            {
-                extra_trigger: ".css_quantity .quantity:propValue('3')",
-                trigger: "#add_to_cart",
-            },
-            {
-                trigger: "a[href='/shop/cart']",
-            },
-            {
-                // Check there's a booking step advertised in the checkout wizard
-                extra_trigger:
-                    ".progress-wizard-step.disabled:contains('Schedule bookings')",
-                // Go to next step
-                trigger: ".oe_cart .btn:contains('Process Checkout')",
-            },
-            // Booking 1 of 3
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    // Check we're in the correct booking step
-                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
-                    ":has(h3:contains('Pre-schedule your booking (1 of 3)'))",
-                    // We're using freezegun, so date is hardcoded
-                    ":has(.o_booking_calendar:contains('February 2021'))",
-                ].join(""),
-                // No free slots on February, go to March as suggested
-                trigger:
-                    ".alert-danger:contains('No free slots found this month.') a:contains('Try next month')",
-            },
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    // Check we're in the correct booking step
-                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
-                    ":has(h3:contains('Pre-schedule your booking (1 of 3)'))",
-                    ":has(.o_booking_calendar:contains('March 2021'))",
-                ].join(""),
-                // Open dropdown for March 1st
-                trigger: "#dropdown-trigger-2021-03-01",
-            },
-            // Select 09:00
-            {
-                trigger:
-                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:00')",
-            },
-            // Enter Mr. A details, and confirm
-            {
-                trigger: ".modal-dialog input[name=partner_name]",
-                run: "text Mr. A",
-            },
-            {
-                trigger: ".modal-dialog input[name=partner_email]",
-                run: "text mr.a@example.com",
-            },
-            {
-                // Check we have an alert about payment timeout
-                extra_trigger:
-                    ".alert-warning:containsTextLike('If unpaid, this pre-reservation will expire in 1 hour')",
-                trigger: ".modal-dialog .btn:contains('Confirm booking')",
-            },
-            // Booking 2 of 3 (almost same as above)
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
-                    ":has(h3:contains('Pre-schedule your booking (2 of 3)'))",
-                    ":has(.o_booking_calendar:contains('February 2021'))",
-                ].join(""),
-                trigger:
-                    ".alert-danger:contains('No free slots found this month.') a:contains('Try next month')",
-            },
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
-                    ":has(h3:contains('Pre-schedule your booking (2 of 3)'))",
-                    ":has(.o_booking_calendar:contains('March 2021'))",
-                ].join(""),
-                trigger: "#dropdown-trigger-2021-03-01",
-            },
-            {
-                trigger:
-                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:00')",
-            },
-            // Enter Mr. B details, and confirm
-            {
-                trigger: ".modal-dialog input[name=partner_name]",
-                run: "text Mr. B",
-            },
-            {
-                trigger: ".modal-dialog input[name=partner_email]",
-                run: "text mr.b@example.com",
-            },
-            {
-                extra_trigger:
-                    ".alert-warning:containsTextLike('If unpaid, this pre-reservation will expire in 1 hour')",
-                trigger: ".modal-dialog .btn:contains('Confirm booking')",
-            },
-            // Booking 3 of 3
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
-                    ":has(h3:contains('Pre-schedule your booking (3 of 3)'))",
-                    ":has(.o_booking_calendar:contains('February 2021'))",
-                ].join(""),
-                trigger:
-                    ".alert-danger:contains('No free slots found this month.') a:contains('Try next month')",
-            },
-            {
-                extra_trigger: [
-                    ".oe_website_sale",
-                    ":has(.progress-wizard-step.active:contains('Schedule bookings'))",
-                    ":has(h3:contains('Pre-schedule your booking (3 of 3)'))",
-                    ":has(.o_booking_calendar:contains('March 2021'))",
-                    ":has(tfoot:containsTextLike('All times are displayed using this timezone: UTC'))",
-                ].join(""),
-                trigger: "#dropdown-trigger-2021-03-01",
-            },
-            {
-                // This time 09:00 is full because RBT has only 2 RBC available, and thus we can't see it
-                extra_trigger:
-                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu:not(:has(button:contains('09:00')))",
-                trigger:
-                    ".dropdown:has(#dropdown-trigger-2021-03-01) .dropdown-menu button:contains('09:30')",
-            },
-            // Enter Mr. C details, and confirm
-            {
-                trigger: ".modal-dialog input[name=partner_name]",
-                run: "text Mr. C",
-            },
-            {
-                trigger: ".modal-dialog input[name=partner_email]",
-                run: "text mr.c@example.com",
-            },
-            {
-                extra_trigger:
-                    ".alert-warning:containsTextLike('If unpaid, this pre-reservation will expire in 1 hour')",
-                trigger: ".modal-dialog .btn:contains('Confirm booking')",
-            },
-            // Fill buyer address
-            {
-                trigger: ".oe_website_sale input[name=phone]",
-                run: "text +32 485 118.218",
-            },
-            {
-                trigger: ".oe_website_sale input[name=street]",
-                run: "text Street A",
-            },
-            {
-                trigger: ".oe_website_sale input[name=city]",
-                run: "text City A",
-            },
-            {
-                trigger: ".oe_website_sale input[name=zip]",
-                run: "text 18503",
-            },
-            {
-                trigger: ".oe_website_sale select[name=country_id]",
-                run: "text Fiji",
-            },
-            {
-                trigger: ".oe_website_sale",
-                run: function () {
-                    // Integration with website_sale_vat_required
-                    $(".oe_website_sale input[name=vat]").val("US01234567891");
-                    // Integration with website_sale_require_legal
-                    $(".oe_website_sale input[name=accepted_legal_terms]").prop(
-                        "checked",
-                        true
-                    );
-                },
-            },
-            {
-                trigger: ".oe_website_sale .btn:contains('Next')",
-            },
-            {
-                trigger: "a[href='/shop/confirm_order']",
-            },
-            {
-                trigger: ".oe_website_sale .btn:contains('Pay Now')",
-            },
-            {
-                trigger: '#payment_method label:contains("Wire Transfer")',
-            },
-            // No need to wait for payment for this test case; that's tested elsewhere
-            {
-                extra_trigger:
-                    '#payment_method label:contains("Wire Transfer") input:checked,#payment_method:not(:has("input:radio:visible"))',
-                trigger:
-                    'button[name="o_payment_submit_button"]:visible:not(:disabled)',
-            },
-        ]
-    );
-});
diff --git a/website_sale_resource_booking/templates/website_sale.xml b/website_sale_resource_booking/templates/website_sale.xml
index 7ff761b4b9..d50cc74c76 100644
--- a/website_sale_resource_booking/templates/website_sale.xml
+++ b/website_sale_resource_booking/templates/website_sale.xml
@@ -19,40 +19,6 @@
             </div>
         </xpath>
     </template>
-    <template
-        id="wizard_checkout"
-        inherit_id="website_sale.wizard_checkout"
-        priority="50"
-    >
-        <!-- Add a "flag element" to trigger style variation -->
-        <xpath expr="//div[hasclass('wizard')]/div" position="before">
-            <span
-                class="o_wizard_has_bookings d-none"
-                t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')"
-            />
-        </xpath>
-        <xpath expr="//div[@id='wizard-step10']" position="after">
-            <t
-                t-if="website_sale_order.mapped('order_line.product_id.resource_booking_type_id')"
-            >
-                <a
-                    class="no-decoration"
-                    t-att-href="step &gt; 15 and '/shop/booking/1/schedule'"
-                >
-                    <div
-                        id="wizard-step15"
-                        t-attf-class="progress-wizard-step #{'active' if step == 15 else 'complete' if step &gt; 15 else 'disabled'}"
-                    >
-                        <div class="progress-wizard-bar d-none d-md-block" />
-                        <span class="progress-wizard-dot d-none d-md-inline-block" />
-                        <div
-                            class="text-center progress-wizard-steplabel"
-                        >Schedule bookings</div>
-                    </div>
-                </a>
-            </t>
-        </xpath>
-    </template>
     <template
         id="scheduling_calendar"
         name="Resource Booking Calendar for Checkout"
@@ -113,15 +79,7 @@
                 <div class="container oe_website_sale py-2">
                     <div class="row">
                         <div class="col-12">
-                            <t t-call="website_sale.wizard_checkout">
-                                <t t-set="step" t-value="15" />
-                            </t>
-                        </div>
-                        <div class="col-12 col-xl-auto order-xl-2 d-none d-xl-block">
-                            <t t-call="website_sale.cart_summary">
-                                <t t-set="hide_coupon">True</t>
-                                <t t-set="redirect" t-valuef="/shop/cart" />
-                            </t>
+                            <t t-call="website_sale.wizard_checkout" />
                         </div>
                         <div class="col-12 col-xl order-xl-1 oe_cart">
                             <h3 t-esc="wizard_title" />
diff --git a/website_sale_resource_booking/tests/test_ui.py b/website_sale_resource_booking/tests/test_ui.py
index b39a644478..1e2bc752b9 100644
--- a/website_sale_resource_booking/tests/test_ui.py
+++ b/website_sale_resource_booking/tests/test_ui.py
@@ -1,4 +1,5 @@
 # Copyright 2021 Tecnativa - Jairo Llopis
+# Copyright 2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import time
@@ -6,26 +7,34 @@
 
 from freezegun import freeze_time
 
-from odoo.tests.common import Form, HttpCase, tagged
+from odoo import Command
+from odoo.tests import HttpCase, new_test_user, tagged
+from odoo.tools import mute_logger
+
+from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
+from odoo.addons.website.tools import MockRequest
 
 from ...resource_booking.tests.common import create_test_data
+from ...website_sale_resource_booking.controllers.main import WebsiteSale
 
 
-@freeze_time("2021-02-26 09:00:00", tick=True)
 @tagged("post_install", "-at_install")
 class UICase(HttpCase):
-    def setUp(self):
-        super().setUp()
-        create_test_data(self)
-        self.product = self.env["product.product"].create(
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
+        create_test_data(cls)
+        cls.public_customer = cls.env["res.partner"].create({"name": "Customer X"})
+        cls.product = cls.env["product.product"].create(
             {
                 "list_price": 100,
                 "name": "test bookable product",
-                "resource_booking_type_id": self.rbt.id,
+                "resource_booking_type_id": cls.rbt.id,
                 "website_published": True,
             }
         )
-        self.normal_product = self.env["product.product"].create(
+        cls.normal_product = cls.env["product.product"].create(
             {
                 "list_price": 50,
                 "name": "test not bookable product",
@@ -34,28 +43,27 @@ def setUp(self):
         )
         # If the created user has the same name as the invited users,
         # the invitation does not reach the user.
-        self.user = self.env["res.users"].create(
-            {
-                "name": "user",
-                "email": "test@example.com",
-                "login": "booking_test_user",
-                "password": "booking_test_user",
-                "groups_id": [(4, self.env.ref("base.group_user").id, 0)],
-            }
-        )
+        cls.user = new_test_user(cls.env, login="booking_test_user")
         # Clean up pending emails, to avoid polluting tests
-        self.env["mail.mail"].search([("state", "=", "outgoing")]).unlink()
+        cls.env["mail.mail"].search([("state", "=", "outgoing")]).unlink()
 
+    def setUp(self):
+        super().setUp()
+        self.ResourceBookingController = WebsiteSale()
+
+    @freeze_time("2021-02-26 09:00:00", tick=True)
     def test_checkout(self):
         """Booking checkout tour."""
         # A visitor called Mr. A buys 3 booking products
         self.start_tour(
-            "/shop?search=test not bookable product",
-            "website_sale_resource_booking_checkout",
+            "/shop",
+            "website_sale_resource_booking",
             login="booking_test_user",
-            step_delay=300,
-        )  # Find Mr. A's cart
-        so = self.env["sale.order"].search([("partner_id", "=", "user")])
+        )
+        # Find Mr. A's cart
+        so = self.env["sale.order"].search(
+            [("partner_id", "=", self.user.partner_id.id)]
+        )
         bookings = so.resource_booking_ids
         # It's linked to 3 scheduled bookings, that belong to him
         self.assertEqual(len(bookings), 3)
@@ -64,6 +72,7 @@ def test_checkout(self):
         # Confirm sale (which would happen automatically if paid online)
         so.action_confirm()
         # Now the 3 bookings are linked to the partners filled at checkout
+        so._onchange_partner_id_warning()
         self.assertEqual(
             set(bookings.mapped("partner_id.name")), {"Mr. A", "Mr. B", "Mr. C"}
         )
@@ -73,24 +82,29 @@ def test_checkout(self):
         )
         # The mail queue, later, will send the expected notifications to see
         # resource bookings in portal, but not to event attendance
-        pending_mails = self.env["mail.mail"].search([("state", "=", "outgoing")])
-        self.assertGreaterEqual(
-            set(pending_mails.mapped("subject")),
-            {
-                # Calendar invitations with attached .ics file
-                "Invitation to Mr. A - Test resource booking type",
-                "Invitation to Mr. B - Test resource booking type",
-                "Invitation to Mr. C - Test resource booking type",
-                # Portal invitations with tokenized link
-                "You are invited to access Mr. A - Test resource booking type "
-                "- 03/01/2021 at (09:00:00 To 09:30:00) (UTC)",
-                "You are invited to access Mr. B - Test resource booking type "
-                "- 03/01/2021 at (09:00:00 To 09:30:00) (UTC)",
-                "You are invited to access Mr. C - Test resource booking type "
-                "- 03/01/2021 at (09:30:00 To 10:00:00) (UTC)",
-            },
+
+        pending_mails = self.env["mail.mail"].search(
+            [
+                ("state", "=", "outgoing"),
+                ("subject", "not ilike", "Pending Order"),
+            ]
         )
+        actual_invitations = {
+            subject.strip()
+            for subject in pending_mails.mapped("subject")
+            if subject.startswith("Invitation to access")
+        }
+        expected_invitations = {
+            "Invitation to access Mr. A - Test resource booking type - "
+            "03/01/2021 at (09:00:00 To 09:30:00) (UTC)",
+            "Invitation to access Mr. B - Test resource booking type - "
+            "03/01/2021 at (09:00:00 To 09:30:00) (UTC)",
+            "Invitation to access Mr. C - Test resource booking type - "
+            "03/01/2021 at (09:30:00 To 10:00:00) (UTC)",
+        }
+        self.assertGreaterEqual(actual_invitations, expected_invitations)
 
+    @mute_logger("odoo.models.unlink")
     def test_expiration_cron(self):
         """Abandoned cart expires bookings."""
         website = self.env["website"].get_current_website()
@@ -106,7 +120,9 @@ def test_expiration_cron(self):
                     "website_id": website.id,
                     "partner_id": self.partner.id,
                     "order_line": [
-                        (0, 0, {"product_id": self.product.id, "product_uom_qty": 2})
+                        Command.create(
+                            {"product_id": self.product.id, "product_uom_qty": 2}
+                        )
                     ],
                 }
             )
@@ -116,10 +132,88 @@ def test_expiration_cron(self):
         dt = datetime(2021, 3, 1, 9)
         bookings = order.resource_booking_ids
         for booking in bookings:
-            with Form(booking) as booking_f:
-                booking_f.start = dt
+            booking.start = dt
         self.assertEqual(bookings.mapped("state"), ["scheduled"] * 2)
         # Expiration cron does its job
         time.sleep(3)
         cron.method_direct_trigger()
         self.assertEqual(bookings.mapped("state"), ["canceled"] * 2)
+
+    def test_booking_redirection_on_inactive_booking(self):
+        website = self.env["website"].get_current_website()
+        with MockRequest(self.env, website=website):
+            order = (
+                self.env["sale.order"]
+                .with_context(website_id=website.id)
+                .create(
+                    {
+                        "website_id": website.id,
+                        "partner_id": self.partner.id,
+                        "order_line": [
+                            Command.create(
+                                {"product_id": self.product.id, "product_uom_qty": 2}
+                            )
+                        ],
+                    }
+                )
+            )
+            bookings = order.resource_booking_ids
+            bookings.action_cancel()
+            self.ResourceBookingController._booking_redirection(bookings[0], 1)
+            self.assertEqual(bookings.mapped("state"), ["pending"] * 2)
+            self.ResourceBookingController._check_cart(order)
+
+    def test_booking_sale_order(self):
+        order = self.env["sale.order"].create(
+            {
+                "partner_id": self.partner.id,
+                "order_line": [
+                    Command.create(
+                        {"product_id": self.product.id, "product_uom_qty": 2}
+                    )
+                ],
+            }
+        )
+        order.write({"partner_id": self.public_customer.id})
+        order._onchange_partner_id_warning()
+
+    @mute_logger("odoo.models.unlink")
+    def test_partner_id_change(self):
+        """Abandoned cart expires bookings."""
+        website = self.env["website"].create(
+            {"name": "Test Website", "partner_id": self.partner.id}
+        )
+        # Set product expiration to 2 second (approx... you know... floats)
+        self.product.resource_booking_timeout = 2 / 60 / 60
+        # Emulate a cart
+        order = (
+            self.env["sale.order"]
+            .with_context(website_id=website.id)
+            .create(
+                {
+                    "website_id": website.id,
+                    "partner_id": self.partner.id,
+                    "order_line": [
+                        Command.create(
+                            {"product_id": self.product.id, "product_uom_qty": 2}
+                        )
+                    ],
+                }
+            )
+        )
+        self.assertEqual(len(order.resource_booking_ids), 2)
+        # Emulate the user prereserved both bookings
+        dt = datetime(2021, 3, 1, 9)
+        bookings = order.resource_booking_ids
+        for booking in bookings:
+            booking.start = dt
+        wizard = self.env["sale.order.booking.confirm"].create(
+            {
+                "order_id": order.id,
+            }
+        )
+        self.assertEqual(order.resource_booking_count, 2)
+        wizard = wizard.with_context(trigger_booking_email=True)
+        wizard.action_invite()
+        order._onchange_partner_id_warning()
+        order.action_confirm()
diff --git a/website_sale_resource_booking/views/product_template_view.xml b/website_sale_resource_booking/views/product_template_view.xml
index a516953f13..7823437da5 100644
--- a/website_sale_resource_booking/views/product_template_view.xml
+++ b/website_sale_resource_booking/views/product_template_view.xml
@@ -9,13 +9,13 @@
             name="inherit_id"
             ref="sale_resource_booking.product_template_form_view"
         />
-        <field name="groups_id" eval="[(4, ref('resource_booking.group_user'), 0)]" />
         <field name="arch" type="xml">
             <group name='booking' position='inside'>
                 <field
                     name="resource_booking_timeout"
                     widget="float_time"
-                    attrs="{'invisible': [('resource_booking_type_id', '=', False)]}"
+                    invisible="not resource_booking_type_id"
+                    groups="resource_booking.group_user"
                 />
             </group>
         </field>