From 20a4a8e0d30652839d2147122a6e63f8335be80b Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Wed, 17 Apr 2024 14:51:30 +0100
Subject: [PATCH] Fix AXO loading when vaulting disabled

---
 modules/ppcp-axo/resources/js/AxoManager.js        |  2 ++
 .../resources/js/modules/Helper/ScriptLoading.js   | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/ppcp-axo/resources/js/AxoManager.js b/modules/ppcp-axo/resources/js/AxoManager.js
index 13b4a469a..e7204a925 100644
--- a/modules/ppcp-axo/resources/js/AxoManager.js
+++ b/modules/ppcp-axo/resources/js/AxoManager.js
@@ -78,6 +78,8 @@ class AxoManager {
                 });
             }
         }
+
+        this.triggerGatewayChange();
     }
 
     registerEventHandlers() {
diff --git a/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js b/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js
index 073be837a..c2b7a6dda 100644
--- a/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js
+++ b/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js
@@ -60,6 +60,13 @@ export const loadPaypalScript = (config, onLoaded, onError = null) => {
         scriptOptions = merge(scriptOptions, config.script_attributes);
     }
 
+    // Axo SDK options
+    const sdkClientToken = config?.axo?.sdk_client_token;
+    if(sdkClientToken) {
+        scriptOptions['data-sdk-client-token'] = sdkClientToken;
+        scriptOptions['data-client-metadata-id'] = 'ppcp-cm-id';
+    }
+
     // Load PayPal script for special case with data-client-token
     if (config.data_client_id?.set_attribute) {
         dataClientIdAttributeHandler(scriptOptions, config.data_client_id, callback, errorCallback);
@@ -72,13 +79,6 @@ export const loadPaypalScript = (config, onLoaded, onError = null) => {
         scriptOptions['data-user-id-token'] = userIdToken;
     }
 
-    const sdkClientToken = config?.axo?.sdk_client_token;
-    if(sdkClientToken) {
-        scriptOptions['data-sdk-client-token'] = sdkClientToken;
-    }
-
-    scriptOptions['data-client-metadata-id'] = 'ppcp-cm-id';
-
     // Load PayPal script
     loadScript(scriptOptions)
         .then(callback)