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>
258 lines
10 KiB
Python
258 lines
10 KiB
Python
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
import logging
|
|
from unittest.mock import patch
|
|
|
|
from lxml import objectify
|
|
|
|
from odoo.fields import Command
|
|
from odoo.osv.expression import AND
|
|
from odoo.tools.misc import hmac as hmac_tool
|
|
|
|
from odoo.addons.base.tests.common import BaseCommon
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class PaymentCommon(BaseCommon):
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super().setUpClass()
|
|
|
|
cls.currency_euro = cls._prepare_currency('EUR')
|
|
cls.currency_usd = cls._prepare_currency('USD')
|
|
|
|
cls.country_belgium = cls.env.ref('base.be')
|
|
cls.country_france = cls.env.ref('base.fr')
|
|
cls.europe = cls.env.ref('base.europe')
|
|
|
|
cls.group_user = cls.env.ref('base.group_user')
|
|
cls.group_portal = cls.env.ref('base.group_portal')
|
|
cls.group_public = cls.env.ref('base.group_public')
|
|
|
|
cls.admin_user = cls.env.ref('base.user_admin')
|
|
cls.internal_user = cls.env['res.users'].create({
|
|
'name': 'Internal User (Test)',
|
|
'login': 'internal',
|
|
'password': 'internal',
|
|
'groups_id': [Command.link(cls.group_user.id)]
|
|
})
|
|
cls.portal_user = cls.env['res.users'].create({
|
|
'name': 'Portal User (Test)',
|
|
'login': 'payment_portal',
|
|
'password': 'payment_portal',
|
|
'groups_id': [Command.link(cls.group_portal.id)]
|
|
})
|
|
cls.public_user = cls.env.ref('base.public_user')
|
|
|
|
cls.admin_partner = cls.admin_user.partner_id
|
|
cls.internal_partner = cls.internal_user.partner_id
|
|
cls.portal_partner = cls.portal_user.partner_id
|
|
cls.default_partner = cls.env['res.partner'].create({
|
|
'name': 'Norbert Buyer',
|
|
'lang': 'en_US',
|
|
'email': 'norbert.buyer@example.com',
|
|
'street': 'Huge Street',
|
|
'street2': '2/543',
|
|
'phone': '0032 12 34 56 78',
|
|
'city': 'Sin City',
|
|
'zip': '1000',
|
|
'country_id': cls.country_belgium.id,
|
|
})
|
|
|
|
# Activate pm
|
|
cls.env.ref('payment.payment_method_unknown').write({
|
|
'active': True,
|
|
'support_tokenization': True,
|
|
})
|
|
# Create a dummy provider to allow basic tests without any specific provider implementation
|
|
arch = """
|
|
<form action="dummy" method="post">
|
|
<input type="hidden" name="view_id" t-att-value="viewid"/>
|
|
<input type="hidden" name="user_id" t-att-value="user_id.id"/>
|
|
</form>
|
|
""" # We exploit the default values `viewid` and `user_id` from QWeb's rendering context
|
|
redirect_form = cls.env['ir.ui.view'].create({
|
|
'name': "Dummy Redirect Form",
|
|
'type': 'qweb',
|
|
'arch': arch,
|
|
})
|
|
|
|
cls.dummy_provider = cls.env['payment.provider'].create({
|
|
'name': "Dummy Provider",
|
|
'code': 'none',
|
|
'state': 'test',
|
|
'is_published': True,
|
|
'payment_method_ids': [Command.set([cls.env.ref('payment.payment_method_unknown').id])],
|
|
'allow_tokenization': True,
|
|
'redirect_form_view_id': redirect_form.id,
|
|
'available_currency_ids': [Command.set(
|
|
(cls.currency_euro + cls.currency_usd + cls.env.company.currency_id).ids
|
|
)],
|
|
})
|
|
|
|
cls.provider = cls.dummy_provider
|
|
cls.payment_methods = cls.provider.payment_method_ids
|
|
cls.payment_method_id = cls.provider.payment_method_ids[:1].id
|
|
cls.payment_method_code = cls.provider.payment_method_ids[:1].code
|
|
cls.amount = 1111.11
|
|
cls.company = cls.env.company
|
|
cls.company_id = cls.company.id
|
|
cls.currency = cls.currency_euro
|
|
cls.partner = cls.default_partner
|
|
cls.reference = "Test Transaction"
|
|
|
|
account_payment_module = cls.env['ir.module.module']._get('account_payment')
|
|
cls.account_payment_installed = account_payment_module.state in ('installed', 'to upgrade')
|
|
cls.enable_reconcile_after_done_patcher = True
|
|
|
|
def setUp(self):
|
|
super().setUp()
|
|
if self.account_payment_installed and self.enable_reconcile_after_done_patcher:
|
|
# disable account payment generation if account_payment is installed
|
|
# because the accounting setup of providers is not managed in this common
|
|
self.reconcile_after_done_patcher = patch(
|
|
'odoo.addons.account_payment.models.payment_transaction.PaymentTransaction._reconcile_after_done',
|
|
)
|
|
self.startPatcher(self.reconcile_after_done_patcher)
|
|
|
|
#=== Utils ===#
|
|
|
|
@classmethod
|
|
def _prepare_currency(cls, currency_code):
|
|
currency = cls.env['res.currency'].with_context(active_test=False).search(
|
|
[('name', '=', currency_code.upper())]
|
|
)
|
|
currency.action_unarchive()
|
|
return currency
|
|
|
|
@classmethod
|
|
def _prepare_provider(cls, code='none', company=None, update_values=None):
|
|
""" Prepare and return the first provider matching the given provider and company.
|
|
|
|
If no provider is found in the given company, we duplicate the one from the base company.
|
|
|
|
All other providers belonging to the same company are disabled to avoid any interferences.
|
|
|
|
:param str code: The code of the provider to prepare
|
|
:param recordset company: The company of the provider to prepare, as a `res.company` record
|
|
:param dict update_values: The values used to update the provider
|
|
:return: The provider to prepare, if found
|
|
:rtype: recordset of `payment.provider`
|
|
"""
|
|
company = company or cls.env.company
|
|
update_values = update_values or {}
|
|
provider_domain = cls._get_provider_domain(code)
|
|
|
|
provider = cls.env['payment.provider'].sudo().search(
|
|
AND([provider_domain, [('company_id', '=', company.id)]]), limit=1
|
|
)
|
|
if not provider:
|
|
if code != 'none':
|
|
base_provider = cls.env['payment.provider'].sudo().search(provider_domain, limit=1)
|
|
else:
|
|
base_provider = cls.provider
|
|
if not base_provider:
|
|
_logger.error("no payment.provider found for code %s", code)
|
|
return cls.env['payment.provider']
|
|
else:
|
|
provider = base_provider.copy({'company_id': company.id})
|
|
|
|
update_values['state'] = 'test'
|
|
provider.write(update_values)
|
|
return provider
|
|
|
|
@classmethod
|
|
def _get_provider_domain(cls, code):
|
|
return [('code', '=', code)]
|
|
|
|
def _create_transaction(self, flow, sudo=True, **values):
|
|
default_values = {
|
|
'payment_method_id': self.payment_method_id,
|
|
'amount': self.amount,
|
|
'currency_id': self.currency.id,
|
|
'provider_id': self.provider.id,
|
|
'reference': self.reference,
|
|
'operation': f'online_{flow}',
|
|
'partner_id': self.partner.id,
|
|
}
|
|
return self.env['payment.transaction'].sudo(sudo).create(dict(default_values, **values))
|
|
|
|
def _create_token(self, sudo=True, **values):
|
|
default_values = {
|
|
'provider_id': self.provider.id,
|
|
'payment_method_id': self.payment_method_id,
|
|
'payment_details': "1234",
|
|
'partner_id': self.partner.id,
|
|
'provider_ref': "provider Ref (TEST)",
|
|
'active': True,
|
|
}
|
|
return self.env['payment.token'].sudo(sudo).create(dict(default_values, **values))
|
|
|
|
def _get_tx(self, reference):
|
|
return self.env['payment.transaction'].sudo().search([
|
|
('reference', '=', reference),
|
|
])
|
|
|
|
def _generate_test_access_token(self, *values):
|
|
""" Generate an access token based on the provided values for testing purposes.
|
|
|
|
This methods returns a token identical to that generated by
|
|
payment.utils.generate_access_token but uses the test class environment rather than the
|
|
environment of odoo.http.request.
|
|
|
|
See payment.utils.generate_access_token for additional details.
|
|
|
|
:param list values: The values to use for the generation of the token
|
|
:return: The generated access token
|
|
:rtype: str
|
|
"""
|
|
token_str = '|'.join(str(val) for val in values)
|
|
access_token = hmac_tool(self.env(su=True), 'generate_access_token', token_str)
|
|
return access_token
|
|
|
|
def _extract_values_from_html_form(self, html_form):
|
|
""" Extract the transaction rendering values from an HTML form.
|
|
|
|
:param str html_form: The HTML form
|
|
:return: The extracted information (action & inputs)
|
|
:rtype: dict[str:str]
|
|
"""
|
|
html_tree = objectify.fromstring(html_form)
|
|
if hasattr(html_tree, 'input'):
|
|
inputs = {input_.get('name'): input_.get('value') for input_ in html_tree.input}
|
|
else:
|
|
inputs = {}
|
|
return {
|
|
'action': html_tree.get('action'),
|
|
'method': html_tree.get('method'),
|
|
'inputs': inputs,
|
|
}
|
|
|
|
def _assert_does_not_raise(self, exception_class, func, *args, **kwargs):
|
|
""" Fail if an exception of the provided class is raised when calling the function.
|
|
|
|
If an exception of any other class is raised, it is caught and silently ignored.
|
|
|
|
This method cannot be used with functions that make requests. Any exception raised in the
|
|
scope of the new request will not be caught and will make the test fail.
|
|
|
|
:param class exception_class: The class of the exception to monitor
|
|
:param function fun: The function to call when monitoring for exceptions
|
|
:param list args: The positional arguments passed as-is to the called function
|
|
:param dict kwargs: The keyword arguments passed as-is to the called function
|
|
:return: None
|
|
"""
|
|
try:
|
|
func(*args, **kwargs)
|
|
except exception_class:
|
|
self.fail(f"{func.__name__} should not raise error of class {exception_class.__name__}")
|
|
except Exception:
|
|
pass # Any exception whose class is not monitored is caught and ignored
|
|
|
|
def _skip_if_account_payment_is_not_installed(self):
|
|
""" Skip current test if `account_payment` module is not installed. """
|
|
if not self.account_payment_installed:
|
|
self.skipTest("account_payment module is not installed")
|