[FIX] delivery_ups_oca: Hide unavailable shipping methods

Author: jans23

delivery_ups_oca/models/delivery_carrier.py

@@ -5,14 +5,18 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import base64
+import logging
 from io import BytesIO
 
 from PIL import Image
 
 from odoo import fields, models
+from odoo.exceptions import UserError
 
 from .ups_request import UpsRequest
 
+_logger = logging.getLogger(__name__)
+
 
 class DeliveryCarrier(models.Model):
     _inherit = "delivery.carrier"
@@ -121,16 +125,27 @@ def _ups_get_response_price(self, total_charges, currency, company):
 
     def ups_rate_shipment(self, order):
         ups_request = UpsRequest(self)
-        response = ups_request.rate_shipment(order)
-        price = self._ups_get_response_price(
-            response, order.currency_id, order.company_id
-        )
-        return {
-            "success": True,
-            "price": price,
-            "error_message": False,
-            "warning_message": False,
-        }
+        try:
+            response = ups_request.rate_shipment(order)
+            price = self._ups_get_response_price(
+                response, order.currency_id, order.company_id
+            )
+            return {
+                "success": True,
+                "price": price,
+                "error_message": False,
+                "warning_message": False,
+            }
+        except UserError as e:
+            # During rate shopping (checkout), return failure instead of
+            # raising thus gracefully hide unavailable shipping methods.
+            _logger.debug("UPS rate shipment failed: %s", e)
+            return {
+                "success": False,
+                "price": 0.0,
+                "error_message": str(e),
+                "warning_message": False,
+            }
 
     def ups_create_shipping(self, picking):
         """Send packages of the picking to UPS

delivery_ups_oca/tests/test_delivery_ups.py

@@ -184,6 +184,18 @@ def test_order_ups_rate_shipment_currency_extra(self):
             self.assertGreater(res["price"], 0)
             self.assertTrue(res["success"])
 
+    def test_ups_rate_shipment_unavailable_service(self):
+        """A UserError during rating is swallowed so the method can be hidden."""
+        with mock.patch(
+            _provider_class + "._rate_shipment",
+            side_effect=UserError("111217: service unavailable"),
+        ):
+            res = self.carrier.ups_rate_shipment(self.sale)
+        self.assertFalse(res["success"])
+        self.assertEqual(res["price"], 0.0)
+        self.assertIn("111217", res["error_message"])
+        self.assertFalse(res["warning_message"])
+
     def test_delivery_carrier_ups_integration(self):
         self.picking.action_confirm()
         self.picking.action_assign()