[MIG] product_restrict_payment_acquirer: “all” mode provider logic

Compute intersection inside the loop to avoid overwriting the set.

Task: 4861

Author: Mohajiro

product_restrict_payment_acquirer/models/payment_provider.py

@@ -42,12 +42,11 @@ def _get_compatible_providers(
 
         # All-products mode
         if mode == "all":
-            allowed = False
+            common = False
             for line in self.env["sale.order"].browse(order_id).order_line:
                 pps = line.product_id.allowed_payment_provider_ids
-
-            allowed = (allowed & pps) if allowed else pps
-            return allowed or providers
+                common = (common & pps) if common else pps
+            return common or providers
 
         # Fallback
         return providers

product_restrict_payment_acquirer/tests/test_payment_acquirer.py

@@ -11,16 +11,12 @@ def setUpClass(cls):
         # Initialize providers
         cls.paypal = cls.env.ref("payment.payment_provider_paypal")
         cls.paypal.write({"state": "test"})
-        cls.providers = cls.env["payment.provider"].search(
-            [("state", "in", ["enabled", "test"])]
-        )
         cls.wire_transfer = cls.env.ref("payment.payment_provider_transfer")
-        cls.wire_transfer.write({"state": "enabled"})
 
         # Initialize partner restrictions
         cls.res_partner_deco = cls.env.ref("base.res_partner_2")
         cls.res_partner_deco.write(
-            {"allowed_payment_provider_ids": [(4, cls.wire_transfer.id)]}
+            {"allowed_provider_ids": [(4, cls.wire_transfer.id)]}
         )
 
         # Create products with provider restrictions
@@ -68,19 +64,16 @@ def test_get_compatible_providers_blank_option(self):
         self.assertCountEqual(
             list(result),
             [self.wire_transfer],
-            "Must return only partner allowed provider",
         )
-
         # without order: all enabled providers
-        result = self.env["payment.provider"]._get_compatible_providers(
+        result_no_order = self.env["payment.provider"]._get_compatible_providers(
             company_id=self.env.company.id,
             partner_id=self.res_partner_deco.id,
             amount=100.0,
         )
         self.assertCountEqual(
-            list(result),
+            list(result_no_order),
             [self.wire_transfer, self.paypal],
-            "Must return all enabled providers",
         )
 
     def test_get_compatible_providers_first_option(self):
@@ -98,19 +91,16 @@ def test_get_compatible_providers_first_option(self):
         self.assertCountEqual(
             list(result),
             [self.wire_transfer, self.paypal],
-            "Must return providers allowed on first order line",
         )
-
         # without order: all enabled providers
-        result = self.env["payment.provider"]._get_compatible_providers(
+        result_no_order = self.env["payment.provider"]._get_compatible_providers(
             company_id=self.env.company.id,
             partner_id=self.res_partner_deco.id,
             amount=50.0,
         )
         self.assertCountEqual(
-            list(result),
+            list(result_no_order),
             [self.wire_transfer, self.paypal],
-            "Must return all enabled providers when no order",
         )
 
     def test_get_compatible_providers_all_option(self):
@@ -128,17 +118,14 @@ def test_get_compatible_providers_all_option(self):
         self.assertCountEqual(
             list(result),
             [self.paypal],
-            "Must return only common provider for all order lines",
         )
-
         # without order: all enabled providers
-        result = self.env["payment.provider"]._get_compatible_providers(
+        result_no_order = self.env["payment.provider"]._get_compatible_providers(
             company_id=self.env.company.id,
             partner_id=self.res_partner_deco.id,
             amount=75.0,
         )
         self.assertCountEqual(
-            list(result),
+            list(result_no_order),
             [self.wire_transfer, self.paypal],
-            "Must return all enabled providers when no order",
         )