Horacio Tellez
5badb3fca8
The logs for payments contain the transaction reference whenever possible. Before logs for transactions contained the reference or the id of the transaction in an inconsitent way. No transactions are identified by reference whenever possible. The logs for payments for the same function on different acquirers should have the same format. Same flow step for different acquirers had information passed in different formats. Now at each step of a transaction flow log messages have the same format regardless of the acquirer. Overall the payment logs should have an uniform format. Hopefully understanding log messages related to transactions should be easier, as now log format is independent of the acquirer and transaction are easily identified by reference. Task - 2545450 closes odoo/odoo#79547 Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
95 lines
3.1 KiB
Python
95 lines
3.1 KiB
Python
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
import logging
|
|
|
|
from odoo import _, api, models
|
|
from odoo.exceptions import ValidationError
|
|
|
|
from odoo.addons.payment_transfer.controllers.main import TransferController
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class PaymentTransaction(models.Model):
|
|
_inherit = 'payment.transaction'
|
|
|
|
def _get_specific_rendering_values(self, processing_values):
|
|
""" Override of payment to return Transfer-specific rendering values.
|
|
|
|
Note: self.ensure_one() from `_get_processing_values`
|
|
|
|
:param dict processing_values: The generic and specific processing values of the transaction
|
|
:return: The dict of acquirer-specific processing values
|
|
:rtype: dict
|
|
"""
|
|
res = super()._get_specific_rendering_values(processing_values)
|
|
if self.provider != 'transfer':
|
|
return res
|
|
|
|
return {
|
|
'api_url': TransferController._accept_url,
|
|
'reference': self.reference,
|
|
}
|
|
|
|
@api.model
|
|
def _get_tx_from_feedback_data(self, provider, data):
|
|
""" Override of payment to find the transaction based on transfer data.
|
|
|
|
:param str provider: The provider of the acquirer that handled the transaction
|
|
:param dict data: The transfer feedback data
|
|
:return: The transaction if found
|
|
:rtype: recordset of `payment.transaction`
|
|
:raise: ValidationError if the data match no transaction
|
|
"""
|
|
tx = super()._get_tx_from_feedback_data(provider, data)
|
|
if provider != 'transfer':
|
|
return tx
|
|
|
|
reference = data.get('reference')
|
|
tx = self.search([('reference', '=', reference), ('provider', '=', 'transfer')])
|
|
if not tx:
|
|
raise ValidationError(
|
|
"Wire Transfer: " + _("No transaction found matching reference %s.", reference)
|
|
)
|
|
return tx
|
|
|
|
def _process_feedback_data(self, data):
|
|
""" Override of payment to process the transaction based on transfer data.
|
|
|
|
Note: self.ensure_one()
|
|
|
|
:param dict data: The transfer feedback data
|
|
:return: None
|
|
"""
|
|
super()._process_feedback_data(data)
|
|
if self.provider != 'transfer':
|
|
return
|
|
|
|
_logger.info(
|
|
"validated transfer payment for transaction with reference %s: set as pending",
|
|
self.reference
|
|
)
|
|
self._set_pending()
|
|
|
|
def _log_received_message(self):
|
|
""" Override of payment to remove transfer acquirer from the recordset.
|
|
|
|
:return: None
|
|
"""
|
|
other_provider_txs = self.filtered(lambda t: t.provider != 'transfer')
|
|
super(PaymentTransaction, other_provider_txs)._log_received_message()
|
|
|
|
def _get_sent_message(self):
|
|
""" Override of payment to return a different message.
|
|
|
|
:return: The 'transaction sent' message
|
|
:rtype: str
|
|
"""
|
|
message = super()._get_sent_message()
|
|
if self.provider == 'transfer':
|
|
message = _(
|
|
"The customer has selected %(acq_name)s to make the payment.",
|
|
acq_name=self.acquirer_id.name
|
|
)
|
|
return message
|