From 181e2bdbdec115bbee15afba1d33542dbdad103a Mon Sep 17 00:00:00 2001
From: "Antoine Vandevenne (anv)" <anv@odoo.com>
Date: Mon, 6 Nov 2023 15:05:14 +0100
Subject: [PATCH] [FIX] payment_(adyen,authorize,stripe): unique key for inline
 form values

closes odoo/odoo#140711

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 addons/payment_adyen/static/src/js/payment_form.js            | 3 +--
 addons/payment_adyen/views/payment_form_templates.xml         | 2 +-
 addons/payment_authorize/static/src/js/payment_form.js        | 4 +++-
 .../payment_authorize/views/payment_authorize_templates.xml   | 2 +-
 addons/payment_stripe/static/src/js/payment_form.js           | 4 +++-
 addons/payment_stripe/views/payment_stripe_templates.xml      | 4 +++-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/payment_adyen/static/src/js/payment_form.js b/addons/payment_adyen/static/src/js/payment_form.js
index 58f11d3c354..0721c14c661 100644
--- a/addons/payment_adyen/static/src/js/payment_form.js
+++ b/addons/payment_adyen/static/src/js/payment_form.js
@@ -47,8 +47,7 @@ paymentForm.include({
 
         // Extract and deserialize the inline form values.
         const radio = document.querySelector('input[name="o_payment_radio"]:checked');
-        const inlineFormValues = JSON.parse(radio.dataset['inlineFormValues']);
-        const formatted_amount = inlineFormValues['formatted_amount'];
+        const inlineFormValues = JSON.parse(radio.dataset['adyenInlineFormValues']);
         const formattedAmount = inlineFormValues['formatted_amount'];
 
         // Create the checkout object if not already done for another payment method.
diff --git a/addons/payment_adyen/views/payment_form_templates.xml b/addons/payment_adyen/views/payment_form_templates.xml
index 474e8af59c2..6c1e6811256 100644
--- a/addons/payment_adyen/views/payment_form_templates.xml
+++ b/addons/payment_adyen/views/payment_form_templates.xml
@@ -18,7 +18,7 @@
 
     <template id="payment_adyen.method_form" inherit_id="payment.method_form">
         <xpath expr="//input[@name='o_payment_radio']" position="attributes">
-            <attribute name="t-att-data-inline-form-values">
+            <attribute name="t-att-data-adyen-inline-form-values">
                 provider_sudo._adyen_get_inline_form_values(pm_sudo.code, amount, currency)
             </attribute>
         </xpath>
diff --git a/addons/payment_authorize/static/src/js/payment_form.js b/addons/payment_authorize/static/src/js/payment_form.js
index beba66e971b..ff190107f3e 100644
--- a/addons/payment_authorize/static/src/js/payment_form.js
+++ b/addons/payment_authorize/static/src/js/payment_form.js
@@ -47,7 +47,9 @@ paymentForm.include({
         const radio = document.querySelector('input[name="o_payment_radio"]:checked');
         const inlineForm = this._getInlineForm(radio);
         const authorizeForm = inlineForm.querySelector('[name="o_authorize_form"]');
-        this.authorizeData[paymentOptionId] = JSON.parse(authorizeForm.dataset['inlineFormValues']);
+        this.authorizeData[paymentOptionId] = JSON.parse(
+            authorizeForm.dataset['authorizeInlineFormValues']
+        );
         let acceptJSUrl = 'https://js.authorize.net/v1/Accept.js';
         if (this.authorizeData[paymentOptionId].state !== 'enabled') {
             acceptJSUrl = 'https://jstest.authorize.net/v1/Accept.js';
diff --git a/addons/payment_authorize/views/payment_authorize_templates.xml b/addons/payment_authorize/views/payment_authorize_templates.xml
index 4d0a958a081..8e803f4c14b 100644
--- a/addons/payment_authorize/views/payment_authorize_templates.xml
+++ b/addons/payment_authorize/views/payment_authorize_templates.xml
@@ -4,7 +4,7 @@
     <template id="inline_form">
         <div name="o_authorize_form"
              class="o_authorize_form"
-             t-att-data-inline-form-values="provider_sudo._authorize_get_inline_form_values()"
+             t-att-data-authorize-inline-form-values="provider_sudo._authorize_get_inline_form_values()"
         >
             <t t-if="pm_sudo.code == 'card'">
                 <div class="mb-3">
diff --git a/addons/payment_stripe/static/src/js/payment_form.js b/addons/payment_stripe/static/src/js/payment_form.js
index 7d06b2577cb..5c830b85439 100644
--- a/addons/payment_stripe/static/src/js/payment_form.js
+++ b/addons/payment_stripe/static/src/js/payment_form.js
@@ -44,7 +44,9 @@ paymentForm.include({
         const radio = document.querySelector('input[name="o_payment_radio"]:checked');
         const inlineForm = this._getInlineForm(radio);
         const stripeInlineForm = inlineForm.querySelector('[name="o_stripe_element_container"]');
-        this.stripeInlineFormValues = JSON.parse(stripeInlineForm.dataset['inlineFormValues']);
+        this.stripeInlineFormValues = JSON.parse(
+            stripeInlineForm.dataset['stripeInlineFormValues']
+        );
 
         // Instantiate the elements.
         let elementsOptions =  {
diff --git a/addons/payment_stripe/views/payment_stripe_templates.xml b/addons/payment_stripe/views/payment_stripe_templates.xml
index 173bf2c5c55..e32709093b8 100644
--- a/addons/payment_stripe/views/payment_stripe_templates.xml
+++ b/addons/payment_stripe/views/payment_stripe_templates.xml
@@ -11,7 +11,9 @@
                         sale_order_id=sale_order_id,
                     )"
         />
-        <div name="o_stripe_element_container" t-att-data-inline-form-values="inline_form_values"/>
+        <div name="o_stripe_element_container"
+             t-att-data-stripe-inline-form-values="inline_form_values"
+        />
     </template>
 
     <template id="express_checkout_form">