From 5f1638e42de0ef35727c8213ab519ef5d40e5c2b Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 15 Sep 2019 06:21:03 +0200 Subject: [I18N] Update translation terms from Transifex --- addons/payment_paypal/i18n/es.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/payment_paypal') diff --git a/addons/payment_paypal/i18n/es.po b/addons/payment_paypal/i18n/es.po index 4d572eef2a3..92dcad193ab 100644 --- a/addons/payment_paypal/i18n/es.po +++ b/addons/payment_paypal/i18n/es.po @@ -12,6 +12,8 @@ # RGB Consulting , 2018 # Nicolás Broggi , 2018 # e2f , 2018 +# John Guardado , 2019 +# Jon Perez , 2019 # msgid "" msgstr "" @@ -19,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-12 11:32+0000\n" "PO-Revision-Date: 2016-08-05 13:07+0000\n" -"Last-Translator: e2f , 2018\n" +"Last-Translator: Jon Perez , 2019\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +47,7 @@ msgstr "Adyen" #. module: payment_paypal #: selection:payment.acquirer,provider:0 msgid "Alipay" -msgstr "" +msgstr "Alipay" #. module: payment_paypal #: selection:payment.acquirer,provider:0 @@ -85,7 +87,7 @@ msgstr "Ogone" #. module: payment_paypal #: selection:payment.acquirer,provider:0 msgid "PayU Latam" -msgstr "" +msgstr "PayU Latam" #. module: payment_paypal #: selection:payment.acquirer,provider:0 -- cgit v1.2.3 From 6c97d73adbe85143213d1ead8445d193645cfbe2 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Mon, 16 Sep 2019 09:46:08 +0000 Subject: [FIX] payment_paypal: log only if tx exists Log an error only if a transaction exists. opw-2071862 closes odoo/odoo#36946 X-original-commit: 903bd53d5f11dc9a9cfea246e6c5c0a088ad02ba Signed-off-by: Nicolas Martinelli (nim) --- addons/payment_paypal/controllers/main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'addons/payment_paypal') diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py index f9166ecf302..f3fdad1d223 100644 --- a/addons/payment_paypal/controllers/main.py +++ b/addons/payment_paypal/controllers/main.py @@ -76,14 +76,16 @@ class PaypalController(http.Controller): if resp in ['VERIFIED', 'SUCCESS']: _logger.info('Paypal: validated data') res = request.env['payment.transaction'].sudo().form_feedback(post, 'paypal') - if not res: + if not res and tx: tx.sudo()._set_transaction_error('Validation error occured. Please contact your administrator.') elif resp in ['INVALID', 'FAIL']: _logger.warning('Paypal: answered INVALID/FAIL on data verification') - tx.sudo()._set_transaction_error('Invalid response from Paypal. Please contact your administrator.') + if tx: + tx.sudo()._set_transaction_error('Invalid response from Paypal. Please contact your administrator.') else: _logger.warning('Paypal: unrecognized paypal answer, received %s instead of VERIFIED/SUCCESS or INVALID/FAIL (validation: %s)' % (resp, 'PDT' if pdt_request else 'IPN/DPN')) - tx.sudo()._set_transaction_error('Unrecognized error from Paypal. Please contact your administrator.') + if tx: + tx.sudo()._set_transaction_error('Unrecognized error from Paypal. Please contact your administrator.') return res @http.route('/payment/paypal/ipn/', type='http', auth='none', methods=['POST'], csrf=False) -- cgit v1.2.3