[MERGE] forward port branch saas-12.3 up to 50e571acf7c

closes odoo/odoo#36491

Signed-off-by: Christophe Simonis <chs@odoo.com>

3 files changed, 22 insertions, 1 deletions

diff --git a/addons/website_sale_delivery/static/src/js/website_sale_delivery.js b/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
index 4210f3e5d85..6c316a70540 100644
--- a/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
+++ b/addons/website_sale_delivery/static/src/js/website_sale_delivery.js
@@ -59,7 +59,7 @@ publicWidget.registry.websiteSaleDelivery = publicWidget.Widget.extend({
      */
     _handleCarrierUpdateResult: function (result) {
         this._handleCarrierUpdateResultBadge(result);
-        var $payButton = $('#o_payment_form_pay .monetary_field');
+        var $payButton = $('#o_payment_form_pay');
         var $amountDelivery = $('#order_delivery .monetary_field');
         var $amountUntaxed = $('#order_total_untaxed .monetary_field');
         var $amountTax = $('#order_total_taxes .monetary_field');
diff --git a/addons/website_sale_delivery/static/tests/tours/website_free_delivery.js b/addons/website_sale_delivery/static/tests/tours/website_free_delivery.js
index 4ac148854f9..d99af8e56e1 100644
--- a/addons/website_sale_delivery/static/tests/tours/website_free_delivery.js
+++ b/addons/website_sale_delivery/static/tests/tours/website_free_delivery.js
@@ -8,6 +8,7 @@ tour.register('check_free_delivery', {
         url: '/shop?search=office chair black',
 },
     [
+        // Part 1: Check free delivery
         {
             content: "select office chair black",
             trigger: '.oe_product_cart:first a:contains("Office Chair Black")',
@@ -26,5 +27,21 @@ tour.register('check_free_delivery', {
             extra_trigger: '#delivery_carrier label:containsExact("Delivery Now Free Over 10")',
             trigger: "#delivery_carrier span:contains('0.0')"
         },
+        // Part 2: check multiple delivery & price loaded asynchronously
+        {
+            content: "Ensure price was loaded asynchronously",
+            extra_trigger: '#delivery_carrier input[name="delivery_type"]:checked',
+            trigger: '#delivery_method .o_delivery_carrier_select:contains("20.0"):contains("The Poste")',
+            run: function () {}, // it's a check
+        },
+        {
+            content: "Click on Pay Now",
+            trigger: 'button[id="o_payment_form_pay"]:visible:not(:disabled)',
+        },
+        {
+            content: "Confirmation page should be shown",
+            trigger: '#oe_structure_website_sale_confirmation_1',
+            run: function () {}, // it's a check
+        }
     ]);
 });
diff --git a/addons/website_sale_delivery/tests/test_ui.py b/addons/website_sale_delivery/tests/test_ui.py
index 34dcf086a48..50df06adf62 100644
--- a/addons/website_sale_delivery/tests/test_ui.py
+++ b/addons/website_sale_delivery/tests/test_ui.py
@@ -12,4 +12,8 @@ class TestUi(odoo.tests.HttpCase):
             'free_over': True,
             'amount': 10,
         })
+        self.env.ref("delivery.delivery_carrier").write({
+            'sequence': 9999,  # ensure last to load price async
+            'website_published': True,
+        })
         self.start_tour("/", 'check_free_delivery', login="admin")