From f5194c0be42fb62e30965afa032fe20ad7eea68f Mon Sep 17 00:00:00 2001
From: Philipp Stracker
Date: Mon, 17 Mar 2025 14:45:37 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Improve=20code=20style=20a?=
=?UTF-8?q?nd=20readability?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/js/modules/Renderer/Renderer.js | 50 ++++++++++---------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
index 005ee6248..e438f9a4e 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
@@ -54,7 +54,7 @@ class Renderer {
const enabledSeparateGateways = Object.fromEntries(
Object.entries( settings.separate_buttons ).filter(
- ( [ s, data ] ) => document.querySelector( data.wrapper )
+ ( [ , data ] ) => document.querySelector( data.wrapper )
)
);
const hasEnabledSeparateGateways =
@@ -70,10 +70,12 @@ class Renderer {
);
}
} else {
+ const allFundingSources = paypal.getFundingSources();
+ const separateFunding = allFundingSources.filter(
+ ( s ) => ! ( s in enabledSeparateGateways )
+ );
// render each button separately
- for ( const fundingSource of paypal
- .getFundingSources()
- .filter( ( s ) => ! ( s in enabledSeparateGateways ) ) ) {
+ for ( const fundingSource of separateFunding ) {
const style = normalizeStyleForFundingSource(
settings.button.style,
fundingSource
@@ -161,29 +163,29 @@ class Renderer {
if ( this.shouldEnableShippingCallback() ) {
options.onShippingOptionsChange = ( data, actions ) => {
const shippingOptionsChange =
- ! this.isVenmoButtonClickedWhenVaultingIsEnabled(
- venmoButtonClicked
- )
- ? handleShippingOptionsChange(
- data,
- actions,
- this.defaultSettings
- )
- : null;
+ ! this.isVenmoButtonClickedWhenVaultingIsEnabled(
+ venmoButtonClicked
+ )
+ ? handleShippingOptionsChange(
+ data,
+ actions,
+ this.defaultSettings
+ )
+ : null;
return shippingOptionsChange;
};
options.onShippingAddressChange = ( data, actions ) => {
const shippingAddressChange =
- ! this.isVenmoButtonClickedWhenVaultingIsEnabled(
- venmoButtonClicked
- )
- ? handleShippingAddressChange(
- data,
- actions,
- this.defaultSettings
- )
- : null;
+ ! this.isVenmoButtonClickedWhenVaultingIsEnabled(
+ venmoButtonClicked
+ )
+ ? handleShippingAddressChange(
+ data,
+ actions,
+ this.defaultSettings
+ )
+ : null;
return shippingAddressChange;
};
@@ -246,7 +248,7 @@ class Renderer {
return venmoButtonClicked && this.defaultSettings.vaultingEnabled;
};
- shouldEnableShippingCallback = () => {
+ shouldEnableShippingCallback = () => {
const needShipping =
this.defaultSettings.needShipping ||
this.defaultSettings.context === 'product';
@@ -254,7 +256,7 @@ class Renderer {
this.defaultSettings.should_handle_shipping_in_paypal &&
needShipping
);
- };
+ };
isAlreadyRendered( wrapper, fundingSource ) {
return this.renderedSources.has( wrapper + ( fundingSource ?? '' ) );