diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml index ce4edcf019a..01b032f6733 100644 --- a/addons/payment/data/payment_acquirer_data.xml +++ b/addons/payment/data/payment_acquirer_data.xml @@ -245,8 +245,8 @@ 30 - + file="payment_custom/static/description/icon.png"/> + diff --git a/addons/payment/wizards/payment_onboarding_wizard.py b/addons/payment/wizards/payment_onboarding_wizard.py index 7128a5a4508..f5535957cf3 100644 --- a/addons/payment/wizards/payment_onboarding_wizard.py +++ b/addons/payment/wizards/payment_onboarding_wizard.py @@ -42,7 +42,7 @@ class PaymentWizard(models.TransientModel): def _get_manual_payment_acquirer(self, env=None): if env is None: env = self.env - module_id = env.ref('base.module_payment_transfer').id + module_id = env.ref('base.module_payment_custom').id return env['payment.acquirer'].search([('module_id', '=', module_id), ('company_id', '=', env.company.id)], limit=1) diff --git a/addons/payment_transfer/__init__.py b/addons/payment_custom/__init__.py similarity index 80% rename from addons/payment_transfer/__init__.py rename to addons/payment_custom/__init__.py index ae8fd5b6faa..4637f9c6cb8 100644 --- a/addons/payment_transfer/__init__.py +++ b/addons/payment_custom/__init__.py @@ -7,4 +7,4 @@ from odoo.addons.payment import reset_payment_acquirer def uninstall_hook(cr, registry): - reset_payment_acquirer(cr, registry, 'transfer') + reset_payment_acquirer(cr, registry, 'custom') diff --git a/addons/payment_transfer/__manifest__.py b/addons/payment_custom/__manifest__.py similarity index 66% rename from addons/payment_transfer/__manifest__.py rename to addons/payment_custom/__manifest__.py index dd47f5c5736..460f4b79eb3 100644 --- a/addons/payment_transfer/__manifest__.py +++ b/addons/payment_custom/__manifest__.py @@ -1,18 +1,16 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. { - 'name': 'Wire Transfer Payment Acquirer', + 'name': 'Custom Payment Modes', 'version': '2.0', 'category': 'Accounting/Payment Acquirers', - 'summary': 'Payment Acquirer: Wire Transfer Implementation', - 'description': """Wire Transfer Payment Acquirer""", + 'summary': 'Payment Acquirer: Custom payment modes', 'depends': ['payment'], 'data': [ + 'views/payment_custom_templates.xml', 'views/payment_views.xml', - 'views/payment_transfer_templates.xml', 'data/payment_acquirer_data.xml', ], - 'auto_install': True, 'assets': { 'web.assets_frontend': [ 'payment_transfer/static/src/js/post_processing.js', diff --git a/addons/payment_transfer/controllers/__init__.py b/addons/payment_custom/controllers/__init__.py similarity index 100% rename from addons/payment_transfer/controllers/__init__.py rename to addons/payment_custom/controllers/__init__.py diff --git a/addons/payment_custom/controllers/main.py b/addons/payment_custom/controllers/main.py new file mode 100644 index 00000000000..b8e09f74805 --- /dev/null +++ b/addons/payment_custom/controllers/main.py @@ -0,0 +1,18 @@ +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +import logging +import pprint + +from odoo.http import Controller, request, route + +_logger = logging.getLogger(__name__) + + +class CustomController(Controller): + _process_url = '/payment/custom/process' + + @route(_process_url, type='http', auth='public', methods=['POST'], csrf=False) + def custom_process_transaction(self, **post): + _logger.info("Handling custom processing with data:\n%s", pprint.pformat(post)) + request.env['payment.transaction'].sudo()._handle_notification_data('custom', post) + return request.redirect('/payment/status') diff --git a/addons/payment_custom/data/payment_acquirer_data.xml b/addons/payment_custom/data/payment_acquirer_data.xml new file mode 100644 index 00000000000..902e8aa2221 --- /dev/null +++ b/addons/payment_custom/data/payment_acquirer_data.xml @@ -0,0 +1,15 @@ + + + + + custom + + + + + + + + diff --git a/addons/payment_transfer/i18n/af.po b/addons/payment_custom/i18n/af.po similarity index 100% rename from addons/payment_transfer/i18n/af.po rename to addons/payment_custom/i18n/af.po diff --git a/addons/payment_transfer/i18n/ar.po b/addons/payment_custom/i18n/ar.po similarity index 100% rename from addons/payment_transfer/i18n/ar.po rename to addons/payment_custom/i18n/ar.po diff --git a/addons/payment_transfer/i18n/az.po b/addons/payment_custom/i18n/az.po similarity index 100% rename from addons/payment_transfer/i18n/az.po rename to addons/payment_custom/i18n/az.po diff --git a/addons/payment_transfer/i18n/bg.po b/addons/payment_custom/i18n/bg.po similarity index 100% rename from addons/payment_transfer/i18n/bg.po rename to addons/payment_custom/i18n/bg.po diff --git a/addons/payment_transfer/i18n/bs.po b/addons/payment_custom/i18n/bs.po similarity index 100% rename from addons/payment_transfer/i18n/bs.po rename to addons/payment_custom/i18n/bs.po diff --git a/addons/payment_transfer/i18n/ca.po b/addons/payment_custom/i18n/ca.po similarity index 100% rename from addons/payment_transfer/i18n/ca.po rename to addons/payment_custom/i18n/ca.po diff --git a/addons/payment_transfer/i18n/cs.po b/addons/payment_custom/i18n/cs.po similarity index 100% rename from addons/payment_transfer/i18n/cs.po rename to addons/payment_custom/i18n/cs.po diff --git a/addons/payment_transfer/i18n/da.po b/addons/payment_custom/i18n/da.po similarity index 100% rename from addons/payment_transfer/i18n/da.po rename to addons/payment_custom/i18n/da.po diff --git a/addons/payment_transfer/i18n/de.po b/addons/payment_custom/i18n/de.po similarity index 100% rename from addons/payment_transfer/i18n/de.po rename to addons/payment_custom/i18n/de.po diff --git a/addons/payment_transfer/i18n/el.po b/addons/payment_custom/i18n/el.po similarity index 100% rename from addons/payment_transfer/i18n/el.po rename to addons/payment_custom/i18n/el.po diff --git a/addons/payment_transfer/i18n/en_GB.po b/addons/payment_custom/i18n/en_GB.po similarity index 100% rename from addons/payment_transfer/i18n/en_GB.po rename to addons/payment_custom/i18n/en_GB.po diff --git a/addons/payment_transfer/i18n/es.po b/addons/payment_custom/i18n/es.po similarity index 100% rename from addons/payment_transfer/i18n/es.po rename to addons/payment_custom/i18n/es.po diff --git a/addons/payment_transfer/i18n/es_BO.po b/addons/payment_custom/i18n/es_BO.po similarity index 100% rename from addons/payment_transfer/i18n/es_BO.po rename to addons/payment_custom/i18n/es_BO.po diff --git a/addons/payment_transfer/i18n/es_CL.po b/addons/payment_custom/i18n/es_CL.po similarity index 100% rename from addons/payment_transfer/i18n/es_CL.po rename to addons/payment_custom/i18n/es_CL.po diff --git a/addons/payment_transfer/i18n/es_CO.po b/addons/payment_custom/i18n/es_CO.po similarity index 100% rename from addons/payment_transfer/i18n/es_CO.po rename to addons/payment_custom/i18n/es_CO.po diff --git a/addons/payment_transfer/i18n/es_CR.po b/addons/payment_custom/i18n/es_CR.po similarity index 100% rename from addons/payment_transfer/i18n/es_CR.po rename to addons/payment_custom/i18n/es_CR.po diff --git a/addons/payment_transfer/i18n/es_DO.po b/addons/payment_custom/i18n/es_DO.po similarity index 100% rename from addons/payment_transfer/i18n/es_DO.po rename to addons/payment_custom/i18n/es_DO.po diff --git a/addons/payment_transfer/i18n/es_EC.po b/addons/payment_custom/i18n/es_EC.po similarity index 100% rename from addons/payment_transfer/i18n/es_EC.po rename to addons/payment_custom/i18n/es_EC.po diff --git a/addons/payment_transfer/i18n/es_PA.po b/addons/payment_custom/i18n/es_PA.po similarity index 100% rename from addons/payment_transfer/i18n/es_PA.po rename to addons/payment_custom/i18n/es_PA.po diff --git a/addons/payment_transfer/i18n/es_PE.po b/addons/payment_custom/i18n/es_PE.po similarity index 100% rename from addons/payment_transfer/i18n/es_PE.po rename to addons/payment_custom/i18n/es_PE.po diff --git a/addons/payment_transfer/i18n/es_PY.po b/addons/payment_custom/i18n/es_PY.po similarity index 100% rename from addons/payment_transfer/i18n/es_PY.po rename to addons/payment_custom/i18n/es_PY.po diff --git a/addons/payment_transfer/i18n/es_VE.po b/addons/payment_custom/i18n/es_VE.po similarity index 100% rename from addons/payment_transfer/i18n/es_VE.po rename to addons/payment_custom/i18n/es_VE.po diff --git a/addons/payment_transfer/i18n/et.po b/addons/payment_custom/i18n/et.po similarity index 100% rename from addons/payment_transfer/i18n/et.po rename to addons/payment_custom/i18n/et.po diff --git a/addons/payment_transfer/i18n/fa.po b/addons/payment_custom/i18n/fa.po similarity index 100% rename from addons/payment_transfer/i18n/fa.po rename to addons/payment_custom/i18n/fa.po diff --git a/addons/payment_transfer/i18n/fi.po b/addons/payment_custom/i18n/fi.po similarity index 100% rename from addons/payment_transfer/i18n/fi.po rename to addons/payment_custom/i18n/fi.po diff --git a/addons/payment_transfer/i18n/fo.po b/addons/payment_custom/i18n/fo.po similarity index 100% rename from addons/payment_transfer/i18n/fo.po rename to addons/payment_custom/i18n/fo.po diff --git a/addons/payment_transfer/i18n/fr.po b/addons/payment_custom/i18n/fr.po similarity index 100% rename from addons/payment_transfer/i18n/fr.po rename to addons/payment_custom/i18n/fr.po diff --git a/addons/payment_transfer/i18n/fr_BE.po b/addons/payment_custom/i18n/fr_BE.po similarity index 100% rename from addons/payment_transfer/i18n/fr_BE.po rename to addons/payment_custom/i18n/fr_BE.po diff --git a/addons/payment_transfer/i18n/gl.po b/addons/payment_custom/i18n/gl.po similarity index 100% rename from addons/payment_transfer/i18n/gl.po rename to addons/payment_custom/i18n/gl.po diff --git a/addons/payment_transfer/i18n/gu.po b/addons/payment_custom/i18n/gu.po similarity index 100% rename from addons/payment_transfer/i18n/gu.po rename to addons/payment_custom/i18n/gu.po diff --git a/addons/payment_transfer/i18n/he.po b/addons/payment_custom/i18n/he.po similarity index 100% rename from addons/payment_transfer/i18n/he.po rename to addons/payment_custom/i18n/he.po diff --git a/addons/payment_transfer/i18n/hr.po b/addons/payment_custom/i18n/hr.po similarity index 100% rename from addons/payment_transfer/i18n/hr.po rename to addons/payment_custom/i18n/hr.po diff --git a/addons/payment_transfer/i18n/hu.po b/addons/payment_custom/i18n/hu.po similarity index 100% rename from addons/payment_transfer/i18n/hu.po rename to addons/payment_custom/i18n/hu.po diff --git a/addons/payment_transfer/i18n/hy.po b/addons/payment_custom/i18n/hy.po similarity index 100% rename from addons/payment_transfer/i18n/hy.po rename to addons/payment_custom/i18n/hy.po diff --git a/addons/payment_transfer/i18n/id.po b/addons/payment_custom/i18n/id.po similarity index 100% rename from addons/payment_transfer/i18n/id.po rename to addons/payment_custom/i18n/id.po diff --git a/addons/payment_transfer/i18n/is.po b/addons/payment_custom/i18n/is.po similarity index 100% rename from addons/payment_transfer/i18n/is.po rename to addons/payment_custom/i18n/is.po diff --git a/addons/payment_transfer/i18n/it.po b/addons/payment_custom/i18n/it.po similarity index 100% rename from addons/payment_transfer/i18n/it.po rename to addons/payment_custom/i18n/it.po diff --git a/addons/payment_transfer/i18n/ja.po b/addons/payment_custom/i18n/ja.po similarity index 100% rename from addons/payment_transfer/i18n/ja.po rename to addons/payment_custom/i18n/ja.po diff --git a/addons/payment_transfer/i18n/ka.po b/addons/payment_custom/i18n/ka.po similarity index 100% rename from addons/payment_transfer/i18n/ka.po rename to addons/payment_custom/i18n/ka.po diff --git a/addons/payment_transfer/i18n/kab.po b/addons/payment_custom/i18n/kab.po similarity index 100% rename from addons/payment_transfer/i18n/kab.po rename to addons/payment_custom/i18n/kab.po diff --git a/addons/payment_transfer/i18n/km.po b/addons/payment_custom/i18n/km.po similarity index 100% rename from addons/payment_transfer/i18n/km.po rename to addons/payment_custom/i18n/km.po diff --git a/addons/payment_transfer/i18n/ko.po b/addons/payment_custom/i18n/ko.po similarity index 100% rename from addons/payment_transfer/i18n/ko.po rename to addons/payment_custom/i18n/ko.po diff --git a/addons/payment_transfer/i18n/lb.po b/addons/payment_custom/i18n/lb.po similarity index 100% rename from addons/payment_transfer/i18n/lb.po rename to addons/payment_custom/i18n/lb.po diff --git a/addons/payment_transfer/i18n/lt.po b/addons/payment_custom/i18n/lt.po similarity index 100% rename from addons/payment_transfer/i18n/lt.po rename to addons/payment_custom/i18n/lt.po diff --git a/addons/payment_transfer/i18n/lv.po b/addons/payment_custom/i18n/lv.po similarity index 100% rename from addons/payment_transfer/i18n/lv.po rename to addons/payment_custom/i18n/lv.po diff --git a/addons/payment_transfer/i18n/mk.po b/addons/payment_custom/i18n/mk.po similarity index 100% rename from addons/payment_transfer/i18n/mk.po rename to addons/payment_custom/i18n/mk.po diff --git a/addons/payment_transfer/i18n/mn.po b/addons/payment_custom/i18n/mn.po similarity index 100% rename from addons/payment_transfer/i18n/mn.po rename to addons/payment_custom/i18n/mn.po diff --git a/addons/payment_transfer/i18n/nb.po b/addons/payment_custom/i18n/nb.po similarity index 100% rename from addons/payment_transfer/i18n/nb.po rename to addons/payment_custom/i18n/nb.po diff --git a/addons/payment_transfer/i18n/nl.po b/addons/payment_custom/i18n/nl.po similarity index 100% rename from addons/payment_transfer/i18n/nl.po rename to addons/payment_custom/i18n/nl.po diff --git a/addons/payment_transfer/i18n/nl_BE.po b/addons/payment_custom/i18n/nl_BE.po similarity index 100% rename from addons/payment_transfer/i18n/nl_BE.po rename to addons/payment_custom/i18n/nl_BE.po diff --git a/addons/payment_transfer/i18n/payment_transfer.pot b/addons/payment_custom/i18n/payment_transfer.pot similarity index 100% rename from addons/payment_transfer/i18n/payment_transfer.pot rename to addons/payment_custom/i18n/payment_transfer.pot diff --git a/addons/payment_transfer/i18n/pl.po b/addons/payment_custom/i18n/pl.po similarity index 100% rename from addons/payment_transfer/i18n/pl.po rename to addons/payment_custom/i18n/pl.po diff --git a/addons/payment_transfer/i18n/pt.po b/addons/payment_custom/i18n/pt.po similarity index 100% rename from addons/payment_transfer/i18n/pt.po rename to addons/payment_custom/i18n/pt.po diff --git a/addons/payment_transfer/i18n/pt_BR.po b/addons/payment_custom/i18n/pt_BR.po similarity index 100% rename from addons/payment_transfer/i18n/pt_BR.po rename to addons/payment_custom/i18n/pt_BR.po diff --git a/addons/payment_transfer/i18n/ro.po b/addons/payment_custom/i18n/ro.po similarity index 100% rename from addons/payment_transfer/i18n/ro.po rename to addons/payment_custom/i18n/ro.po diff --git a/addons/payment_transfer/i18n/ru.po b/addons/payment_custom/i18n/ru.po similarity index 100% rename from addons/payment_transfer/i18n/ru.po rename to addons/payment_custom/i18n/ru.po diff --git a/addons/payment_transfer/i18n/sk.po b/addons/payment_custom/i18n/sk.po similarity index 100% rename from addons/payment_transfer/i18n/sk.po rename to addons/payment_custom/i18n/sk.po diff --git a/addons/payment_transfer/i18n/sl.po b/addons/payment_custom/i18n/sl.po similarity index 100% rename from addons/payment_transfer/i18n/sl.po rename to addons/payment_custom/i18n/sl.po diff --git a/addons/payment_transfer/i18n/sr.po b/addons/payment_custom/i18n/sr.po similarity index 100% rename from addons/payment_transfer/i18n/sr.po rename to addons/payment_custom/i18n/sr.po diff --git a/addons/payment_transfer/i18n/sr@latin.po b/addons/payment_custom/i18n/sr@latin.po similarity index 100% rename from addons/payment_transfer/i18n/sr@latin.po rename to addons/payment_custom/i18n/sr@latin.po diff --git a/addons/payment_transfer/i18n/sv.po b/addons/payment_custom/i18n/sv.po similarity index 100% rename from addons/payment_transfer/i18n/sv.po rename to addons/payment_custom/i18n/sv.po diff --git a/addons/payment_transfer/i18n/te.po b/addons/payment_custom/i18n/te.po similarity index 100% rename from addons/payment_transfer/i18n/te.po rename to addons/payment_custom/i18n/te.po diff --git a/addons/payment_transfer/i18n/th.po b/addons/payment_custom/i18n/th.po similarity index 100% rename from addons/payment_transfer/i18n/th.po rename to addons/payment_custom/i18n/th.po diff --git a/addons/payment_transfer/i18n/tr.po b/addons/payment_custom/i18n/tr.po similarity index 100% rename from addons/payment_transfer/i18n/tr.po rename to addons/payment_custom/i18n/tr.po diff --git a/addons/payment_transfer/i18n/uk.po b/addons/payment_custom/i18n/uk.po similarity index 100% rename from addons/payment_transfer/i18n/uk.po rename to addons/payment_custom/i18n/uk.po diff --git a/addons/payment_transfer/i18n/vi.po b/addons/payment_custom/i18n/vi.po similarity index 100% rename from addons/payment_transfer/i18n/vi.po rename to addons/payment_custom/i18n/vi.po diff --git a/addons/payment_transfer/i18n/zh_CN.po b/addons/payment_custom/i18n/zh_CN.po similarity index 100% rename from addons/payment_transfer/i18n/zh_CN.po rename to addons/payment_custom/i18n/zh_CN.po diff --git a/addons/payment_transfer/i18n/zh_TW.po b/addons/payment_custom/i18n/zh_TW.po similarity index 100% rename from addons/payment_transfer/i18n/zh_TW.po rename to addons/payment_custom/i18n/zh_TW.po diff --git a/addons/payment_transfer/models/__init__.py b/addons/payment_custom/models/__init__.py similarity index 100% rename from addons/payment_transfer/models/__init__.py rename to addons/payment_custom/models/__init__.py diff --git a/addons/payment_transfer/models/payment_acquirer.py b/addons/payment_custom/models/payment_acquirer.py similarity index 63% rename from addons/payment_transfer/models/payment_acquirer.py rename to addons/payment_custom/models/payment_acquirer.py index fba80b4ac71..4787bd12c28 100644 --- a/addons/payment_transfer/models/payment_acquirer.py +++ b/addons/payment_custom/models/payment_acquirer.py @@ -7,8 +7,8 @@ class PaymentAcquirer(models.Model): _inherit = 'payment.acquirer' provider = fields.Selection( - selection_add=[('transfer', "Wire Transfer")], default='transfer', - ondelete={'transfer': 'set default'}) + selection_add=[('custom', "Custom")], + ondelete={'custom': 'set default'}) qr_code = fields.Boolean( string="Enable QR Codes", help="Enable the use of QR-codes when paying by wire transfer.") @@ -19,7 +19,7 @@ class PaymentAcquirer(models.Model): :return: None """ super()._compute_view_configuration_fields() - self.filtered(lambda acq: acq.provider == 'transfer').update({ + self.filtered(lambda acq: acq.provider == 'custom').update({ 'show_credentials_page': False, 'show_payment_icon_ids': False, 'show_pre_msg': False, @@ -27,23 +27,8 @@ class PaymentAcquirer(models.Model): 'show_cancel_msg': False, }) - @api.model_create_multi - def create(self, values_list): - """ Make sure to have a pending_msg set. """ - # This is done here and not in a default to have access to all required values. - acquirers = super().create(values_list) - acquirers._transfer_ensure_pending_msg_is_set() - return acquirers - - def write(self, values): - """ Make sure to have a pending_msg set. """ - # This is done here and not in a default to have access to all required values. - res = super().write(values) - self._transfer_ensure_pending_msg_is_set() - return res - def _transfer_ensure_pending_msg_is_set(self): - for acquirer in self.filtered(lambda a: a.provider == 'transfer' and not a.pending_msg): + for acquirer in self.filtered(lambda a: a.provider == 'custom' and not a.pending_msg): company_id = acquirer.company_id.id # filter only bank accounts marked as visible accounts = self.env['account.journal'].search([ diff --git a/addons/payment_transfer/models/payment_transaction.py b/addons/payment_custom/models/payment_transaction.py similarity index 79% rename from addons/payment_transfer/models/payment_transaction.py rename to addons/payment_custom/models/payment_transaction.py index 0c9ac876f98..84dfaeb341f 100644 --- a/addons/payment_transfer/models/payment_transaction.py +++ b/addons/payment_custom/models/payment_transaction.py @@ -5,7 +5,7 @@ import logging from odoo import _, api, models from odoo.exceptions import ValidationError -from odoo.addons.payment_transfer.controllers.main import TransferController +from odoo.addons.payment_custom.controllers.main import CustomController _logger = logging.getLogger(__name__) @@ -14,7 +14,7 @@ class PaymentTransaction(models.Model): _inherit = 'payment.transaction' def _get_specific_rendering_values(self, processing_values): - """ Override of payment to return Transfer-specific rendering values. + """ Override of payment to return custom-specific rendering values. Note: self.ensure_one() from `_get_processing_values` @@ -23,16 +23,16 @@ class PaymentTransaction(models.Model): :rtype: dict """ res = super()._get_specific_rendering_values(processing_values) - if self.provider != 'transfer': + if self.provider != 'custom': return res return { - 'api_url': TransferController._accept_url, + 'api_url': CustomController._process_url, 'reference': self.reference, } def _get_tx_from_notification_data(self, provider, notification_data): - """ Override of payment to find the transaction based on transfer data. + """ Override of payment to find the transaction based on custom data. :param str provider: The provider of the acquirer that handled the transaction :param dict notification_data: The notification feedback data @@ -41,11 +41,11 @@ class PaymentTransaction(models.Model): :raise: ValidationError if the data match no transaction """ tx = super()._get_tx_from_notification_data(provider, notification_data) - if provider != 'transfer' or len(tx) == 1: + if provider != 'custom' or len(tx) == 1: return tx reference = notification_data.get('reference') - tx = self.search([('reference', '=', reference), ('provider', '=', 'transfer')]) + tx = self.search([('reference', '=', reference), ('provider', '=', 'custom')]) if not tx: raise ValidationError( "Wire Transfer: " + _("No transaction found matching reference %s.", reference) @@ -53,29 +53,29 @@ class PaymentTransaction(models.Model): return tx def _process_notification_data(self, notification_data): - """ Override of payment to process the transaction based on transfer data. + """ Override of payment to process the transaction based on custom data. Note: self.ensure_one() - :param dict notification_data: The transfer data + :param dict notification_data: The custom data :return: None """ super()._process_notification_data(notification_data) - if self.provider != 'transfer': + if self.provider != 'custom': return _logger.info( - "validated transfer payment for transaction with reference %s: set as pending", + "validated custom 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. + """ Override of `payment` to remove custom acquirers from the recordset. :return: None """ - other_provider_txs = self.filtered(lambda t: t.provider != 'transfer') + other_provider_txs = self.filtered(lambda t: t.provider != 'custom') super(PaymentTransaction, other_provider_txs)._log_received_message() def _get_sent_message(self): @@ -85,7 +85,7 @@ class PaymentTransaction(models.Model): :rtype: str """ message = super()._get_sent_message() - if self.provider == 'transfer': + if self.provider == 'custom': message = _( "The customer has selected %(acq_name)s to make the payment.", acq_name=self.acquirer_id.name diff --git a/addons/payment_transfer/static/description/icon.png b/addons/payment_custom/static/description/icon.png similarity index 100% rename from addons/payment_transfer/static/description/icon.png rename to addons/payment_custom/static/description/icon.png diff --git a/addons/payment_transfer/static/description/icon.svg b/addons/payment_custom/static/description/icon.svg similarity index 100% rename from addons/payment_transfer/static/description/icon.svg rename to addons/payment_custom/static/description/icon.svg diff --git a/addons/payment_transfer/static/src/js/post_processing.js b/addons/payment_custom/static/src/js/post_processing.js similarity index 83% rename from addons/payment_transfer/static/src/js/post_processing.js rename to addons/payment_custom/static/src/js/post_processing.js index a713f42dfc4..f523e293da8 100644 --- a/addons/payment_transfer/static/src/js/post_processing.js +++ b/addons/payment_custom/static/src/js/post_processing.js @@ -1,4 +1,4 @@ -odoo.define('payment_transfer.post_processing', require => { +odoo.define('payment_custom.post_processing', require => { 'use strict'; const paymentPostProcessing = require('payment.post_processing'); @@ -6,7 +6,7 @@ odoo.define('payment_transfer.post_processing', require => { paymentPostProcessing.include({ /** * Don't wait for the transaction to be confirmed before redirecting customers to the - * landing route because Wire Transfer transactions remain in the state 'pending' forever. + * landing route because custom transactions remain in the state 'pending' forever. * * @override method from `payment.post_processing` * @param {Object} display_values_list - The post-processing values of the transactions @@ -15,7 +15,7 @@ odoo.define('payment_transfer.post_processing', require => { // In almost every case, there will be a single transaction to display. If there are // more than one transaction, the last one will most likely be the one that counts. We // use that one to redirect the user to the landing page. - if (display_values_list.length > 0 && display_values_list[0].provider === 'transfer') { + if (display_values_list.length > 0 && display_values_list[0].provider === 'custom') { window.location = display_values_list[0].landing_route; } else { return this._super(...arguments); diff --git a/addons/payment_transfer/views/payment_transfer_templates.xml b/addons/payment_custom/views/payment_custom_templates.xml similarity index 86% rename from addons/payment_transfer/views/payment_transfer_templates.xml rename to addons/payment_custom/views/payment_custom_templates.xml index c622099fb95..88eee72f94b 100644 --- a/addons/payment_transfer/views/payment_transfer_templates.xml +++ b/addons/payment_custom/views/payment_custom_templates.xml @@ -7,9 +7,9 @@ -