Register Expresss Checkout block only when enabled in the settings #9646
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
gpressutto5
requested review from
alexflorisca,
a team and
timur27
and removed request for
a team
|
Size Change: +8 B (0%) Total Size: 1.34 MB
ℹ️ View Unchanged
|
timur27
approved these changes
Oct 31, 2024
There was a problem hiding this comment.
Clear change and tests well, I just left one minor comment, up to you to decide on whether you want to apply it or not. Thanks @gpressutto5
Comment on lines
+160
to
171
| if ( getUPEConfig( 'isPaymentRequestEnabled' ) ) { | ||
| if ( getUPEConfig( 'isTokenizedCartPrbEnabled' ) ) { | ||
| registerExpressPaymentMethod( | ||
| tokenizedCartPaymentRequestPaymentMethod( api ) | ||
| ); | ||
| } else if ( getUPEConfig( 'isExpressCheckoutElementEnabled' ) ) { | ||
| registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) ); | ||
| registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) ); | ||
| } else { | ||
| registerExpressPaymentMethod( paymentRequestPaymentMethod( api ) ); | ||
| } | ||
| } |
There was a problem hiding this comment.
This is a matter of preference, but I started to find the below approach more readable after some time in our back-end PHP:
Suggested change
| if ( getUPEConfig( 'isPaymentRequestEnabled' ) ) { | |
| if ( getUPEConfig( 'isTokenizedCartPrbEnabled' ) ) { | |
| registerExpressPaymentMethod( | |
| tokenizedCartPaymentRequestPaymentMethod( api ) | |
| ); | |
| } else if ( getUPEConfig( 'isExpressCheckoutElementEnabled' ) ) { | |
| registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) ); | |
| registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) ); | |
| } else { | |
| registerExpressPaymentMethod( paymentRequestPaymentMethod( api ) ); | |
| } | |
| } | |
| if (!getUPEConfig('isPaymentRequestEnabled')) { | |
| return; | |
| } | |
| if (getUPEConfig('isTokenizedCartPrbEnabled')) { | |
| registerExpressPaymentMethod(tokenizedCartPaymentRequestPaymentMethod(api)); | |
| return; | |
| } | |
| if (getUPEConfig('isExpressCheckoutElementEnabled')) { | |
| registerExpressPaymentMethod(expressCheckoutElementApplePay(api)); | |
| registerExpressPaymentMethod(expressCheckoutElementGooglePay(api)); | |
| return; | |
| } | |
| registerExpressPaymentMethod(paymentRequestPaymentMethod(api)); |
feel free to ignore it if the change does not seem convincing.
There was a problem hiding this comment.
It is indeed more readable, but we have more code after that we want to execute regardless of PRB/ECE settings. If we want to early return we need to create a new function for this so it doesn't affect the rest of the code. But then I think it starts to get less readable, what do you think?
Suggested change
| if ( getUPEConfig( 'isPaymentRequestEnabled' ) ) { | |
| if ( getUPEConfig( 'isTokenizedCartPrbEnabled' ) ) { | |
| registerExpressPaymentMethod( | |
| tokenizedCartPaymentRequestPaymentMethod( api ) | |
| ); | |
| } else if ( getUPEConfig( 'isExpressCheckoutElementEnabled' ) ) { | |
| registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) ); | |
| registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) ); | |
| } else { | |
| registerExpressPaymentMethod( paymentRequestPaymentMethod( api ) ); | |
| } | |
| } | |
| const maybeRegisterExpressCheckoutMethod = () => { | |
| if (!getUPEConfig('isPaymentRequestEnabled')) { | |
| return; | |
| } | |
| if (getUPEConfig('isTokenizedCartPrbEnabled')) { | |
| registerExpressPaymentMethod(tokenizedCartPaymentRequestPaymentMethod(api)); | |
| return; | |
| } | |
| if (getUPEConfig('isExpressCheckoutElementEnabled')) { | |
| registerExpressPaymentMethod(expressCheckoutElementApplePay(api)); | |
| registerExpressPaymentMethod(expressCheckoutElementGooglePay(api)); | |
| return; | |
| } | |
| registerExpressPaymentMethod(paymentRequestPaymentMethod(api)); | |
| } | |
| maybeRegisterExpressCheckoutMethod(); |
There was a problem hiding this comment.
Yeah, agreed, I'd keep it as it is then without changing your final version 👍 🚢
6 tasks
|
Thanks for the review ping, just got round to it but looks like I'm a bit late. Great to see this shipped though, nice work! 🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #9444
Changes proposed in this Pull Request
The Google & Apple Pay buttons were displayed in editor even when the payment method is disabled in WooPayments settings because they were always registered. This PR adds a check before registering them.
Testing instructions
developnpm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge