summaryrefslogtreecommitdiff
path: root/addons/payment/controllers
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2020-06-19 11:45:10 +0000
committerNicolas Martinelli <nim@odoo.com>2020-06-23 08:27:29 +0000
commit7a4e90de8aef581cb78ddfbd3cb5f5abcc1137ec (patch)
treea79958cec6c7ff3020ecf6d09ae6085039731ad9 /addons/payment/controllers
parent9e60a82680259cd5125738da21fb9e4b82eabc34 (diff)
[FIX] account_payment, payment: filter providers
- Install 3 payment providers: P1: no countries set P2: country set to USA P3: country set to Canada - Activate online payment of invoices - Create an invoice for portal user A (country of user is USA) - Login with A - Pay the invoice All 3 providers are available, while only 1 & 2 should be available. The providers are filtered in the sale module, but not in the account module: https://github.com/odoo/odoo/blob/586ee04a6296c13868011b3afaca61be5c6ff3c6/addons/sale/controllers/portal.py#L190-L193 The same issue occurs with the direct link `/website_payment/pay`. We apply the same filtering in all modules. opw-2279710 closes odoo/odoo#53483 X-original-commit: aaac93b551e2a5f331dd14ee5aefbe4ced173691 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Diffstat (limited to 'addons/payment/controllers')
-rw-r--r--addons/payment/controllers/portal.py23
1 files changed, 15 insertions, 8 deletions
diff --git a/addons/payment/controllers/portal.py b/addons/payment/controllers/portal.py
index ece7f11dcd6..d3455abb75b 100644
--- a/addons/payment/controllers/portal.py
+++ b/addons/payment/controllers/portal.py
@@ -10,6 +10,7 @@ import werkzeug
from odoo import http, _
from odoo.http import request
+from odoo.osv import expression
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, consteq, ustr
from odoo.tools.float_utils import float_repr
from datetime import datetime, timedelta
@@ -207,14 +208,6 @@ class WebsitePayment(http.Controller):
cid = user.company_id.id
else:
cid = user.company_id.id
- acquirer_domain = [('state', 'in', ['enabled', 'test']), ('company_id', '=', cid)]
-
- if acquirer_id:
- acquirers = env['payment.acquirer'].browse(int(acquirer_id))
- if order_id:
- acquirers = env['payment.acquirer'].search(acquirer_domain)
- if not acquirers:
- acquirers = env['payment.acquirer'].search(acquirer_domain)
# Check partner
if not user._is_public():
@@ -233,6 +226,20 @@ class WebsitePayment(http.Controller):
'error_msg': kw.get('error_msg')
})
+ acquirer_domain = ['&', ('state', 'in', ['enabled', 'test']), ('company_id', '=', cid)]
+ if partner_id:
+ partner = request.env['res.partner'].browse([partner_id])
+ acquirer_domain = expression.AND([
+ acquirer_domain,
+ ['|', ('country_ids', '=', False), ('country_ids', 'in', [partner.country_id.id])]
+ ])
+ if acquirer_id:
+ acquirers = env['payment.acquirer'].browse(int(acquirer_id))
+ if order_id:
+ acquirers = env['payment.acquirer'].search(acquirer_domain)
+ if not acquirers:
+ acquirers = env['payment.acquirer'].search(acquirer_domain)
+
# s2s mode will always generate a token, which we don't want for public users
valid_flows = ['form', 's2s'] if not user._is_public() else ['form']
values['acquirers'] = [acq for acq in acquirers if acq.payment_flow in valid_flows]