Before this commit, the payment providers (e.g., Stripe, Adyen...) available for payment were displayed on the payment forms. The customer had to select one to process their payment. After that, the customer had to select their preferred payment method (e.g., Credit Card, Bancontact...) from a list of payment methods supported by the selected provider over which the website administrator had close to no control. This was making the payment forms confusing because the payment methods were displayed sometimes more than once, if at all, in a non-controlled order, and behind the selection of a payment provider that customers should not have to deal with. As the payment method was selected in an iframe or directly on the provider's website, the information on the selection payment method was not available in Odoo. This posed many problems, among which were the impossibility of assessing whether a specific feature (e.g., tokenization, refunds, manual capture...) was available, not being able to easily identify payment tokens through the payment method logo, listing available payment methods on the website, sorting and fine-grained configuration of the available payment method, subpar payment method-specific display on the payment form (e.g., PayPal that requires displaying a "Pay with PayPal" button), etc. In this commit, the payment providers are thus replaced by the payment methods on the payment forms. All contextually available (depending on the country, currency, requested feature...) payment methods are displayed one after the other on a single-level list and in the order configured by the website administrator. Each payment method is "powered by" (i.e., linked) to a single payment provider: the first one, by model order, to support it. This allows, for example, offering the PayPal payment method through Mollie, which charges low processing fees, while also offering Klarna through Stripe, which supports more payment methods but charges higher processing fees. While doing so, the two different payment forms, "Checkout" and "Manage", are also merged together in a new, configurable case-by-case, payment form that is entirely redesigned to offer a better user experience. After payment, the information on the selected payment method is saved on the transaction and eventual payment record and updated with the information received from the provider. task-2882677 closes odoo/odoo#120446 Related: odoo/upgrade#5103 Related: odoo/documentation#5717 Related: odoo/enterprise#40666 Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com> Co-authored-by: Anita (anko) <anko@odoo.com> Co-authored-by: Brieuc-brd <brd@odoo.com> Co-authored-by: Valeriya (vchu) <vchu@odoo.com>
175 lines
8.0 KiB
Python
175 lines
8.0 KiB
Python
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
import logging
|
|
|
|
from werkzeug import urls
|
|
|
|
from odoo import _, api, models
|
|
from odoo.exceptions import ValidationError
|
|
|
|
from odoo.addons.payment import utils as payment_utils
|
|
from odoo.addons.payment_asiapay import const
|
|
from odoo.addons.payment_asiapay.controllers.main import AsiaPayController
|
|
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class PaymentTransaction(models.Model):
|
|
_inherit = 'payment.transaction'
|
|
|
|
@api.model
|
|
def _compute_reference(self, provider_code, prefix=None, separator='-', **kwargs):
|
|
""" Override of `payment` to ensure that AsiaPay requirements for references are satisfied.
|
|
|
|
AsiaPay requirements for references are as follows:
|
|
- References must be unique at provider level for a given merchant account.
|
|
This is satisfied by singularizing the prefix with the current datetime. If two
|
|
transactions are created simultaneously, `_compute_reference` ensures the uniqueness of
|
|
references by suffixing a sequence number.
|
|
- References must be at most 35 characters long.
|
|
|
|
:param str provider_code: The code of the provider handling the transaction.
|
|
:param str prefix: The custom prefix used to compute the full reference.
|
|
:param str separator: The custom separator used to separate the prefix from the suffix.
|
|
:return: The unique reference for the transaction.
|
|
:rtype: str
|
|
"""
|
|
if provider_code != 'asiapay':
|
|
return super()._compute_reference(provider_code, prefix=prefix, **kwargs)
|
|
|
|
if not prefix:
|
|
# If no prefix is provided, it could mean that a module has passed a kwarg intended for
|
|
# the `_compute_reference_prefix` method, as it is only called if the prefix is empty.
|
|
# We call it manually here because singularizing the prefix would generate a default
|
|
# value if it was empty, hence preventing the method from ever being called and the
|
|
# transaction from received a reference named after the related document.
|
|
prefix = self.sudo()._compute_reference_prefix(provider_code, separator, **kwargs) or None
|
|
prefix = payment_utils.singularize_reference_prefix(prefix=prefix, max_length=35)
|
|
return super()._compute_reference(provider_code, prefix=prefix, **kwargs)
|
|
|
|
def _get_specific_rendering_values(self, processing_values):
|
|
""" Override of `payment` to return AsiaPay-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 provider-specific processing values.
|
|
:rtype: dict
|
|
"""
|
|
def get_language_code(lang_):
|
|
""" Return the language code corresponding to the provided lang.
|
|
|
|
If the lang is not mapped to any language code, the country code is used instead. In
|
|
case the country code has no match either, we fall back to English.
|
|
|
|
:param str lang_: The lang, in IETF language tag format.
|
|
:return: The corresponding language code.
|
|
:rtype: str
|
|
"""
|
|
language_code_ = const.LANGUAGE_CODES_MAPPING.get(lang_)
|
|
if not language_code_:
|
|
country_code_ = lang_.split('_')[0]
|
|
language_code_ = const.LANGUAGE_CODES_MAPPING.get(country_code_)
|
|
if not language_code_:
|
|
language_code_ = const.LANGUAGE_CODES_MAPPING['en']
|
|
return language_code_
|
|
|
|
res = super()._get_specific_rendering_values(processing_values)
|
|
if self.provider_code != 'asiapay':
|
|
return res
|
|
|
|
base_url = self.provider_id.get_base_url()
|
|
# The lang is taken from the context rather than from the partner because it is not required
|
|
# to be logged in to make a payment, and because the lang is not always set on the partner.
|
|
lang = self._context.get('lang') or 'en_US'
|
|
rendering_values = {
|
|
'merchant_id': self.provider_id.asiapay_merchant_id,
|
|
'amount': self.amount,
|
|
'reference': self.reference,
|
|
'currency_code': const.CURRENCY_MAPPING[self.provider_id.available_currency_ids[0].name],
|
|
'mps_mode': 'SCP',
|
|
'return_url': urls.url_join(base_url, AsiaPayController._return_url),
|
|
'payment_type': 'N',
|
|
'language': get_language_code(lang),
|
|
'payment_method': const.PAYMENT_METHODS_MAPPING.get(self.payment_method_id.code, 'ALL'),
|
|
}
|
|
rendering_values.update({
|
|
'secure_hash': self.provider_id._asiapay_calculate_signature(
|
|
rendering_values, incoming=False
|
|
),
|
|
'api_url': self.provider_id._asiapay_get_api_url()
|
|
})
|
|
return rendering_values
|
|
|
|
def _get_tx_from_notification_data(self, provider_code, notification_data):
|
|
""" Override of `payment` to find the transaction based on AsiaPay data.
|
|
|
|
:param str provider_code: The code of the provider that handled the transaction.
|
|
:param dict notification_data: The notification data sent by the provider.
|
|
:return: The transaction if found.
|
|
:rtype: recordset of `payment.transaction`
|
|
:raise ValidationError: If inconsistent data are received.
|
|
:raise ValidationError: If the data match no transaction.
|
|
"""
|
|
tx = super()._get_tx_from_notification_data(provider_code, notification_data)
|
|
if provider_code != 'asiapay' or len(tx) == 1:
|
|
return tx
|
|
|
|
reference = notification_data.get('Ref')
|
|
if not reference:
|
|
raise ValidationError(
|
|
"AsiaPay: " + _("Received data with missing reference %(ref)s.", ref=reference)
|
|
)
|
|
|
|
tx = self.search([('reference', '=', reference), ('provider_code', '=', 'asiapay')])
|
|
if not tx:
|
|
raise ValidationError(
|
|
"AsiaPay: " + _("No transaction found matching reference %s.", reference)
|
|
)
|
|
|
|
return tx
|
|
|
|
def _process_notification_data(self, notification_data):
|
|
""" Override of `payment' to process the transaction based on AsiaPay data.
|
|
|
|
Note: self.ensure_one()
|
|
|
|
:param dict notification_data: The notification data sent by the provider.
|
|
:return: None
|
|
:raise ValidationError: If inconsistent data are received.
|
|
"""
|
|
super()._process_notification_data(notification_data)
|
|
if self.provider_code != 'asiapay':
|
|
return
|
|
|
|
# Update the provider reference.
|
|
self.provider_reference = notification_data.get('PayRef')
|
|
|
|
# Update the payment method.
|
|
payment_method_code = notification_data.get('payMethod')
|
|
payment_method = self.env['payment.method']._get_from_code(
|
|
payment_method_code, mapping=const.PAYMENT_METHODS_MAPPING
|
|
)
|
|
self.payment_method_id = payment_method or self.payment_method_id
|
|
|
|
# Update the payment state.
|
|
success_code = notification_data.get('successcode')
|
|
primary_response_code = notification_data.get('prc')
|
|
if not success_code:
|
|
raise ValidationError("AsiaPay: " + _("Received data with missing success code."))
|
|
if success_code in const.SUCCESS_CODE_MAPPING['done']:
|
|
self._set_done()
|
|
elif success_code in const.SUCCESS_CODE_MAPPING['error']:
|
|
self._set_error(_(
|
|
"An error occurred during the processing of your payment (success code %s; primary "
|
|
"response code %s). Please try again.", success_code, primary_response_code
|
|
))
|
|
else:
|
|
_logger.warning(
|
|
"Received data with invalid success code (%s) for transaction with primary response "
|
|
"code %s and reference %s.", success_code, primary_response_code, self.reference
|
|
)
|
|
self._set_error("AsiaPay: " + _("Unknown success code: %s", success_code))
|