[FIX] {account,website}_payment: filter providers per website

closes odoo#218089

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>

Author: xaviedoanhduy

addons/account_payment/controllers/portal.py

@@ -30,7 +30,8 @@ def _invoice_get_page_view_values(self, invoice, access_token, **kwargs):
             invoice_company.id,
             partner_sudo.id,
             invoice.amount_total,
-            currency_id=invoice.currency_id.id
+            currency_id=invoice.currency_id.id,
+            **kwargs,
         )  # In sudo mode to read the fields of providers and partner (if logged out).
         payment_methods_sudo = request.env['payment.method'].sudo()._get_compatible_payment_methods(
             providers_sudo.ids,

addons/sale/tests/test_payment_flow.py

@@ -1,6 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from unittest.mock import ANY, patch
+from unittest.mock import patch
 
 from odoo.exceptions import AccessError
 from odoo.tests import JsonRpcException, tagged
@@ -39,7 +39,8 @@ def test_11_so_payment_link(self):
             '._compute_show_tokenize_input_mapping'
         ) as patched:
             tx_context = self._get_portal_pay_context(**route_values)
-            patched.assert_called_once_with(ANY, sale_order_id=ANY)
+            patched.assert_called_once()
+            self.assertIn('sale_order_id', patched.call_args[1])
 
         self.assertEqual(tx_context['currency_id'], self.sale_order.currency_id.id)
         self.assertEqual(tx_context['partner_id'], self.sale_order.partner_invoice_id.id)

addons/website_payment/controllers/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import payment
 from . import portal

addons/website_payment/controllers/payment.py

@@ -0,0 +1,18 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.http import request, route
+
+from odoo.addons.account_payment.controllers import payment as account_payment
+
+
+class PaymentPortal(account_payment.PaymentPortal):
+
+    @route()
+    def payment_pay(self, *args, **kwargs):
+        """Override of `payment` to make the provider filtering website-aware."""
+        return super().payment_pay(*args, website_id=request.website.id, **kwargs)
+
+    @route()
+    def payment_method(self, **kwargs):
+        """Override of `payment` to make the provider filtering website-aware."""
+        return super().payment_method(website_id=request.website.id, **kwargs)

addons/website_payment/controllers/portal.py

@@ -6,6 +6,7 @@
 from odoo.http import request
 from odoo.tools.json import scriptsafe as json_safe
 
+from odoo.addons.account_payment.controllers import portal as account_payment_portal
 from odoo.addons.payment import utils as payment_utils
 from odoo.addons.payment.controllers import portal as payment_portal
 
@@ -151,3 +152,9 @@ def _compute_show_tokenize_input_mapping(providers_sudo, **kwargs):
             for provider_sudo in providers_sudo:
                 res[provider_sudo.id] = False
         return res
+
+
+class PortalAccount(account_payment_portal.PortalAccount):
+    def _invoice_get_page_view_values(self, *args, **kwargs):
+        """Override of `account_payment` to make the providers filtering website-aware."""
+        return super()._invoice_get_page_view_values(*args, website_id=request.website.id, **kwargs)