From 4138961cb22e335890e87aeb32ef715588eade1b Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Thu, 5 May 2022 10:38:49 +0200
Subject: [PATCH 01/16] [ADD] rotordc_one_optional_product_per_categ

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 .../__init__.py                               |  0
 .../__manifest__.py                           | 25 +++++++++++++++
 .../readme/CONTRIBUTORS.rst                   |  3 ++
 .../readme/DESCRIPTION.rst                    |  0
 .../src/js/product_configurator_modal.js      | 32 +++++++++++++++++++
 .../views/assets.xml                          | 15 +++++++++
 .../sale_product_configurator_templates.xml   | 12 +++++++
 .../rotordc_one_optional_product_per_categ    |  1 +
 .../setup.py                                  |  6 ++++
 9 files changed, 94 insertions(+)
 create mode 100644 rotordc_one_optional_product_per_categ/__init__.py
 create mode 100644 rotordc_one_optional_product_per_categ/__manifest__.py
 create mode 100644 rotordc_one_optional_product_per_categ/readme/CONTRIBUTORS.rst
 create mode 100644 rotordc_one_optional_product_per_categ/readme/DESCRIPTION.rst
 create mode 100644 rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
 create mode 100644 rotordc_one_optional_product_per_categ/views/assets.xml
 create mode 100644 rotordc_one_optional_product_per_categ/views/sale_product_configurator_templates.xml
 create mode 120000 setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ
 create mode 100644 setup/rotordc_one_optional_product_per_categ/setup.py

diff --git a/rotordc_one_optional_product_per_categ/__init__.py b/rotordc_one_optional_product_per_categ/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/rotordc_one_optional_product_per_categ/__manifest__.py b/rotordc_one_optional_product_per_categ/__manifest__.py
new file mode 100644
index 00000000..9dafe780
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/__manifest__.py
@@ -0,0 +1,25 @@
+# Copyright 2022 Coop IT Easy SCRLfs
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "RotorDC One Optional Product Per Category",
+    "summary": """
+        Only allow one optional product in the eCommerce per internal category.""",
+    "version": "12.0.1.0.0",
+    "category": "Sales",
+    "website": "https://coopiteasy.be",
+    "author": "Coop IT Easy SCRLfs",
+    "license": "AGPL-3",
+    "application": False,
+    "depends": [
+        "sale",
+        "web",
+    ],
+    "excludes": [],
+    "data": [
+        "views/assets.xml",
+        "views/sale_product_configurator_templates.xml",
+    ],
+    "demo": [],
+    "qweb": [],
+}
diff --git a/rotordc_one_optional_product_per_categ/readme/CONTRIBUTORS.rst b/rotordc_one_optional_product_per_categ/readme/CONTRIBUTORS.rst
new file mode 100644
index 00000000..9f39efbc
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Coop IT Easy SCRLfs <https://coopiteasy.be>`_:
+
+  * Carmen Bianca Bakker
diff --git a/rotordc_one_optional_product_per_categ/readme/DESCRIPTION.rst b/rotordc_one_optional_product_per_categ/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..e69de29b
diff --git a/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js b/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
new file mode 100644
index 00000000..4a84f01a
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
@@ -0,0 +1,32 @@
+odoo.define("rotordc_one_optional_product_per_categ.o_p_modal", function (require) {
+    "use strict";
+
+    var OptionalProductsModal = require("sale.OptionalProductsModal");
+
+    OptionalProductsModal.include({
+        _getCategId: function (element) {
+            return element.find("input.product_categ_id").val();
+        },
+        _categIdFromProductId: function (product_id) {
+            var product = this.$modal.find(`input.product_id[value=${product_id}]`);
+            if (product === null) {
+                // FIXME: error handling idk
+                return undefined;
+            }
+            product = product.parents(".js_product:first");
+            return this._getCategId(product);
+        },
+        _onAddOption: function ($modal, $parent, productTemplateId) {
+            var categ_id = this._getCategId($parent);
+            var products = this.getSelectedProducts();
+            for (var i = 0; i < products.length; i++) {
+                if (this._categIdFromProductId(products[i].product_id) === categ_id) {
+                    // TODO: Pop-up, cleanly abort.
+                    console.log("SAME CATEGORY ABORT");
+                    return;
+                }
+            }
+            this._super($modal, $parent, productTemplateId);
+        },
+    });
+});
diff --git a/rotordc_one_optional_product_per_categ/views/assets.xml b/rotordc_one_optional_product_per_categ/views/assets.xml
new file mode 100644
index 00000000..90752b5d
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/views/assets.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!--
+        TODO: sale's product_configurator_modal.js uses web.assets_backend, but the
+        script ends up in web.assets_frontend.js. I have no idea why/how.
+    -->
+    <template id="assets_frontend" inherit_id="web.assets_frontend">
+        <xpath expr="script[last()]" position="after">
+            <script
+                type="text/javascript"
+                src="/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js"
+            />
+        </xpath>
+    </template>
+</odoo>
diff --git a/rotordc_one_optional_product_per_categ/views/sale_product_configurator_templates.xml b/rotordc_one_optional_product_per_categ/views/sale_product_configurator_templates.xml
new file mode 100644
index 00000000..cfc9285e
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/views/sale_product_configurator_templates.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="optional_product_items" inherit_id="sale.optional_product_items">
+        <xpath expr="//td[hasclass('td-img')]" position="inside">
+            <input
+                type="hidden"
+                class="product_categ_id"
+                t-att-value="product.categ_id.id"
+            />
+        </xpath>
+    </template>
+</odoo>
diff --git a/setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ b/setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ
new file mode 120000
index 00000000..e5be731f
--- /dev/null
+++ b/setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ
@@ -0,0 +1 @@
+../../../../rotordc_one_optional_product_per_categ
\ No newline at end of file
diff --git a/setup/rotordc_one_optional_product_per_categ/setup.py b/setup/rotordc_one_optional_product_per_categ/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/rotordc_one_optional_product_per_categ/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 32f2e967c2d2fa3a822f5c198db82d7d00b070ce Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Tue, 10 May 2022 15:39:10 +0200
Subject: [PATCH 02/16] [FIX] rotordc_one_optional_product_per_categ: Disable
 cart buttons

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 .../src/js/product_configurator_modal.js      | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js b/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
index 4a84f01a..343ad691 100644
--- a/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
+++ b/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
@@ -4,28 +4,44 @@ odoo.define("rotordc_one_optional_product_per_categ.o_p_modal", function (requir
     var OptionalProductsModal = require("sale.OptionalProductsModal");
 
     OptionalProductsModal.include({
-        _getCategId: function (element) {
-            return element.find("input.product_categ_id").val();
-        },
-        _categIdFromProductId: function (product_id) {
-            var product = this.$modal.find(`input.product_id[value=${product_id}]`);
-            if (product === null) {
-                // FIXME: error handling idk
-                return undefined;
-            }
-            product = product.parents(".js_product:first");
-            return this._getCategId(product);
+        _getCategId: function ($element) {
+            return $element.find("input.product_categ_id").val();
         },
         _onAddOption: function ($modal, $parent, productTemplateId) {
             var categ_id = this._getCategId($parent);
-            var products = this.getSelectedProducts();
-            for (var i = 0; i < products.length; i++) {
-                if (this._categIdFromProductId(products[i].product_id) === categ_id) {
-                    // TODO: Pop-up, cleanly abort.
-                    console.log("SAME CATEGORY ABORT");
-                    return;
+            var self = this;
+
+            // Disable all 'add to cart' buttons of products of the same
+            // internal category.
+            $modal
+                .find(".js_product:not(.in_cart):not(.main_product)")
+                .each(function () {
+                    var $item = $(this);
+                    var item_product_id = $item.find(".product_id").val();
+                    if (
+                        item_product_id !== $parent.find(".product_id").val() &&
+                        self._getCategId($item) === categ_id
+                    ) {
+                        var $button = $item.find("a.js_add");
+                        $button.addClass("disabled");
+                    }
+                });
+
+            this._super($modal, $parent, productTemplateId);
+        },
+        _onRemoveOption: function ($modal, $parent, productTemplateId) {
+            var categ_id = this._getCategId($parent);
+            var self = this;
+
+            // Re-enable all buttons.
+            $modal.find(".js_product:not(.main_product)").each(function () {
+                var $item = $(this);
+                if (self._getCategId($item) === categ_id) {
+                    var $button = $item.find("a.js_add");
+                    $button.removeClass("disabled");
                 }
-            }
+            });
+
             this._super($modal, $parent, productTemplateId);
         },
     });

From 026a580ad71e4eefcff20bd746fe14687b8baedb Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Wed, 11 May 2022 15:48:32 +0200
Subject: [PATCH 03/16] [ADD] rotordc_one_optional_product_per_categ: Enforce
 that all internal categories are used before checking out

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 .../__init__.py                               |  1 +
 .../__manifest__.py                           |  1 +
 .../controllers/__init__.py                   |  1 +
 .../controllers/main.py                       | 62 +++++++++++++++++++
 .../views/templates.xml                       | 41 ++++++++++++
 5 files changed, 106 insertions(+)
 create mode 100644 rotordc_one_optional_product_per_categ/controllers/__init__.py
 create mode 100644 rotordc_one_optional_product_per_categ/controllers/main.py
 create mode 100644 rotordc_one_optional_product_per_categ/views/templates.xml

diff --git a/rotordc_one_optional_product_per_categ/__init__.py b/rotordc_one_optional_product_per_categ/__init__.py
index e69de29b..e046e49f 100644
--- a/rotordc_one_optional_product_per_categ/__init__.py
+++ b/rotordc_one_optional_product_per_categ/__init__.py
@@ -0,0 +1 @@
+from . import controllers
diff --git a/rotordc_one_optional_product_per_categ/__manifest__.py b/rotordc_one_optional_product_per_categ/__manifest__.py
index 9dafe780..fde941bd 100644
--- a/rotordc_one_optional_product_per_categ/__manifest__.py
+++ b/rotordc_one_optional_product_per_categ/__manifest__.py
@@ -19,6 +19,7 @@
     "data": [
         "views/assets.xml",
         "views/sale_product_configurator_templates.xml",
+        "views/templates.xml",
     ],
     "demo": [],
     "qweb": [],
diff --git a/rotordc_one_optional_product_per_categ/controllers/__init__.py b/rotordc_one_optional_product_per_categ/controllers/__init__.py
new file mode 100644
index 00000000..12a7e529
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/rotordc_one_optional_product_per_categ/controllers/main.py b/rotordc_one_optional_product_per_categ/controllers/main.py
new file mode 100644
index 00000000..5e8a4f72
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/controllers/main.py
@@ -0,0 +1,62 @@
+# SPDX-FileCopyrightText: 2022 Coop IT Easy SCRLfs
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from odoo import http
+from odoo.http import request
+
+from odoo.addons.website_sale.controllers.main import WebsiteSale
+
+
+class MissingCategoryException(Exception):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args)
+        self.unused_categs = kwargs.get("unused_categs")
+
+
+def _verify_products_have_all_optional_products(env, order):
+    """On an order, verify that each product has chosen one optional product of
+    each available category to that product.
+
+    Return a Dict[sale.order.line, product.category] with all order lines that
+    have missing categories.
+    """
+    order_line_unused_map = {}
+    for order_line in order.order_line:
+        try:
+            _verify_line(order_line)
+        except MissingCategoryException as err:
+            order_line_unused_map[order_line] = err.unused_categs
+    return order_line_unused_map
+
+
+def _verify_line(order_line):
+    # FIXME: Consider also raising an exception if there is a duplicate encounter.
+    categ_ids = {
+        template_id.categ_id
+        for template_id in order_line.product_id.optional_product_ids
+    }
+    encountered = {line.product_id.categ_id for line in order_line.option_line_ids}
+    # unused_categs is all elements in categ_ids that are not in encountered,
+    # NOT the other way around. The other way around is not tested, assuming
+    # that Odoo works soundly.
+    unused_categs = categ_ids.difference(encountered)
+    if unused_categs:
+        raise MissingCategoryException(unused_categs=unused_categs)
+
+
+class WebsiteSaleDelivery(WebsiteSale):
+    @http.route()
+    def checkout(self, **post):
+        order = request.website.sale_get_order()
+        result = _verify_products_have_all_optional_products(request.env, order)
+
+        if result:
+            return request.render(
+                "rotordc_one_optional_product_per_categ.missing_categories",
+                {
+                    "order_line_unused_map": result,
+                },
+            )
+
+        return super().checkout(**post)
diff --git a/rotordc_one_optional_product_per_categ/views/templates.xml b/rotordc_one_optional_product_per_categ/views/templates.xml
new file mode 100644
index 00000000..ae576215
--- /dev/null
+++ b/rotordc_one_optional_product_per_categ/views/templates.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="missing_categories" name="Incomplete order">
+        <t t-call="website.layout">
+            <div id="wrap">
+                <div class="container oe_website_sale">
+                    <h2 class="o_page_header mt8">Your order is incomplete</h2>
+                    <p
+                    >The order checkout was interrupted because your order is not complete. You added one or more products to your cart that are not completely configured. The products are listed below together with the configurations that are missing.</p>
+                    <t t-foreach="order_line_unused_map" t-as="line">
+                        <div>
+                            <t t-call="website_sale.cart_line_product_link">
+                                <strong t-field="line.name_short" />
+                            </t>
+                            <br />
+                            Missing categories:
+                            <ul>
+                                <t t-foreach="line_value" t-as="categ">
+                                    <li><t t-esc="categ.name" /></li>
+                                </t>
+                            </ul>
+                            <br />
+                        </div>
+                    </t>
+                    <p>In order to rectify this problem, take the following steps:</p>
+                    <ol>
+                        <li>Go to <a
+                                href="/shop/cart/"
+                            >your cart</a> and remove the above listed products.</li>
+                        <li
+                        >Re-add the products. When you do, make sure to also add any available 'Optional Products'.</li>
+                        <li>Try checking out again.</li>
+                    </ol>
+                    <p>If this problem persists, please contact us.</p>
+                </div>
+            </div>
+
+        </t>
+    </template>
+
+</odoo>

From 63c3cb8d138071caff2b1e283bd2e4bb9a35a15d Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Wed, 11 May 2022 15:50:04 +0200
Subject: [PATCH 04/16] =?UTF-8?q?[MOV]=20rotordc=5Fone=5Foptional=5Fproduc?=
 =?UTF-8?q?t=5Fper=5Fcateg=20=E2=86=92=20rotordc=5Foptional=5Fproduct?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 .../__init__.py                                               | 0
 .../__manifest__.py                                           | 4 ++--
 .../controllers/__init__.py                                   | 0
 .../controllers/main.py                                       | 2 +-
 .../readme/CONTRIBUTORS.rst                                   | 0
 .../readme/DESCRIPTION.rst                                    | 0
 .../static/src/js/product_configurator_modal.js               | 2 +-
 .../views/assets.xml                                          | 2 +-
 .../views/sale_product_configurator_templates.xml             | 0
 .../views/templates.xml                                       | 0
 .../odoo/addons/rotordc_one_optional_product_per_categ        | 1 -
 .../odoo/addons/rotordc_optional_product                      | 1 +
 .../setup.py                                                  | 0
 13 files changed, 6 insertions(+), 6 deletions(-)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/__init__.py (100%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/__manifest__.py (79%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/controllers/__init__.py (100%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/controllers/main.py (96%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/readme/CONTRIBUTORS.rst (100%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/readme/DESCRIPTION.rst (100%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/static/src/js/product_configurator_modal.js (95%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/views/assets.xml (81%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/views/sale_product_configurator_templates.xml (100%)
 rename {rotordc_one_optional_product_per_categ => rotordc_optional_product}/views/templates.xml (100%)
 delete mode 120000 setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ
 create mode 120000 setup/rotordc_optional_product/odoo/addons/rotordc_optional_product
 rename setup/{rotordc_one_optional_product_per_categ => rotordc_optional_product}/setup.py (100%)

diff --git a/rotordc_one_optional_product_per_categ/__init__.py b/rotordc_optional_product/__init__.py
similarity index 100%
rename from rotordc_one_optional_product_per_categ/__init__.py
rename to rotordc_optional_product/__init__.py
diff --git a/rotordc_one_optional_product_per_categ/__manifest__.py b/rotordc_optional_product/__manifest__.py
similarity index 79%
rename from rotordc_one_optional_product_per_categ/__manifest__.py
rename to rotordc_optional_product/__manifest__.py
index fde941bd..458fc254 100644
--- a/rotordc_one_optional_product_per_categ/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -2,9 +2,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    "name": "RotorDC One Optional Product Per Category",
+    "name": "RotorDC Optional Product",
     "summary": """
-        Only allow one optional product in the eCommerce per internal category.""",
+        Custom modifications regarding RotorDC's use of optional products.""",
     "version": "12.0.1.0.0",
     "category": "Sales",
     "website": "https://coopiteasy.be",
diff --git a/rotordc_one_optional_product_per_categ/controllers/__init__.py b/rotordc_optional_product/controllers/__init__.py
similarity index 100%
rename from rotordc_one_optional_product_per_categ/controllers/__init__.py
rename to rotordc_optional_product/controllers/__init__.py
diff --git a/rotordc_one_optional_product_per_categ/controllers/main.py b/rotordc_optional_product/controllers/main.py
similarity index 96%
rename from rotordc_one_optional_product_per_categ/controllers/main.py
rename to rotordc_optional_product/controllers/main.py
index 5e8a4f72..e85033b7 100644
--- a/rotordc_one_optional_product_per_categ/controllers/main.py
+++ b/rotordc_optional_product/controllers/main.py
@@ -53,7 +53,7 @@ def checkout(self, **post):
 
         if result:
             return request.render(
-                "rotordc_one_optional_product_per_categ.missing_categories",
+                "rotordc_optional_product.missing_categories",
                 {
                     "order_line_unused_map": result,
                 },
diff --git a/rotordc_one_optional_product_per_categ/readme/CONTRIBUTORS.rst b/rotordc_optional_product/readme/CONTRIBUTORS.rst
similarity index 100%
rename from rotordc_one_optional_product_per_categ/readme/CONTRIBUTORS.rst
rename to rotordc_optional_product/readme/CONTRIBUTORS.rst
diff --git a/rotordc_one_optional_product_per_categ/readme/DESCRIPTION.rst b/rotordc_optional_product/readme/DESCRIPTION.rst
similarity index 100%
rename from rotordc_one_optional_product_per_categ/readme/DESCRIPTION.rst
rename to rotordc_optional_product/readme/DESCRIPTION.rst
diff --git a/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js b/rotordc_optional_product/static/src/js/product_configurator_modal.js
similarity index 95%
rename from rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
rename to rotordc_optional_product/static/src/js/product_configurator_modal.js
index 343ad691..1f2589d4 100644
--- a/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js
+++ b/rotordc_optional_product/static/src/js/product_configurator_modal.js
@@ -1,4 +1,4 @@
-odoo.define("rotordc_one_optional_product_per_categ.o_p_modal", function (require) {
+odoo.define("rotordc_optional_product.OptionalProductsModal", function (require) {
     "use strict";
 
     var OptionalProductsModal = require("sale.OptionalProductsModal");
diff --git a/rotordc_one_optional_product_per_categ/views/assets.xml b/rotordc_optional_product/views/assets.xml
similarity index 81%
rename from rotordc_one_optional_product_per_categ/views/assets.xml
rename to rotordc_optional_product/views/assets.xml
index 90752b5d..9a648854 100644
--- a/rotordc_one_optional_product_per_categ/views/assets.xml
+++ b/rotordc_optional_product/views/assets.xml
@@ -8,7 +8,7 @@
         <xpath expr="script[last()]" position="after">
             <script
                 type="text/javascript"
-                src="/rotordc_one_optional_product_per_categ/static/src/js/product_configurator_modal.js"
+                src="/rotordc_optional_product/static/src/js/product_configurator_modal.js"
             />
         </xpath>
     </template>
diff --git a/rotordc_one_optional_product_per_categ/views/sale_product_configurator_templates.xml b/rotordc_optional_product/views/sale_product_configurator_templates.xml
similarity index 100%
rename from rotordc_one_optional_product_per_categ/views/sale_product_configurator_templates.xml
rename to rotordc_optional_product/views/sale_product_configurator_templates.xml
diff --git a/rotordc_one_optional_product_per_categ/views/templates.xml b/rotordc_optional_product/views/templates.xml
similarity index 100%
rename from rotordc_one_optional_product_per_categ/views/templates.xml
rename to rotordc_optional_product/views/templates.xml
diff --git a/setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ b/setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ
deleted file mode 120000
index e5be731f..00000000
--- a/setup/rotordc_one_optional_product_per_categ/odoo/addons/rotordc_one_optional_product_per_categ
+++ /dev/null
@@ -1 +0,0 @@
-../../../../rotordc_one_optional_product_per_categ
\ No newline at end of file
diff --git a/setup/rotordc_optional_product/odoo/addons/rotordc_optional_product b/setup/rotordc_optional_product/odoo/addons/rotordc_optional_product
new file mode 120000
index 00000000..d7620108
--- /dev/null
+++ b/setup/rotordc_optional_product/odoo/addons/rotordc_optional_product
@@ -0,0 +1 @@
+../../../../rotordc_optional_product
\ No newline at end of file
diff --git a/setup/rotordc_one_optional_product_per_categ/setup.py b/setup/rotordc_optional_product/setup.py
similarity index 100%
rename from setup/rotordc_one_optional_product_per_categ/setup.py
rename to setup/rotordc_optional_product/setup.py

From 160ad6abe21946eff91b86cb02917c31d0a6878f Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Wed, 11 May 2022 15:52:56 +0200
Subject: [PATCH 05/16] [FIX] rotordc_optional_product: Add website_sale
 dependency

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 rotordc_optional_product/__manifest__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rotordc_optional_product/__manifest__.py b/rotordc_optional_product/__manifest__.py
index 458fc254..2f9f1343 100644
--- a/rotordc_optional_product/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -14,6 +14,7 @@
     "depends": [
         "sale",
         "web",
+        "website_sale",
     ],
     "excludes": [],
     "data": [

From 12ca76a1513a24341b5639d247eb893ead3cb4a1 Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Wed, 11 May 2022 15:57:17 +0200
Subject: [PATCH 06/16] [ADD] rotordc_optional_product: DESCRIPTION.rst

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 rotordc_optional_product/readme/DESCRIPTION.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rotordc_optional_product/readme/DESCRIPTION.rst b/rotordc_optional_product/readme/DESCRIPTION.rst
index e69de29b..45bb5074 100644
--- a/rotordc_optional_product/readme/DESCRIPTION.rst
+++ b/rotordc_optional_product/readme/DESCRIPTION.rst
@@ -0,0 +1,10 @@
+This module has two main behaviours:
+
+- When selecting optional products in the 'add to cart' modal, the user is
+  prevented from adding more than one optional product of the same internal
+  category.
+- When checking out, the user is redirected to an informative error page when
+  they did not select all available optional products for their order. e.g. if a
+  lamp has optional products with the internal categories 'light bulb' and
+  'cable', then the user **must** select one optional product of both categories
+  when ordering a lamp.

From af3440809ddb997db58037bf233d857e8c49c83a Mon Sep 17 00:00:00 2001
From: oca-ci <oca-ci@odoo-community.org>
Date: Thu, 26 May 2022 14:31:47 +0000
Subject: [PATCH 07/16] [UPD] Update rotordc_optional_product.pot

---
 .../i18n/rotordc_optional_product.pot         | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 rotordc_optional_product/i18n/rotordc_optional_product.pot

diff --git a/rotordc_optional_product/i18n/rotordc_optional_product.pot b/rotordc_optional_product/i18n/rotordc_optional_product.pot
new file mode 100644
index 00000000..9f131620
--- /dev/null
+++ b/rotordc_optional_product/i18n/rotordc_optional_product.pot
@@ -0,0 +1,66 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* rotordc_optional_product
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \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: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "<br/>\n"
+"                            Missing categories:"
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "Go to"
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "If this problem persists, please contact us."
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "In order to rectify this problem, take the following steps:"
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "Re-add the products. When you do, make sure to also add any available 'Optional Products'."
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "The order checkout was interrupted because your order is not complete. You added one or more products to your cart that are not completely configured. The products are listed below together with the configurations that are missing."
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "Try checking out again."
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "Your order is incomplete"
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "and remove the above listed products."
+msgstr ""
+
+#. module: rotordc_optional_product
+#: model_terms:ir.ui.view,arch_db:rotordc_optional_product.missing_categories
+msgid "your cart"
+msgstr ""
+

From 5820e577b33d885766c21ec30495dfd9001db801 Mon Sep 17 00:00:00 2001
From: Github GRAP Bot <github-bot@grap.coop>
Date: Thu, 26 May 2022 14:37:07 +0000
Subject: [PATCH 08/16] [UPD] README.rst

---
 rotordc_optional_product/README.rst | 68 +++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 rotordc_optional_product/README.rst

diff --git a/rotordc_optional_product/README.rst b/rotordc_optional_product/README.rst
new file mode 100644
index 00000000..a16fb406
--- /dev/null
+++ b/rotordc_optional_product/README.rst
@@ -0,0 +1,68 @@
+========================
+RotorDC Optional Product
+========================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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-coopiteasy%2Fcie--custom-lightgray.png?logo=github
+    :target: https://github.com/coopiteasy/cie-custom/tree/12.0/rotordc_optional_product
+    :alt: coopiteasy/cie-custom
+
+|badge1| |badge2| |badge3| 
+
+This module has two main behaviours:
+
+- When selecting optional products in the 'add to cart' modal, the user is
+  prevented from adding more than one optional product of the same internal
+  category.
+- When checking out, the user is redirected to an informative error page when
+  they did not select all available optional products for their order. e.g. if a
+  lamp has optional products with the internal categories 'light bulb' and
+  'cable', then the user **must** select one optional product of both categories
+  when ordering a lamp.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/coopiteasy/cie-custom/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/coopiteasy/cie-custom/issues/new?body=module:%20rotordc_optional_product%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
+~~~~~~~
+
+* Coop IT Easy SCRLfs
+
+Contributors
+~~~~~~~~~~~~
+
+* `Coop IT Easy SCRLfs <https://coopiteasy.be>`_:
+
+  * Carmen Bianca Bakker
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `coopiteasy/cie-custom <https://github.com/coopiteasy/cie-custom/tree/12.0/rotordc_optional_product>`_ project on GitHub.
+
+You are welcome to contribute.

From 1d78334359838f11757acbf99ae26cebd4d010e0 Mon Sep 17 00:00:00 2001
From: Carmen Bianca Bakker <carmen@coopiteasy.be>
Date: Wed, 29 Jun 2022 11:25:54 +0200
Subject: [PATCH 09/16] =?UTF-8?q?[FIX]=20SCRLfs=20=E2=86=92=20SC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carmen Bianca Bakker <carmen@coopiteasy.be>
---
 rotordc_optional_product/README.rst              | 4 ++--
 rotordc_optional_product/__manifest__.py         | 4 ++--
 rotordc_optional_product/controllers/main.py     | 2 +-
 rotordc_optional_product/readme/CONTRIBUTORS.rst | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rotordc_optional_product/README.rst b/rotordc_optional_product/README.rst
index a16fb406..cfa1e1ea 100644
--- a/rotordc_optional_product/README.rst
+++ b/rotordc_optional_product/README.rst
@@ -51,12 +51,12 @@ Credits
 Authors
 ~~~~~~~
 
-* Coop IT Easy SCRLfs
+* Coop IT Easy SC
 
 Contributors
 ~~~~~~~~~~~~
 
-* `Coop IT Easy SCRLfs <https://coopiteasy.be>`_:
+* `Coop IT Easy SC <https://coopiteasy.be>`_:
 
   * Carmen Bianca Bakker
 
diff --git a/rotordc_optional_product/__manifest__.py b/rotordc_optional_product/__manifest__.py
index 2f9f1343..b35678c1 100644
--- a/rotordc_optional_product/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 Coop IT Easy SCRLfs
+# Copyright 2022 Coop IT Easy SC
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
@@ -8,7 +8,7 @@
     "version": "12.0.1.0.0",
     "category": "Sales",
     "website": "https://coopiteasy.be",
-    "author": "Coop IT Easy SCRLfs",
+    "author": "Coop IT Easy SC",
     "license": "AGPL-3",
     "application": False,
     "depends": [
diff --git a/rotordc_optional_product/controllers/main.py b/rotordc_optional_product/controllers/main.py
index e85033b7..c7354386 100644
--- a/rotordc_optional_product/controllers/main.py
+++ b/rotordc_optional_product/controllers/main.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Coop IT Easy SCRLfs
+# SPDX-FileCopyrightText: 2022 Coop IT Easy SC
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
diff --git a/rotordc_optional_product/readme/CONTRIBUTORS.rst b/rotordc_optional_product/readme/CONTRIBUTORS.rst
index 9f39efbc..d64451ed 100644
--- a/rotordc_optional_product/readme/CONTRIBUTORS.rst
+++ b/rotordc_optional_product/readme/CONTRIBUTORS.rst
@@ -1,3 +1,3 @@
-* `Coop IT Easy SCRLfs <https://coopiteasy.be>`_:
+* `Coop IT Easy SC <https://coopiteasy.be>`_:
 
   * Carmen Bianca Bakker

From 8b6541f3ad4e34efc170acc3323049efd651a127 Mon Sep 17 00:00:00 2001
From: Carmen Bianca BAKKER <carmen@coopiteasy.be>
Date: Tue, 14 Mar 2023 15:55:42 +0100
Subject: [PATCH 10/16] [FIX] run pre-commit

Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
---
 .../static/src/js/product_configurator_modal.js      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rotordc_optional_product/static/src/js/product_configurator_modal.js b/rotordc_optional_product/static/src/js/product_configurator_modal.js
index 1f2589d4..17ac61df 100644
--- a/rotordc_optional_product/static/src/js/product_configurator_modal.js
+++ b/rotordc_optional_product/static/src/js/product_configurator_modal.js
@@ -1,13 +1,13 @@
-odoo.define("rotordc_optional_product.OptionalProductsModal", function (require) {
+odoo.define("rotordc_optional_product.OptionalProductsModal", function(require) {
     "use strict";
 
     var OptionalProductsModal = require("sale.OptionalProductsModal");
 
     OptionalProductsModal.include({
-        _getCategId: function ($element) {
+        _getCategId: function($element) {
             return $element.find("input.product_categ_id").val();
         },
-        _onAddOption: function ($modal, $parent, productTemplateId) {
+        _onAddOption: function($modal, $parent, productTemplateId) {
             var categ_id = this._getCategId($parent);
             var self = this;
 
@@ -15,7 +15,7 @@ odoo.define("rotordc_optional_product.OptionalProductsModal", function (require)
             // internal category.
             $modal
                 .find(".js_product:not(.in_cart):not(.main_product)")
-                .each(function () {
+                .each(function() {
                     var $item = $(this);
                     var item_product_id = $item.find(".product_id").val();
                     if (
@@ -29,12 +29,12 @@ odoo.define("rotordc_optional_product.OptionalProductsModal", function (require)
 
             this._super($modal, $parent, productTemplateId);
         },
-        _onRemoveOption: function ($modal, $parent, productTemplateId) {
+        _onRemoveOption: function($modal, $parent, productTemplateId) {
             var categ_id = this._getCategId($parent);
             var self = this;
 
             // Re-enable all buttons.
-            $modal.find(".js_product:not(.main_product)").each(function () {
+            $modal.find(".js_product:not(.main_product)").each(function() {
                 var $item = $(this);
                 if (self._getCategId($item) === categ_id) {
                     var $button = $item.find("a.js_add");

From a44da067a1e4eff6de07297fb1dfe5ce1bf23e25 Mon Sep 17 00:00:00 2001
From: Github GRAP Bot <github-bot@grap.coop>
Date: Thu, 27 Jun 2024 14:05:42 +0000
Subject: [PATCH 11/16] [BOT] post-merge updates

---
 rotordc_optional_product/README.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rotordc_optional_product/README.rst b/rotordc_optional_product/README.rst
index cfa1e1ea..95245af8 100644
--- a/rotordc_optional_product/README.rst
+++ b/rotordc_optional_product/README.rst
@@ -2,10 +2,13 @@
 RotorDC Optional Product
 ========================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:dabfd73311994804673378c159347d6e662683dea95768701302679c9b064f04
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
@@ -17,7 +20,7 @@ RotorDC Optional Product
     :target: https://github.com/coopiteasy/cie-custom/tree/12.0/rotordc_optional_product
     :alt: coopiteasy/cie-custom
 
-|badge1| |badge2| |badge3| 
+|badge1| |badge2| |badge3|
 
 This module has two main behaviours:
 
@@ -40,7 +43,7 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/coopiteasy/cie-custom/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/coopiteasy/cie-custom/issues/new?body=module:%20rotordc_optional_product%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.

From aef6d7fdbe1122a819492e1c11cd0f37f6531157 Mon Sep 17 00:00:00 2001
From: hugues de keyzer <odoo@hugues.info>
Date: Mon, 18 Nov 2024 17:33:19 +0100
Subject: [PATCH 12/16] [MIG] rotordc_optional_product: migration to 13.0

---
 rotordc_optional_product/__manifest__.py                     | 4 ++--
 .../static/src/js/product_configurator_modal.js              | 2 +-
 .../views/sale_product_configurator_templates.xml            | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/rotordc_optional_product/__manifest__.py b/rotordc_optional_product/__manifest__.py
index b35678c1..5ca0f85a 100644
--- a/rotordc_optional_product/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -5,14 +5,14 @@
     "name": "RotorDC Optional Product",
     "summary": """
         Custom modifications regarding RotorDC's use of optional products.""",
-    "version": "12.0.1.0.0",
+    "version": "13.0.1.0.0",
     "category": "Sales",
     "website": "https://coopiteasy.be",
     "author": "Coop IT Easy SC",
     "license": "AGPL-3",
     "application": False,
     "depends": [
-        "sale",
+        "sale_product_configurator",
         "web",
         "website_sale",
     ],
diff --git a/rotordc_optional_product/static/src/js/product_configurator_modal.js b/rotordc_optional_product/static/src/js/product_configurator_modal.js
index 17ac61df..7c819998 100644
--- a/rotordc_optional_product/static/src/js/product_configurator_modal.js
+++ b/rotordc_optional_product/static/src/js/product_configurator_modal.js
@@ -1,7 +1,7 @@
 odoo.define("rotordc_optional_product.OptionalProductsModal", function(require) {
     "use strict";
 
-    var OptionalProductsModal = require("sale.OptionalProductsModal");
+    var OptionalProductsModal = require("sale_product_configurator.OptionalProductsModal");
 
     OptionalProductsModal.include({
         _getCategId: function($element) {
diff --git a/rotordc_optional_product/views/sale_product_configurator_templates.xml b/rotordc_optional_product/views/sale_product_configurator_templates.xml
index cfc9285e..0238c76a 100644
--- a/rotordc_optional_product/views/sale_product_configurator_templates.xml
+++ b/rotordc_optional_product/views/sale_product_configurator_templates.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <template id="optional_product_items" inherit_id="sale.optional_product_items">
+    <template
+        id="optional_product_items"
+        inherit_id="sale_product_configurator.optional_product_items"
+    >
         <xpath expr="//td[hasclass('td-img')]" position="inside">
             <input
                 type="hidden"

From 1363fad618e1102f59361dd6fe97c48af8fd07bf Mon Sep 17 00:00:00 2001
From: hugues de keyzer <odoo@hugues.info>
Date: Mon, 18 Nov 2024 17:40:31 +0100
Subject: [PATCH 13/16] [MIG] rotordc_optional_product: migration to 14.0

---
 rotordc_optional_product/__manifest__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rotordc_optional_product/__manifest__.py b/rotordc_optional_product/__manifest__.py
index 5ca0f85a..b2af395d 100644
--- a/rotordc_optional_product/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "RotorDC Optional Product",
     "summary": """
         Custom modifications regarding RotorDC's use of optional products.""",
-    "version": "13.0.1.0.0",
+    "version": "14.0.1.0.0",
     "category": "Sales",
     "website": "https://coopiteasy.be",
     "author": "Coop IT Easy SC",

From 8d4407a0ab1f32826237197baf746df9b72acdd3 Mon Sep 17 00:00:00 2001
From: hugues de keyzer <odoo@hugues.info>
Date: Mon, 18 Nov 2024 17:48:30 +0100
Subject: [PATCH 14/16] [MIG] rotordc_optional_product: migration to 15.0

---
 rotordc_optional_product/__manifest__.py  | 12 ++++++------
 rotordc_optional_product/views/assets.xml | 15 ---------------
 2 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 rotordc_optional_product/views/assets.xml

diff --git a/rotordc_optional_product/__manifest__.py b/rotordc_optional_product/__manifest__.py
index b2af395d..141b325a 100644
--- a/rotordc_optional_product/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -5,23 +5,23 @@
     "name": "RotorDC Optional Product",
     "summary": """
         Custom modifications regarding RotorDC's use of optional products.""",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Sales",
     "website": "https://coopiteasy.be",
     "author": "Coop IT Easy SC",
     "license": "AGPL-3",
-    "application": False,
     "depends": [
         "sale_product_configurator",
         "web",
         "website_sale",
     ],
-    "excludes": [],
     "data": [
-        "views/assets.xml",
         "views/sale_product_configurator_templates.xml",
         "views/templates.xml",
     ],
-    "demo": [],
-    "qweb": [],
+    "assets": {
+        "web.assets_frontend": [
+            "rotordc_optional_product/static/src/js/product_configurator_modal.js",
+        ],
+    },
 }
diff --git a/rotordc_optional_product/views/assets.xml b/rotordc_optional_product/views/assets.xml
deleted file mode 100644
index 9a648854..00000000
--- a/rotordc_optional_product/views/assets.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <!--
-        TODO: sale's product_configurator_modal.js uses web.assets_backend, but the
-        script ends up in web.assets_frontend.js. I have no idea why/how.
-    -->
-    <template id="assets_frontend" inherit_id="web.assets_frontend">
-        <xpath expr="script[last()]" position="after">
-            <script
-                type="text/javascript"
-                src="/rotordc_optional_product/static/src/js/product_configurator_modal.js"
-            />
-        </xpath>
-    </template>
-</odoo>

From 09c9cd0fceba779416798885ab6a7b359480329a Mon Sep 17 00:00:00 2001
From: hugues de keyzer <odoo@hugues.info>
Date: Mon, 18 Nov 2024 18:39:31 +0100
Subject: [PATCH 15/16] [MIG] rotordc_optional_product: migration to 16.0

---
 rotordc_optional_product/__manifest__.py      |  4 +-
 .../src/js/product_configurator_modal.esm.js  | 45 +++++++++++++++++
 .../src/js/product_configurator_modal.js      | 48 -------------------
 3 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 rotordc_optional_product/static/src/js/product_configurator_modal.esm.js
 delete mode 100644 rotordc_optional_product/static/src/js/product_configurator_modal.js

diff --git a/rotordc_optional_product/__manifest__.py b/rotordc_optional_product/__manifest__.py
index 141b325a..2f534bcf 100644
--- a/rotordc_optional_product/__manifest__.py
+++ b/rotordc_optional_product/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "RotorDC Optional Product",
     "summary": """
         Custom modifications regarding RotorDC's use of optional products.""",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Sales",
     "website": "https://coopiteasy.be",
     "author": "Coop IT Easy SC",
@@ -21,7 +21,7 @@
     ],
     "assets": {
         "web.assets_frontend": [
-            "rotordc_optional_product/static/src/js/product_configurator_modal.js",
+            "rotordc_optional_product/static/src/js/product_configurator_modal.esm.js",
         ],
     },
 }
diff --git a/rotordc_optional_product/static/src/js/product_configurator_modal.esm.js b/rotordc_optional_product/static/src/js/product_configurator_modal.esm.js
new file mode 100644
index 00000000..76038411
--- /dev/null
+++ b/rotordc_optional_product/static/src/js/product_configurator_modal.esm.js
@@ -0,0 +1,45 @@
+/** @odoo-module **/
+
+import {OptionalProductsModal} from "@sale_product_configurator/js/product_configurator_modal";
+import {patch} from "@web/core/utils/patch";
+
+patch(OptionalProductsModal.prototype, "RotorDC customization", {
+    _getCategId: function ($element) {
+        return $element.find("input.product_categ_id").val();
+    },
+    _onAddOption: function ($modal, $parent, productTemplateId) {
+        var categ_id = this._getCategId($parent);
+        var self = this;
+
+        // Disable all 'add to cart' buttons of products of the same
+        // internal category.
+        $modal.find(".js_product:not(.in_cart):not(.main_product)").each(function () {
+            var $item = $(this);
+            var item_product_id = $item.find(".product_id").val();
+            if (
+                item_product_id !== $parent.find(".product_id").val() &&
+                self._getCategId($item) === categ_id
+            ) {
+                var $button = $item.find("a.js_add");
+                $button.addClass("disabled");
+            }
+        });
+
+        this._super($modal, $parent, productTemplateId);
+    },
+    _onRemoveOption: function ($modal, $parent, productTemplateId) {
+        var categ_id = this._getCategId($parent);
+        var self = this;
+
+        // Re-enable all buttons.
+        $modal.find(".js_product:not(.main_product)").each(function () {
+            var $item = $(this);
+            if (self._getCategId($item) === categ_id) {
+                var $button = $item.find("a.js_add");
+                $button.removeClass("disabled");
+            }
+        });
+
+        this._super($modal, $parent, productTemplateId);
+    },
+});
diff --git a/rotordc_optional_product/static/src/js/product_configurator_modal.js b/rotordc_optional_product/static/src/js/product_configurator_modal.js
deleted file mode 100644
index 7c819998..00000000
--- a/rotordc_optional_product/static/src/js/product_configurator_modal.js
+++ /dev/null
@@ -1,48 +0,0 @@
-odoo.define("rotordc_optional_product.OptionalProductsModal", function(require) {
-    "use strict";
-
-    var OptionalProductsModal = require("sale_product_configurator.OptionalProductsModal");
-
-    OptionalProductsModal.include({
-        _getCategId: function($element) {
-            return $element.find("input.product_categ_id").val();
-        },
-        _onAddOption: function($modal, $parent, productTemplateId) {
-            var categ_id = this._getCategId($parent);
-            var self = this;
-
-            // Disable all 'add to cart' buttons of products of the same
-            // internal category.
-            $modal
-                .find(".js_product:not(.in_cart):not(.main_product)")
-                .each(function() {
-                    var $item = $(this);
-                    var item_product_id = $item.find(".product_id").val();
-                    if (
-                        item_product_id !== $parent.find(".product_id").val() &&
-                        self._getCategId($item) === categ_id
-                    ) {
-                        var $button = $item.find("a.js_add");
-                        $button.addClass("disabled");
-                    }
-                });
-
-            this._super($modal, $parent, productTemplateId);
-        },
-        _onRemoveOption: function($modal, $parent, productTemplateId) {
-            var categ_id = this._getCategId($parent);
-            var self = this;
-
-            // Re-enable all buttons.
-            $modal.find(".js_product:not(.main_product)").each(function() {
-                var $item = $(this);
-                if (self._getCategId($item) === categ_id) {
-                    var $button = $item.find("a.js_add");
-                    $button.removeClass("disabled");
-                }
-            });
-
-            this._super($modal, $parent, productTemplateId);
-        },
-    });
-});

From 003e259cd7669b0605c3a660a5db17a6d3304f2e Mon Sep 17 00:00:00 2001
From: hugues de keyzer <odoo@hugues.info>
Date: Tue, 19 Nov 2024 09:27:54 +0100
Subject: [PATCH 16/16] [IMP] rotordc_optional_product: run pre-commit

---
 rotordc_optional_product/README.rst           |   6 +-
 .../static/description/index.html             | 428 ++++++++++++++++++
 2 files changed, 431 insertions(+), 3 deletions(-)
 create mode 100644 rotordc_optional_product/static/description/index.html

diff --git a/rotordc_optional_product/README.rst b/rotordc_optional_product/README.rst
index 95245af8..b0bee3f4 100644
--- a/rotordc_optional_product/README.rst
+++ b/rotordc_optional_product/README.rst
@@ -17,7 +17,7 @@ RotorDC Optional Product
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-coopiteasy%2Fcie--custom-lightgray.png?logo=github
-    :target: https://github.com/coopiteasy/cie-custom/tree/12.0/rotordc_optional_product
+    :target: https://github.com/coopiteasy/cie-custom/tree/16.0/rotordc_optional_product
     :alt: coopiteasy/cie-custom
 
 |badge1| |badge2| |badge3|
@@ -44,7 +44,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/coopiteasy/cie-custom/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/coopiteasy/cie-custom/issues/new?body=module:%20rotordc_optional_product%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/coopiteasy/cie-custom/issues/new?body=module:%20rotordc_optional_product%0Aversion:%2016.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.
 
@@ -66,6 +66,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `coopiteasy/cie-custom <https://github.com/coopiteasy/cie-custom/tree/12.0/rotordc_optional_product>`_ project on GitHub.
+This module is part of the `coopiteasy/cie-custom <https://github.com/coopiteasy/cie-custom/tree/16.0/rotordc_optional_product>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/rotordc_optional_product/static/description/index.html b/rotordc_optional_product/static/description/index.html
new file mode 100644
index 00000000..d20f2add
--- /dev/null
+++ b/rotordc_optional_product/static/description/index.html
@@ -0,0 +1,428 @@
+<!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: https://docutils.sourceforge.io/" />
+<title>RotorDC Optional Product</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+: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 https://docutils.sourceforge.io/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="rotordc-optional-product">
+<h1 class="title">RotorDC Optional Product</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:dabfd73311994804673378c159347d6e662683dea95768701302679c9b064f04
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<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/coopiteasy/cie-custom/tree/16.0/rotordc_optional_product"><img alt="coopiteasy/cie-custom" src="https://img.shields.io/badge/github-coopiteasy%2Fcie--custom-lightgray.png?logo=github" /></a></p>
+<p>This module has two main behaviours:</p>
+<ul class="simple">
+<li>When selecting optional products in the ‘add to cart’ modal, the user is
+prevented from adding more than one optional product of the same internal
+category.</li>
+<li>When checking out, the user is redirected to an informative error page when
+they did not select all available optional products for their order. e.g. if a
+lamp has optional products with the internal categories ‘light bulb’ and
+‘cable’, then the user <strong>must</strong> select one optional product of both categories
+when ordering a lamp.</li>
+</ul>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-4">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/coopiteasy/cie-custom/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/coopiteasy/cie-custom/issues/new?body=module:%20rotordc_optional_product%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>Coop IT Easy SC</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://coopiteasy.be">Coop IT Easy SC</a>:<ul>
+<li>Carmen Bianca Bakker</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<p>This module is part of the <a class="reference external" href="https://github.com/coopiteasy/cie-custom/tree/16.0/rotordc_optional_product">coopiteasy/cie-custom</a> project on GitHub.</p>
+<p>You are welcome to contribute.</p>
+</div>
+</div>
+</div>
+</body>
+</html>