[FIX] website_sale, delivery: check carrier before payment

Check if the user selected the carrier for storable/consumable
products before proceeding to payment.

opw-3810367

closes #161476

Related: odoo/enterprise#60550
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>

Author: vchu-odoo

addons/delivery/models/sale_order.py

@@ -54,6 +54,7 @@ def _remove_delivery_line(self):
                 + '\n'.join(['- %s: %s x %s' % (line.product_id.with_context(display_default_code=False).display_name, line.qty_invoiced, line.price_unit) for line in delivery_lines])
             )
         to_delete.unlink()
+        self.carrier_id = self.env['delivery.carrier']  # reset carrier
 
     def set_delivery_line(self, carrier, amount):
         self._remove_delivery_line()

addons/website_sale/controllers/main.py

@@ -1862,6 +1862,9 @@ def shop_payment_transaction(self, order_id, access_token, **kwargs):
         if tools.float_compare(kwargs['amount'], order_sudo.amount_total, precision_rounding=order_sudo.currency_id.rounding):
             raise ValidationError(_("The cart has been updated. Please refresh the page."))
 
+        if not order_sudo.only_services and not order_sudo.carrier_id:
+            raise ValidationError(_("No shipping method is selected."))
+
         tx_sudo = self._create_transaction(
             custom_create_values={'sale_order_ids': [Command.set([order_id])]}, **kwargs,
         )

addons/website_sale/i18n/website_sale.pot

@@ -2535,6 +2535,13 @@ msgid ""
 " Please contact us for more information."
 msgstr ""
 
+#. module: website_sale
+#. odoo-python
+#: code:addons/website_sale/controllers/main.py:0
+#, python-format
+msgid "No shipping method is selected."
+msgstr ""
+
 #. module: website_sale
 #: model:ir.model.fields.selection,name:website_sale.selection__website__product_page_image_spacing__none
 #: model_terms:ir.ui.view,arch_db:website_sale.snippet_options

addons/website_sale/tests/test_website_sale_cart.py

@@ -6,7 +6,7 @@
 from odoo.addons.website_sale.controllers.main import WebsiteSale, PaymentPortal
 from odoo.addons.website.tools import MockRequest
 from odoo.addons.website_sale.models.product_template import ProductTemplate
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 from odoo.tests.common import tagged
 from odoo.fields import Command
 
@@ -20,6 +20,13 @@ def setUpClass(cls):
         cls.website = cls.env['website'].browse(1)
         cls.WebsiteSaleController = WebsiteSale()
         cls.public_user = cls.env.ref('base.public_user')
+        cls.product = cls.env['product.product'].create({
+            'name': 'Test Product',
+            'sale_ok': True,
+            'website_published': True,
+            'lst_price': 1000.0,
+            'standard_price': 800.0,
+        })
 
     def test_add_cart_deleted_product(self):
         # Create a published product then unlink it
@@ -101,24 +108,29 @@ def test_zero_price_product_rule(self):
                 self.WebsiteSaleController.cart_update_json(product_id=product_service.id, add_qty=1)
 
     def test_update_cart_before_payment(self):
-        product = self.env['product.product'].create({
-            'name': 'Test Product',
-            'sale_ok': True,
-            'website_published': True,
-            'lst_price': 1000.0,
-            'standard_price': 800.0,
-        })
         website = self.website.with_user(self.public_user)
-        with MockRequest(product.with_user(self.public_user).env, website=website):
-            self.WebsiteSaleController.cart_update_json(product_id=product.id, add_qty=1)
+        with MockRequest(self.product.with_user(self.public_user).env, website=website):
+            self.WebsiteSaleController.cart_update_json(product_id=self.product.id, add_qty=1)
             sale_order = website.sale_get_order()
             sale_order.access_token = 'test_token'
             old_amount = sale_order.amount_total
-            self.WebsiteSaleController.cart_update_json(product_id=product.id, add_qty=1)
+            self.WebsiteSaleController.cart_update_json(product_id=self.product.id, add_qty=1)
             # Try processing payment with the old amount
             with self.assertRaises(UserError):
                 PaymentPortal().shop_payment_transaction(sale_order.id, sale_order.access_token, amount=old_amount)
 
+    def test_check_order_delivery_before_payment(self):
+        website = self.website.with_user(self.public_user)
+        with MockRequest(self.product.with_user(self.public_user).env, website=website):
+            sale_order = self.env['sale.order'].create({
+                'partner_id': self.public_user.id,
+                'order_line': [Command.create({'product_id': self.product.id})],
+                'access_token': 'test_token',
+            })
+            # Try processing payment with a storable product and no carrier_id
+            with self.assertRaises(ValidationError):
+                PaymentPortal().shop_payment_transaction(sale_order.id, sale_order.access_token)
+
     def test_update_cart_zero_qty(self):
         # Try to remove a product that has already been removed
         product = self.env['product.product'].create({