Nicolas (vin)
9e432ed243
There is an issue when computing the suitable payment token ids making it impossible to open a payment for a user without access to payment acquirers. Also, the default computation of payment token was wrong and would never set it correctly. The compute for the method lines in payment would not filter unavailable acquirers line and thus select them by default if they were first in line. Also fix an issue with the ordering of payment method lines X-original-commit: 73410a0fd76a70e1730883d35b79fc603741b59c
74 lines
3.3 KiB
Python
74 lines
3.3 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import _, api, Command, models
|
|
from odoo.exceptions import UserError
|
|
|
|
|
|
class AccountJournal(models.Model):
|
|
_inherit = "account.journal"
|
|
|
|
@api.constrains('inbound_payment_method_line_ids')
|
|
def _check_inbound_payment_method_line_ids(self):
|
|
"""
|
|
Check and ensure that the user do not remove a apml that is linked to an acquirer in the test or enabled state.
|
|
"""
|
|
if not self.company_id:
|
|
return
|
|
|
|
self.env['account.payment.method'].flush(['code', 'payment_type'])
|
|
self.env['account.payment.method.line'].flush(['payment_method_id'])
|
|
self.env['payment.acquirer'].flush(['provider', 'state'])
|
|
|
|
self._cr.execute('''
|
|
SELECT acquirer.id
|
|
FROM payment_acquirer acquirer
|
|
JOIN account_payment_method apm ON apm.code = acquirer.provider
|
|
LEFT JOIN account_payment_method_line apml ON apm.id = apml.payment_method_id AND apml.journal_id IS NOT NULL
|
|
WHERE acquirer.state IN ('enabled', 'test') AND apm.payment_type = 'inbound'
|
|
AND apml.id IS NULL
|
|
AND acquirer.company_id IN %(company_ids)s
|
|
''', {'company_ids': tuple(self.company_id.ids)})
|
|
ids = [r[0] for r in self._cr.fetchall()]
|
|
if ids:
|
|
acquirers = self.env['payment.acquirer'].sudo().browse(ids)
|
|
raise UserError(_("You can't delete a payment method that is linked to an acquirer in the enabled or test state.\n"
|
|
"Linked acquirer(s): %s", ', '.join(a.display_name for a in acquirers)))
|
|
|
|
def _get_available_payment_method_lines(self, payment_type):
|
|
lines = super()._get_available_payment_method_lines(payment_type)
|
|
|
|
return lines.filtered(lambda l: l.payment_acquirer_state != 'disabled')
|
|
|
|
@api.depends('outbound_payment_method_line_ids', 'inbound_payment_method_line_ids')
|
|
def _compute_available_payment_method_ids(self):
|
|
super()._compute_available_payment_method_ids()
|
|
|
|
installed_acquirers = self.env['payment.acquirer'].sudo().search([])
|
|
method_information = self.env['account.payment.method']._get_payment_method_information()
|
|
pay_methods = self.env['account.payment.method'].search([('code', 'in', list(method_information.keys()))])
|
|
pay_method_by_code = {x.code + x.payment_type: x for x in pay_methods}
|
|
|
|
# On top of the basic filtering, filter to hide unavailable acquirers.
|
|
# This avoid allowing payment method lines linked to an acquirer that has no record.
|
|
for code, vals in method_information.items():
|
|
payment_method = pay_method_by_code.get(code + 'inbound')
|
|
|
|
if not payment_method:
|
|
continue
|
|
|
|
for journal in self:
|
|
to_remove = []
|
|
|
|
available_providers = installed_acquirers.filtered(
|
|
lambda a: a.company_id == journal.company_id
|
|
).mapped('provider')
|
|
available = payment_method.code in available_providers
|
|
|
|
if vals['mode'] == 'unique' and not available:
|
|
to_remove.append(payment_method.id)
|
|
|
|
journal.write({
|
|
'available_payment_method_ids': [Command.unlink(payment_method) for payment_method in to_remove]
|
|
})
|