diff --git a/catalog/view/javascript/paypal.js b/catalog/view/javascript/paypal.js
index c416a64..f204408 100644
--- a/catalog/view/javascript/paypal.js
+++ b/catalog/view/javascript/paypal.js
@@ -3,10 +3,10 @@ var PayPalAPI = (function () {
var paypal_script = [];
var paypal_sdk = [];
var paypal_callback;
-
- var showPayPalAlert = function(data) {
+
+ var showPayPalAlert = function (data) {
$('.alert-paypal').remove();
-
+
if (data['error'] && data['error']['warning']) {
if ($('#paypal_form').length) {
$('#paypal_form').prepend(' ' + data['error']['warning'] + '
');
@@ -15,131 +15,137 @@ var PayPalAPI = (function () {
}
}
};
-
- var getQueryParams = function(url) {
+
+ var getQueryParams = function (url) {
const param_arr = url.slice(url.indexOf('?') + 1).split('&');
const params = {};
-
+
param_arr.map(param => {
const [key, val] = param.split('=');
params[key] = decodeURIComponent(val);
})
-
+
return params;
};
-
- var requestPayPalData = async function(url, data) {
+
+ var requestPayPalData = async function (url, data) {
return new Promise((resolve, reject) => {
$.ajax({
method: 'post',
url: url,
data: data,
dataType: 'json',
- success: function(data) {
+ success: function (data) {
resolve(data);
},
- error: function(xhr, ajaxOptions, thrownError) {
+ error: function (xhr, ajaxOptions, thrownError) {
console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
}
});
});
};
-
- var updatePayPalData = async function() {
+
+ var updatePayPalData = async function () {
var params = [];
var script_file = document.getElementsByTagName('script');
-
+
for (var i = 0; i < script_file.length; i++) {
- if (script_file[i].hasAttribute('src') && (script_file[i].getAttribute('src').indexOf('paypal.js') !== -1)) {
- params = getQueryParams(script_file[i].getAttribute('src'));
-
- break;
+ if (script_file[i].hasAttribute('src') && script_file[i].getAttribute('src').includes('paypal.js')) {
+ var src = script_file[i].getAttribute('src');
+ //console.log('[PayPal Debug] Found PayPal JS src:', src);
+
+ // Prefer the one WITH query parameters
+ if (src.includes('?')) {
+ params = getQueryParams(src);
+ //console.log('[PayPal Debug] Extracted PayPal query params:', params);
+ break;
+ }
}
}
-
+
paypal_data = params;
-
+
if (window.ApplePaySession && window.ApplePaySession?.supportsVersion(4) && ApplePaySession.canMakePayments()) {
paypal_data['applepay'] = true;
}
-
+
if (paypal_data['page_code'] == 'product') {
paypal_data['product'] = $('#product input[type=\'text\'], #product input[type=\'hidden\'], #product input[type=\'radio\']:checked, #product input[type=\'checkbox\']:checked, #product select, #product textarea').serialize();
}
-
+
var json = await requestPayPalData('index.php?route=extension/paypal/payment/paypal' + paypal_data['separator'] + 'getData', paypal_data);
-
+
paypal_data = json;
-
+
showPayPalAlert(json);
};
-
- var readyPayPalSDK = function() {
+
+ var readyPayPalSDK = function () {
if (typeof PayPalSDK === 'undefined') {
setTimeout(readyPayPalSDK, 100);
} else {
paypal_sdk[paypal_script.length - 1] = PayPalSDK;
-
+
initPayPalSDK();
}
};
-
- var loadPayPalSDK = function() {
+
+ var loadPayPalSDK = function () {
var html = '';
-
+
if (paypal_data['components'].includes('buttons')) {
if (!$('#paypal_button').length) {
if ($(paypal_data['button_insert_tag']).length) {
html = '';
-
+
eval("$('" + paypal_data['button_insert_tag'] + "')." + paypal_data['button_insert_type'] + "(html)");
}
}
}
-
+
if (paypal_data['components'].includes('googlepay')) {
if (!$('#googlepay_button').length) {
if ($(paypal_data['googlepay_button_insert_tag']).length) {
html = '';
-
+
eval("$('" + paypal_data['googlepay_button_insert_tag'] + "')." + paypal_data['googlepay_button_insert_type'] + "(html)");
}
}
}
-
+
if (paypal_data['components'].includes('applepay')) {
if (!$('#applepay_button').length) {
if ($(paypal_data['applepay_button_insert_tag']).length) {
html = '';
-
+
eval("$('" + paypal_data['applepay_button_insert_tag'] + "')." + paypal_data['applepay_button_insert_type'] + "(html)");
}
}
}
-
+
if (paypal_data['components'].includes('messages')) {
if (!$('#paypal_message').length) {
if ($(paypal_data['message_insert_tag']).length) {
html = '';
-
+
eval("$('" + paypal_data['message_insert_tag'] + "')." + paypal_data['message_insert_type'] + "(html)");
}
}
}
-
+
if (paypal_data['components'].includes('fastlane')) {
if (!$('#form-register .fastlane-watermark').length) {
html = '';
-
+
$('#form-register input[name=\'email\']').parent().append(html);
-
+
if ($(document).find('input[name=\'account\']:checked').val() == '1') {
$('#form-register .fastlane-watermark').addClass('d-none');
} else {
$('#form-register .fastlane-watermark').removeClass('d-none');
}
-
- $(document).on('change', 'input[name=\'account\']', function() {
+
+ $(document).on('change', 'input[name=\'account\']', function () {
if (this.value == '1') {
$('#form-register .fastlane-watermark').addClass('d-none');
} else {
@@ -148,77 +154,77 @@ var PayPalAPI = (function () {
});
}
}
-
+
var src_data = {};
-
+
src_data['components'] = paypal_data['components'].join(',');
src_data['client-id'] = paypal_data['client_id'];
src_data['merchant-id'] = paypal_data['merchant_id'];
src_data['currency'] = paypal_data['currency_code'];
src_data['intent'] = paypal_data['transaction_method'];
-
+
if (paypal_data['button_enable_funding'] && paypal_data['button_enable_funding'].length) {
src_data['enable-funding'] = paypal_data['button_enable_funding'].join(',');
}
-
+
if (paypal_data['button_disable_funding'] && paypal_data['button_disable_funding'].length) {
src_data['disable-funding'] = paypal_data['button_disable_funding'].join(',');
}
-
+
var src = 'https://www.paypal.com/sdk/js?' + $.param(src_data);
var script_count = paypal_script.length;
var script_load_status = 0;
-
+
for (var i = 0; i < script_count; i++) {
if (paypal_script[i].src == src) {
script_load_status = 1;
-
+
break;
}
}
-
+
if (!script_load_status) {
if (typeof PayPalSDK !== 'undefined') {
delete PayPalSDK;
}
-
+
paypal_script[script_count] = document.createElement('script');
paypal_script[script_count].type = 'text/javascript';
paypal_script[script_count].src = src;
paypal_script[script_count].setAttribute('data-partner-attribution-id', paypal_data['partner_attribution_id']);
paypal_script[script_count].setAttribute('data-namespace', 'PayPalSDK');
-
+
if (paypal_data['client_token']) {
paypal_script[script_count].setAttribute('data-client-token', paypal_data['client_token']);
- }
-
+ }
+
if (paypal_data['sdk_client_token']) {
paypal_script[script_count].setAttribute('data-sdk-client-token', paypal_data['sdk_client_token']);
}
-
+
if (paypal_data['client_metadata_id']) {
paypal_script[script_count].setAttribute('data-client-metadata-id', paypal_data['client_metadata_id']);
}
-
+
if (paypal_data['id_token']) {
paypal_script[script_count].setAttribute('data-user-id-token', paypal_data['id_token']);
}
paypal_script[script_count].async = false;
paypal_script[script_count].onload = readyPayPalSDK();
-
+
document.querySelector('body').appendChild(paypal_script[script_count]);
} else if (paypal_sdk[i]) {
PayPalSDK = paypal_sdk[i];
-
+
initPayPalSDK();
}
};
-
- var initPayPalSDK = function() {
+
+ var initPayPalSDK = function () {
if (paypal_data['components'].includes('buttons') && $('#paypal_button').length && !$('#paypal_button_container').html()) {
$('#paypal_button').css('text-align', paypal_data['button_align']);
-
+
if (paypal_data['button_width']) {
$('#paypal_button_container').css('display', 'inline-block');
$('#paypal_button_container').css('width', paypal_data['button_width']);
@@ -226,8 +232,8 @@ var PayPalAPI = (function () {
$('#paypal_button_container').css('display', 'block');
$('#paypal_button_container').css('width', 'auto');
}
-
- try {
+
+ try {
var paypal_button_data = {
env: paypal_data['environment'],
locale: paypal_data['locale'],
@@ -239,74 +245,74 @@ var PayPalAPI = (function () {
label: paypal_data['button_label'],
tagline: 'false'
},
- createOrder: async function() {
+ createOrder: async function () {
paypal_order_id = false;
product_data = false;
-
+
if (paypal_data['page_code'] == 'product') {
product_data = $('#product input[type=\'text\'], #product input[type=\'hidden\'], #product input[type=\'radio\']:checked, #product input[type=\'checkbox\']:checked, #product select, #product textarea').serialize();
}
-
- var json = await requestPayPalData('index.php?route=extension/paypal/payment/paypal' + paypal_data['separator'] + 'createOrder', {'page_code': paypal_data['page_code'], 'payment_type': 'button', 'product': product_data});
-
+
+ var json = await requestPayPalData('index.php?route=extension/paypal/payment/paypal' + paypal_data['separator'] + 'createOrder', { 'page_code': paypal_data['page_code'], 'payment_type': 'button', 'product': product_data });
+
showPayPalAlert(json);
-
+
paypal_order_id = json['paypal_order_id'];
-
- return paypal_order_id;
+
+ return paypal_order_id;
},
- onApprove: async function(data) {
- var json = await requestPayPalData('index.php?route=extension/paypal/payment/paypal' + paypal_data['separator'] + 'approveOrder', {'page_code': paypal_data['page_code'], 'payment_type': 'button', 'paypal_order_id': data.orderID});
-
+ onApprove: async function (data) {
+ var json = await requestPayPalData('index.php?route=extension/paypal/payment/paypal' + paypal_data['separator'] + 'approveOrder', { 'page_code': paypal_data['page_code'], 'payment_type': 'button', 'paypal_order_id': data.orderID });
+
showPayPalAlert(json);
-
+
if (json['url']) {
location = json['url'];
}
}
};
-
+
if (paypal_data['button_funding_source']) {
paypal_button_data['fundingSource'] = paypal_data['button_funding_source'];
}
-
+
var paypal_button = PayPalSDK.Buttons(paypal_button_data);
-
+
if (paypal_button.isEligible()) {
paypal_button.render('#paypal_button_container');
}
} catch (error) {
console.error('PayPal Express failed during startup', error);
}
-
+
$('#paypal_button_container').removeClass('paypal-spinner');
}
-
+
if (paypal_data['components'].includes('googlepay') && $('#googlepay_button').length && !$('#googlepay_button_container').html()) {
if (google && PayPalSDK.Googlepay) {
initGooglePaySDK().catch(console.log);
} else {
$('#googlepay_button').remove();
-
+
console.log('This device does not support Google Pay');
}
-
+
$('#googlepay_button_container').removeClass('paypal-spinner');
}
-
+
if (paypal_data['components'].includes('applepay') && $('#applepay_button').length && !$('#applepay_button_container').html()) {
if (window.ApplePaySession && window.ApplePaySession?.supportsVersion(4) && ApplePaySession.canMakePayments()) {
initApplePaySDK().catch(console.log);
} else {
$('#applepay_button').remove();
-
+
console.log('This device does not support Apple Pay');
}
}
-
+
if (paypal_data['card_customer_tokens'] && $('#paypal_card_tokens').length && !$('#paypal_card_tokens_container').html()) {
$('#paypal_card_tokens').css('text-align', paypal_data['card_align']);
-
+
if (paypal_data['card_width']) {
$('#paypal_card_tokens_container').css('display', 'inline-block');
$('#paypal_card_tokens_container').css('width', paypal_data['card_width']);
@@ -314,27 +320,27 @@ var PayPalAPI = (function () {
$('#paypal_card_tokens_container').css('display', 'block');
$('#paypal_card_tokens_container').css('width', 'auto');
}
-
- $.each(paypal_data['card_customer_tokens'], function(index, card_customer_token) {
+
+ $.each(paypal_data['card_customer_tokens'], function (index, card_customer_token) {
html = '' + card_customer_token['card_number'] + '