woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

Merge pull request #2809 from woocommerce/PCP-3862-pay-pal-saved-payment-not-shown-in-pay-pal-button

Browse source 
PayPal saved payment not shown in PayPal button (3862)
This commit is contained in:
Emili Castells 2024-11-21 17:07:58 +01:00 • committed by GitHub
commit 47d983a70f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/ppcp-button/resources/js/modules/Helper/ConfigProcessor.js
View file

@ -6,16 +6,16 @@ const processAxoConfig = ( config ) => {
const scriptOptions = {}; const scriptOptions = {};
const sdkClientToken = config?.axo?.sdk_client_token; const sdkClientToken = config?.axo?.sdk_client_token;
const uuid = uuidv4().replace( /-/g, '' ); const uuid = uuidv4().replace( /-/g, '' );
if ( sdkClientToken ) { if ( sdkClientToken && config?.user?.is_logged !== true ) {
scriptOptions[ 'data-sdk-client-token' ] = sdkClientToken; scriptOptions[ 'data-sdk-client-token' ] = sdkClientToken;
scriptOptions[ 'data-client-metadata-id' ] = uuid; scriptOptions[ 'data-client-metadata-id' ] = uuid;
} }
return scriptOptions; return scriptOptions;
}; };
const processUserIdToken = ( config, sdkClientToken ) => { const processUserIdToken = ( config ) => {
const userIdToken = config?.save_payment_methods?.id_token; const userIdToken = config?.save_payment_methods?.id_token;
return userIdToken && ! sdkClientToken return userIdToken && config?.user?.is_logged === true
? { 'data-user-id-token': userIdToken } ? { 'data-user-id-token': userIdToken }
: {}; : {};
}; };
@ -26,9 +26,6 @@ export const processConfig = ( config ) => {
scriptOptions = merge( scriptOptions, config.script_attributes ); scriptOptions = merge( scriptOptions, config.script_attributes );
} }
const axoOptions = processAxoConfig( config ); const axoOptions = processAxoConfig( config );
const userIdTokenOptions = processUserIdToken( const userIdTokenOptions = processUserIdToken( config );
config,
axoOptions[ 'data-sdk-client-token' ]
);
return merge.all( [ scriptOptions, axoOptions, userIdTokenOptions ] ); return merge.all( [ scriptOptions, axoOptions, userIdTokenOptions ] );
}; };

2
modules/ppcp-button/resources/js/modules/Helper/PayPalScriptLoading.js
View file

@ -9,7 +9,7 @@ const scriptPromises = new Map();
const handleDataClientIdAttribute = async ( scriptOptions, config ) => { const handleDataClientIdAttribute = async ( scriptOptions, config ) => {
if ( if (
config.data_client_id?.set_attribute && config.data_client_id?.set_attribute &&
config.vault_v3_enabled !== '1' config.vault_v3_enabled !== true
) { ) {
return new Promise( ( resolve, reject ) => { return new Promise( ( resolve, reject ) => {
dataClientIdAttributeHandler( dataClientIdAttributeHandler(

4
modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js
View file

@ -75,7 +75,7 @@ export const loadPaypalScript = ( config, onLoaded, onError = null ) => {
// Axo SDK options // Axo SDK options
const sdkClientToken = config?.axo?.sdk_client_token; const sdkClientToken = config?.axo?.sdk_client_token;
const uuid = uuidv4().replace( /-/g, '' ); const uuid = uuidv4().replace( /-/g, '' );
if ( sdkClientToken ) { if ( sdkClientToken && config?.user?.is_logged !== true ) {
scriptOptions[ 'data-sdk-client-token' ] = sdkClientToken; scriptOptions[ 'data-sdk-client-token' ] = sdkClientToken;
scriptOptions[ 'data-client-metadata-id' ] = uuid; scriptOptions[ 'data-client-metadata-id' ] = uuid;
} }
@ -96,7 +96,7 @@ export const loadPaypalScript = ( config, onLoaded, onError = null ) => {
// Adds data-user-id-token to script options. // Adds data-user-id-token to script options.
const userIdToken = config?.save_payment_methods?.id_token; const userIdToken = config?.save_payment_methods?.id_token;
if ( userIdToken && ! sdkClientToken ) { if ( userIdToken && config?.user?.is_logged === true ) {
scriptOptions[ 'data-user-id-token' ] = userIdToken; scriptOptions[ 'data-user-id-token' ] = userIdToken;
} }