Ensure WCPay JS loaded on Checkout page for zero order totals #5423
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
added 2 commits
January 19, 2023 09:34
that when order is updated via ajax from Checkout pages, payment form loads.
|
Size Change: 0 B Total Size: 1.37 MB ℹ️ View Unchanged
|
|
Working only for non-UPE payment method, need to fix for UPE and test for block checkout and other checkout combinations. |
the cart is updated via AJAX on checkout page.
and not in blocks checkout page as the latter already loads required scripts even when cart is free.
|
Fixed for UPE and blocks too. Ready for review @Automattic/gamma |
fashuvo
reviewed
Feb 20, 2023
fashuvo
approved these changes
Feb 20, 2023
3 tasks
htdat
reviewed
Mar 1, 2023
| @@ -629,6 +629,12 @@ public function register_scripts() { | |||
| ); | |||
|
|
|||
| wp_set_script_translations( 'WCPAY_CHECKOUT', 'woocommerce-payments' ); | |||
|
|
|||
| if ( ! WC()->cart->needs_payment() && is_checkout() && ! has_block( 'woocommerce/checkout' ) ) { | |||
| WC_Payments::get_gateway()->tokenization_script(); | |||
There was a problem hiding this comment.
We may just directly $this->tokenization_script() as it's basically the same one but without calling an outside function to get another inside function.
| @@ -629,6 +629,12 @@ public function register_scripts() { | |||
| ); | |||
|
|
|||
| wp_set_script_translations( 'WCPAY_CHECKOUT', 'woocommerce-payments' ); | |||
|
|
|||
| if ( ! WC()->cart->needs_payment() && is_checkout() && ! has_block( 'woocommerce/checkout' ) ) { | |||
There was a problem hiding this comment.
Nitpick: moving is_checkout() as the first check as it can help terminate this code for most cases, which results in a little bit faster processing in general.
Comment on lines
+139
to
+142
| if ( ! WC()->cart->needs_payment() && is_checkout() && ! has_block( 'woocommerce/checkout' ) ) { | ||
| WC_Payments::get_gateway()->tokenization_script(); | ||
| WC_Payments::get_wc_payments_checkout()->enqueue_payment_scripts(); | ||
| } |
There was a problem hiding this comment.
IMO, this whole block can be moved to a method in WC_Payment_Gateway_WCPay and then you can use that method for all of these places. Without that, we do not need to write the same code in three places. We can use this because of the inheritance:
- UPE_Payment_Gateway extends WC_Payment_Gateway_WCPay
- UPE_Split_Payment_Gateway extends UPE_Payment_Gateway
Another possibility is to just hook this extracted method into the wp_enqueue_scripts filter. With that, you just need to write this code one time in the top-level class WC_Payment_Gateway_WCPay.
Something like this: https://gist.github.com/htdat/679c224b1c5a761be6082e44695b76ee
6 tasks
This was referenced Mar 10, 2023
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.
When an item with price 0 is added to the cart, it is expected that the payment form does not need to be displayed on the Checkout page. But, when the cart is updated via AJAX on the checkout page to be non-zero, the payment form should appear, because it is no longer a 0 priced order.
Fixes #4764
Fixes #5277
Changes proposed in this Pull Request
Testing instructions
npm 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