fixup! [19.0][ADD] website_sale_product_multiple_qty

Author: yankinmax

website_sale_product_multiple_qty/__manifest__.py

@@ -22,7 +22,11 @@
     ],
     "assets": {
         "web.assets_frontend": [
-            "website_sale_product_multiple_qty/static/src/**/*.js",
+            "website_sale_product_multiple_qty/static/src/js/interactions/**/*.js",
+            "sale/static/src/js/product_configurator_dialog/*",
+            "sale/static/src/js/quantity_buttons/*",
+            "website_sale_product_multiple_qty/static/src/js/product_configurator/**/*.js",
+            "website_sale_product_multiple_qty/static/src/js/quantity_buttons/**/*.js",
         ],
     },
 }

website_sale_product_multiple_qty/controllers/__init__.py

@@ -1 +1,2 @@
+from . import product_configurator
 from . import variant

website_sale_product_multiple_qty/controllers/product_configurator.py

@@ -0,0 +1,161 @@
+# Copyright 2026 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.http import request, route
+
+from odoo.addons.website_sale.controllers.product_configurator import (
+    WebsiteSaleProductConfiguratorController,
+)
+
+
+class WebsiteSaleRoundingProductConfiguratorController(
+    WebsiteSaleProductConfiguratorController
+):
+    @route(
+        route="/website_sale/product_configurator/get_values",
+        type="jsonrpc",
+        auth="public",
+        website=True,
+        readonly=True,
+    )
+    def website_sale_product_configurator_get_values(
+        self,
+        product_template_id,
+        quantity,
+        *,
+        currency_id=None,
+        so_date=None,
+        product_uom_id=None,
+        company_id=None,
+        pricelist_id=None,
+        ptav_ids=None,
+        only_main_product=False,
+        show_packaging=True,
+        **kwargs,
+    ):
+        # OVERRIDE: round the initial quantity based on
+        # the rounding method coming from the client.
+        rounding = self._get_multiple_rounding(**kwargs)
+
+        if company_id:
+            request.update_context(allowed_company_ids=[company_id])
+
+        product_template = self._get_product_template(product_template_id)
+        product_uom = (
+            request.env["uom.uom"].browse(product_uom_id) if product_uom_id else None
+        )
+        uom = product_uom or product_template.uom_id
+
+        rounded_quantity = self._get_rounded_qty(
+            product_template,
+            quantity or 0.0,
+            uom,
+            rounding=rounding,
+        )
+
+        res = super().website_sale_product_configurator_get_values(
+            product_template_id=product_template_id,
+            quantity=rounded_quantity,
+            currency_id=currency_id,
+            so_date=so_date,
+            product_uom_id=product_uom_id,
+            company_id=company_id,
+            pricelist_id=pricelist_id,
+            ptav_ids=ptav_ids,
+            only_main_product=only_main_product,
+            **kwargs,
+        )
+
+        # Ensure the returned quantity after super call is the rounded quantity
+        if res.get("products"):
+            res["products"][0]["quantity"] = rounded_quantity
+
+        # Round the quantity for the optional products as well
+        for product in res.get("optional_products", []):
+            tmpl = self._get_product_template(product.get("product_tmpl_id"))
+            puom = None
+            if product.get("uom") and product["uom"].get("id"):
+                puom = request.env["uom.uom"].browse(product["uom"]["id"])
+            product["quantity"] = self._get_rounded_qty(
+                tmpl,
+                product.get("quantity") or 0.0,
+                puom or tmpl.uom_id,
+                rounding=rounding,
+            )
+        return res
+
+    @route(
+        route="/website_sale/product_configurator/update_combination",
+        type="jsonrpc",
+        auth="public",
+        website=True,
+        readonly=True,
+        methods=["POST"],
+    )
+    def website_sale_product_configurator_update_combination(
+        self,
+        product_template_id,
+        ptav_ids,
+        *,
+        currency_id=None,
+        so_date=None,
+        quantity=None,
+        product_uom_id=None,
+        company_id=None,
+        pricelist_id=None,
+        **kwargs,
+    ):
+        # OVERRIDE: round the initial quantity based on
+        # the rounding method coming from the frontend.
+        rounding = self._get_multiple_rounding(**kwargs)
+
+        if company_id:
+            request.update_context(allowed_company_ids=[company_id])
+
+        product_template = request.env["product.template"].browse(product_template_id)
+        product_uom = (
+            request.env["uom.uom"].browse(product_uom_id) if product_uom_id else None
+        )
+        uom = product_uom or product_template.uom_id
+
+        rounded_quantity = self._get_rounded_qty(
+            product_template,
+            quantity or 0.0,
+            uom,
+            rounding=rounding,
+        )
+
+        values = super().website_sale_product_configurator_update_combination(
+            product_template_id=product_template_id,
+            ptav_ids=ptav_ids,
+            currency_id=currency_id,
+            so_date=so_date,
+            quantity=rounded_quantity,
+            product_uom_id=product_uom_id,
+            company_id=company_id,
+            pricelist_id=pricelist_id,
+            **kwargs,
+        )
+
+        values["quantity"] = rounded_quantity
+        return values
+
+    def _get_multiple_rounding(self, **kwargs):
+        return kwargs.get("multiple_rounding") or "UP"
+
+    def _get_rounded_qty(self, product_or_template, quantity, uom, *, rounding="UP"):
+        """Round quantity according to product `sale_multiple_uom_id`.
+
+        :param product_or_template: product.product or product.template
+        :param float quantity: quantity to round if needed
+        :param uom.uom uom: UoM of the quantity
+        :param str rounding: 'UP' or 'DOWN'
+        :return float: rounded quantity if multiple UoM applies, else original quantity
+        """
+        multiple_uom = product_or_template.sale_multiple_uom_id
+        if not multiple_uom:
+            return quantity
+
+        uom = uom or product_or_template.uom_id
+        rounded_qty = multiple_uom._check_qty(quantity, uom, rounding_method=rounding)
+        return round(rounded_qty, 0)

website_sale_product_multiple_qty/models/__init__.py

@@ -1 +1,2 @@
 from . import product_template
+from . import sale_order_line

website_sale_product_multiple_qty/models/product_template.py

@@ -1,11 +1,12 @@
 # Copyright 2026 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from odoo import models
+from odoo import api, models
 
 
 class ProductTemplate(models.Model):
     _inherit = "product.template"
 
+    @api.model
     def _get_additionnal_combination_info(
         self, product_or_template, quantity, uom, date, website
     ):
@@ -14,21 +15,20 @@ def _get_additionnal_combination_info(
             product_or_template, quantity, uom, date, website
         )
 
-        if not product_or_template.sale_multiple_uom_id:
+        multiple_uom = product_or_template.sale_multiple_uom_id
+        if not multiple_uom:
             return combination_info
+
         rounding = "UP"
         if to_rounding := self.env.context.get("multiple_rounding"):
             rounding = to_rounding
-        rounded_qty = self.sale_multiple_uom_id._check_qty(
-            quantity, self.uom_id, rounding_method=rounding
-        )
+
+        rounded_qty = multiple_uom._check_qty(quantity, uom, rounding_method=rounding)
+
         combination_info.update(
             {
                 "is_multiple": 1,
-                # The website expects an integer value as an input
-                # ``website_sale::variant_mixin.js``
-                # parseInt(parent.querySelector('input[name="add_qty"]').value).
-                "multiple_qty": int(rounded_qty),
+                "multiple_qty": round(rounded_qty, 0),
             }
         )
         return combination_info

website_sale_product_multiple_qty/models/sale_order_line.py

@@ -0,0 +1,18 @@
+# Copyright 2026 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import models
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    def _get_displayed_quantity(self):
+        result = super()._get_displayed_quantity()
+        multiple_uom = self.product_id.sale_multiple_uom_id
+        if not multiple_uom:
+            return result
+
+        qty_to_order = self.product_uom_qty or 0.0
+        if qty_to_order <= 0:
+            return result
+        return self._round_sale_qty_to_multiple(qty_to_order)

…le_qty/static/src/js/website_sale.esm.js …/src/js/interactions/website_sale.esm.jswebsite_sale_product_multiple_qty/static/src/js/website_sale.esm.js renamed to website_sale_product_multiple_qty/static/src/js/interactions/website_sale.esm.js website_sale_product_multiple_qty/static/src/js/website_sale.esm.js renamed to website_sale_product_multiple_qty/static/src/js/interactions/website_sale.esm.js

@@ -21,8 +21,10 @@ patch(WebsiteSale.prototype, {
                 const minus = ev.target.closest(".css_quantity_minus");
                 const plus = ev.target.closest(".css_quantity_plus");
                 if (!minus && !plus) return;
+
                 const parent = (minus || plus).closest(".js_product");
                 if (!parent) return;
+
                 parent.dataset.multipleRounding = minus ? "DOWN" : "UP";
             },
             true
@@ -34,8 +36,10 @@ patch(WebsiteSale.prototype, {
             (ev) => {
                 const input = ev.target.closest?.('input[name="add_qty"]');
                 if (!input) return;
+
                 const parent = input.closest(".js_product");
                 if (!parent) return;
+
                 parent.dataset.multipleRounding = "UP";
             },
             true
@@ -48,61 +52,80 @@ patch(WebsiteSale.prototype, {
             (ev) => {
                 const input = ev.target.closest?.('input[name="add_qty"]');
                 if (!input || ev.key !== "Enter") return;
+
                 ev.preventDefault();
+
                 const parent = input.closest(".js_product");
                 if (!parent) return;
+
                 parent.dataset.multipleRounding = "UP";
-                input.dispatchEvent(new Event("change", {bubbles: true}));
             },
             true
         );
 
         return res;
     },
+
     /**
-     * Prevent duplicate ``get_combination_info`` RPC calls to avoid rounding method mess-up.
-     * The original method is triggered on each ``ul[data-attribute-exclusions]`` change.
-     * The goal is to trigger it only once, with the correct rounding method set by the user.
+     * Reset to default values when changing the variant.
      *
      * @override
      */
-    triggerVariantChange(container) {
-        const ul = container.querySelector("ul[data-attribute-exclusions]");
-        if (ul) {
-            ul.dispatchEvent(new Event("change"));
+    onChangeVariant(ev) {
+        // OnChangeVariant may also be triggered by qty updates; do not treat that as a variant change.
+        // Only reset when the event comes from a variant control (not from the quantity input).
+        if (ev?.target?.closest?.('input[name="add_qty"]')) {
+            return super.onChangeVariant(...arguments);
         }
-        container
-            .querySelectorAll(
-                "input.js_variant_change:checked, select.js_variant_change"
-            )
-            .forEach((el) => this.handleCustomValues(el));
+
+        const parent = ev.currentTarget.closest(".js_product");
+        if (parent) {
+            const qtyInput = parent.querySelector('input[name="add_qty"]');
+            if (qtyInput) {
+                // Reset to the default "min" quantity if present, otherwise 1.
+                const min = Number(qtyInput.dataset.min || "1");
+                const defaultQty = !Number.isNaN(min) && min > 0 ? min : 1;
+                qtyInput.value = String(defaultQty);
+            }
+
+            // When switching variants, we consider it a "default" state.
+            // Do not keep a stale rounding method from a previous "-" click.
+            delete parent.dataset.multipleRounding;
+        }
+
+        return super.onChangeVariant(...arguments);
     },
+
     /**
      * Inject the rounding method into the RPC payload.
      *
      * @override
      */
     _getOptionalCombinationInfoParam(parent) {
         const params = super._getOptionalCombinationInfoParam?.(parent) || {};
+
         const rounding = parent?.dataset?.multipleRounding;
         if (rounding) {
             params.multiple_rounding = rounding;
-            delete parent.dataset.multipleRounding;
         }
+
         return params;
     },
+
     /**
      * Update the quantity input value with the rounded quantity returned by the RPC.
      *
      * @override
      */
     _onChangeCombination(ev, parent, combination) {
         const result = super._onChangeCombination(...arguments);
+
         const qtyInput = parent?.querySelector?.('input[name="add_qty"]');
-        if (!qtyInput) {
-            return result;
-        }
-        if (combination?.is_multiple && combination?.multiple_qty !== null) {
+        if (
+            qtyInput &&
+            combination?.is_multiple &&
+            combination?.multiple_qty !== undefined
+        ) {
             const rounded = Number(combination.multiple_qty);
             if (!Number.isNaN(rounded)) {
                 const current = parseInt(qtyInput.value || "0");