From 9ba1cc46c540704953311efbdb217f4a1db6129a Mon Sep 17 00:00:00 2001 From: fda-odoo Date: Thu, 11 Jan 2018 15:27:19 +0100 Subject: [PATCH] [FIX] payment: save the token if the option is checked in the form mode of the related acquirer. The function was searching for the wrong acquirer in the page, so check the option was without effect --- addons/payment/static/src/js/payment_form.js | 2 +- addons/website_sale/controllers/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js index 44ed16d74ac..494281759a9 100644 --- a/addons/payment/static/src/js/payment_form.js +++ b/addons/payment/static/src/js/payment_form.js @@ -142,7 +142,7 @@ odoo.define('payment.payment_form', function (require) { // if there's a prepare tx url set if ($tx_url.length === 1) { // if the user wants to save his credit card info - var form_save_token = $('input[name="o_payment_form_save_token"]').prop('checked'); + var form_save_token = acquirer_form.find('input[name="o_payment_form_save_token"]').prop('checked'); // then we call the route to prepare the transaction ajax.jsonRpc($tx_url[0].value, 'call', { 'acquirer_id': parseInt(acquirer_id), diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 190ca516d9d..4a1a9e331e3 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -749,7 +749,7 @@ class WebsiteSale(http.Controller): values['s2s_acquirers'] = [acq for acq in acquirers if acq.payment_flow == 's2s' and acq.registration_view_template_id] values['tokens'] = request.env['payment.token'].search( [('partner_id', '=', order.partner_id.id), - ('acquirer_id', 'in', [acq.id for acq in values['s2s_acquirers']])]) + ('acquirer_id', 'in', acquirers.ids)]) for acq in values['form_acquirers']: acq.form = acq.with_context(submit_class='btn btn-primary', submit_txt=_('Pay Now')).sudo().render(