diff options
| author | fda-odoo <fda@odoo.com> | 2018-01-12 17:27:07 +0100 |
|---|---|---|
| committer | fda-odoo <fda@odoo.com> | 2018-01-24 15:41:31 +0100 |
| commit | 4fc96f9795b97ff357e8fb655263cda23258ba22 (patch) | |
| tree | ffba7a493e85c41226d54bff22b835ff10d6819c | |
| parent | 2bd17285ea3bcde5c86d8cd925070b048ce39082 (diff) | |
[FIX] account_payment, sale_payment: stop propagation of status message in URL after payment
We only want to keep the access_token from the URL and not all the error and success messages.
| -rw-r--r-- | addons/account_payment/controllers/payment.py | 10 | ||||
| -rw-r--r-- | addons/account_payment/views/account_portal_templates.xml | 4 | ||||
| -rw-r--r-- | addons/sale_payment/views/sale_portal_templates.xml | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/addons/account_payment/controllers/payment.py b/addons/account_payment/controllers/payment.py index 80924b910bd..2916a512b51 100644 --- a/addons/account_payment/controllers/payment.py +++ b/addons/account_payment/controllers/payment.py @@ -94,9 +94,9 @@ class PaymentPortal(http.Controller): # proceed to the payment res = tx.confirm_invoice_token() - if res is not True: - params['error'] = res - return request.redirect(_build_url_w_params(error_url, params)) - - params['success'] = 'pay_invoice' + if tx.state != 'authorized' or not tx.acquirer_id.capture_manually: + if res is not True: + params['error'] = res + return request.redirect(_build_url_w_params(error_url, params)) + params['success'] = 'pay_invoice' return request.redirect(_build_url_w_params(success_url, params)) diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml index a03085851ff..37366eba917 100644 --- a/addons/account_payment/views/account_portal_templates.xml +++ b/addons/account_payment/views/account_portal_templates.xml @@ -72,8 +72,8 @@ <t t-call="payment.payment_tokens_list"> <t t-set="mode" t-value="'payment'"/> <t t-set="partner_id" t-value="invoice.partner_id.id"/> - <t t-set="success_url" t-value="'/my/invoices/%s?%s' % (invoice.id, keep_query())"/> - <t t-set="error_url" t-value="'/my/invoices/%s?%s' % (invoice.id, keep_query())"/> + <t t-set="success_url" t-value="'/my/invoices/%s%s' % (invoice.id, ('?access_token=%s' % (access_token)) if access_token else '')"/> + <t t-set="error_url" t-value="'/my/invoices/%s%s' % (invoice.id, ('?access_token=%s' % (access_token)) if access_token else '')"/> <t t-set="access_token" t-value="access_token or ''"/> <t t-set="callback_method" t-value="''"/> <t t-set="form_action" t-value="'/invoice/pay/' + str(invoice.id) + '/s2s_token_tx/'"/> diff --git a/addons/sale_payment/views/sale_portal_templates.xml b/addons/sale_payment/views/sale_portal_templates.xml index 8b84de3c3e9..e8c5afab5db 100644 --- a/addons/sale_payment/views/sale_portal_templates.xml +++ b/addons/sale_payment/views/sale_portal_templates.xml @@ -57,8 +57,8 @@ <t t-set="mode" t-value="'payment'"/> <t t-set="partner_id" t-value="order.partner_id.id"/> <t t-set="access_token" t-value="access_token"/> - <t t-set="success_url" t-value="'/my/orders/%s?%s' % (order.id, keep_query())"/> - <t t-set="error_url" t-value="'/my/orders/%s?%s' % (order.id, keep_query())"/> + <t t-set="success_url" t-value="'/my/orders/%s%s' % (order.id, ('?access_token=%s' % (access_token)) if access_token else '')"/> + <t t-set="error_url" t-value="'/my/orders/%s%s' % (order.id, ('?access_token=%s' % (access_token)) if access_token else '')"/> <t t-set="callback_method" t-value="''"/> <t t-set="submit_txt" t-value="'Pay Now'"/> <t t-set="icon_class" t-value="'fa-lock'"/> |