7e012dd544
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>
106 lines
4.2 KiB
Python
106 lines
4.2 KiB
Python
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
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_payumoney.controllers.main import PayUMoneyController
|
|
|
|
|
|
class PaymentTransaction(models.Model):
|
|
_inherit = 'payment.transaction'
|
|
|
|
def _get_specific_rendering_values(self, processing_values):
|
|
""" Override of payment to return Payumoney-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
|
|
"""
|
|
res = super()._get_specific_rendering_values(processing_values)
|
|
if self.provider_code != 'payumoney':
|
|
return res
|
|
|
|
first_name, last_name = payment_utils.split_partner_name(self.partner_id.name)
|
|
api_url = 'https://secure.payu.in/_payment' if self.provider_id.state == 'enabled' \
|
|
else 'https://sandboxsecure.payu.in/_payment'
|
|
payumoney_values = {
|
|
'key': self.provider_id.payumoney_merchant_key,
|
|
'txnid': self.reference,
|
|
'amount': self.amount,
|
|
'productinfo': self.reference,
|
|
'firstname': first_name,
|
|
'lastname': last_name,
|
|
'email': self.partner_email,
|
|
'phone': self.partner_phone,
|
|
'return_url': urls.url_join(self.get_base_url(), PayUMoneyController._return_url),
|
|
'api_url': api_url,
|
|
}
|
|
payumoney_values['hash'] = self.provider_id._payumoney_generate_sign(
|
|
payumoney_values, incoming=False,
|
|
)
|
|
return payumoney_values
|
|
|
|
def _get_tx_from_notification_data(self, provider_code, notification_data):
|
|
""" Override of payment to find the transaction based on Payumoney 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 were received
|
|
:raise: ValidationError if the data match no transaction
|
|
"""
|
|
tx = super()._get_tx_from_notification_data(provider_code, notification_data)
|
|
if provider_code != 'payumoney' or len(tx) == 1:
|
|
return tx
|
|
|
|
reference = notification_data.get('txnid')
|
|
if not reference:
|
|
raise ValidationError(
|
|
"PayUmoney: " + _("Received data with missing reference (%s)", reference)
|
|
)
|
|
|
|
tx = self.search([('reference', '=', reference), ('provider_code', '=', 'payumoney')])
|
|
if not tx:
|
|
raise ValidationError(
|
|
"PayUmoney: " + _("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 Payumoney data.
|
|
|
|
Note: self.ensure_one()
|
|
|
|
:param dict notification_data: The notification data sent by the provider
|
|
:return: None
|
|
"""
|
|
super()._process_notification_data(notification_data)
|
|
if self.provider_code != 'payumoney':
|
|
return
|
|
|
|
# Update the provider reference.
|
|
self.provider_reference = notification_data.get('payuMoneyId')
|
|
|
|
# Update the payment method
|
|
payment_method_type = notification_data.get('bankcode', '')
|
|
payment_method = self.env['payment.method']._get_from_code(payment_method_type)
|
|
self.payment_method_id = payment_method or self.payment_method_id
|
|
|
|
# Update the payment state.
|
|
status = notification_data.get('status')
|
|
if status == 'success':
|
|
self._set_done()
|
|
else: # 'failure'
|
|
# See https://www.payumoney.com/pdf/PayUMoney-Technical-Integration-Document.pdf
|
|
error_code = notification_data.get('Error')
|
|
self._set_error(
|
|
"PayUmoney: " + _("The payment encountered an error with code %s", error_code)
|
|
)
|