chore: ECE copy for tokenized cart implementation #9730
Merged
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. |
|
Size Change: -3.93 kB (0%) Total Size: 1.33 MB
ℹ️ View Unchanged
|
frosso
commented
Nov 15, 2024
| @@ -22,7 +22,10 @@ import { | |||
| expressCheckoutElementApplePay, | |||
| expressCheckoutElementGooglePay, | |||
| } from '../../express-checkout/blocks'; | |||
| import tokenizedCartPaymentRequestPaymentMethod from '../../tokenized-payment-request/blocks'; | |||
There was a problem hiding this comment.
I left the old JS there to reduce the number of changes & so it can be removed later.
I replaced it with the copy of the ECE implementation (from client/express-checkout to client/tokenized-express-checkout).
| @@ -0,0 +1,154 @@ | |||
| /** | |||
There was a problem hiding this comment.
Copied from client/express-checkout/blocks/components/express-checkout-component.js
| @@ -0,0 +1,42 @@ | |||
| /** | |||
There was a problem hiding this comment.
Copied from client/express-checkout/blocks/components/express-checkout-container.js
| @@ -0,0 +1,108 @@ | |||
| /** | |||
There was a problem hiding this comment.
Copied from client/express-checkout/blocks/components/express-checkout-preview.js
| @@ -0,0 +1,23 @@ | |||
| // Cart Block | |||
There was a problem hiding this comment.
Copied from client/express-checkout/blocks/express-checkout-element.scss
| @@ -0,0 +1,44 @@ | |||
| /** | |||
There was a problem hiding this comment.
Copied from client/express-checkout/utils/test/index.ts
Comment on lines
-74
to
-80
| $script_dependencies = [ 'stripe' ]; | ||
|
|
||
| if ( WC_Payments_Features::is_tokenized_cart_ece_enabled() && ( is_cart() || is_checkout() || is_product() || has_block( 'woocommerce/checkout' ) || has_block( 'woocommerce/cart' ) ) ) { | ||
| $script_dependencies[] = 'WCPAY_PAYMENT_REQUEST'; | ||
| } | ||
|
|
||
| WC_Payments::register_script_with_dependencies( 'WCPAY_BLOCKS_CHECKOUT', 'dist/blocks-checkout', $script_dependencies ); |
There was a problem hiding this comment.
This is how the PRBs were enqueued. The ECE is enqueued differently, we're keeping it that way.
So this block with the WCPAY_PAYMENT_REQUEST script has become deprecated, and can now be simplified.
|
|
||
| $express_checkout_ajax_handler = new WC_Payments_Express_Checkout_Ajax_Handler( self::get_express_checkout_helper() ); | ||
| $express_checkout_element_button_handler = new WC_Payments_Express_Checkout_Button_Handler( self::$account, self::get_gateway(), self::get_express_checkout_helper(), $express_checkout_ajax_handler ); | ||
| $express_checkout_button_display_handler = new WC_Payments_Express_Checkout_Button_Display_Handler( self::get_gateway(), $payment_request_button_handler, $woopay_button_handler, $express_checkout_element_button_handler, $express_checkout_ajax_handler, self::get_express_checkout_helper() ); | ||
| $express_checkout_button_display_handler = new WC_Payments_Express_Checkout_Button_Display_Handler( self::get_gateway(), $woopay_button_handler, $express_checkout_element_button_handler, $express_checkout_ajax_handler, self::get_express_checkout_helper() ); |
There was a problem hiding this comment.
Here I removed the WC_Payments_Payment_Request_Button_Handler as part of the dependencies of WC_Payments_Express_Checkout_Button_Display_Handler. We won't need that in the ECE.
But I'm keeping the file for future reference.
I marked the WC_Payments_Payment_Request_Button_Handler as @deprecated, but it's not enqueued anywhere.
| @@ -21,13 +21,6 @@ class WC_Payments_Express_Checkout_Button_Display_Handler { | |||
| */ | |||
| private $gateway; | |||
|
|
|||
| /** | |||
There was a problem hiding this comment.
See above - removed WC_Payments_Payment_Request_Button_Handler as part of the dependencies of WC_Payments_Express_Checkout_Button_Display_Handler
| @@ -260,14 +260,39 @@ public function scripts() { | |||
| 'is_checkout_page' => $this->express_checkout_helper->is_checkout(), | |||
| ]; | |||
|
|
|||
| WC_Payments::register_script_with_dependencies( 'WCPAY_EXPRESS_CHECKOUT_ECE', 'dist/express-checkout', [ 'jquery', 'stripe' ] ); | |||
| if ( WC_Payments_Features::is_tokenized_cart_ece_enabled() ) { | |||
There was a problem hiding this comment.
Creating some branching logic to enqueue the "tokenized" ECE vs the non-tokenized ECE.
The "tokenized" ECE is the copy of the files, all part of this PR.
They're not "tokenized" yet - they're just a copy of the ECE implementation.
The tokenization efforts are part of #9722
frosso
requested review from
a team and
mdmoore
and removed request for
a team
frosso
commented
Nov 15, 2024
| @@ -442,7 +442,6 @@ public static function init() { | |||
| include_once __DIR__ . '/express-checkout/class-wc-payments-express-checkout-ajax-handler.php'; | |||
| include_once __DIR__ . '/express-checkout/class-wc-payments-express-checkout-button-display-handler.php'; | |||
| include_once __DIR__ . '/express-checkout/class-wc-payments-express-checkout-button-handler.php'; | |||
| include_once __DIR__ . '/class-wc-payments-payment-request-button-handler.php'; | |||
There was a problem hiding this comment.
Since I deprecated the class, I figured I'd also remove its include_once.
It is still included in the tests/unit/bootstrap.php PHPunit bootstrap file, but just because there's a UT that still exists.
frosso
commented
Nov 15, 2024
Comment on lines
-306
to
-325
| public function test_display_express_checkout_buttons_only_payment_request() { | ||
| $this->mock_woopay_button_handler | ||
| ->method( 'should_show_woopay_button' ) | ||
| ->willReturn( false ); | ||
|
|
||
| $this->mock_payment_request_button_handler | ||
| ->method( 'should_show_payment_request_button' ) | ||
| ->willReturn( true ); | ||
|
|
||
| $this->mock_express_checkout_helper | ||
| ->method( 'is_checkout' ) | ||
| ->willReturn( true ); | ||
|
|
||
| ob_start(); | ||
| $this->express_checkout_button_display_handler->display_express_checkout_buttons(); | ||
|
|
||
| $this->assertStringContainsString( 'wcpay-express-checkout-button-separator', ob_get_contents() ); | ||
| $this->assertStringContainsString( 'display:none;', ob_get_contents() ); | ||
| ob_end_clean(); | ||
| } |
There was a problem hiding this comment.
This whole test case is no longer needed because the payment_request_button_handler has been removed.
…kenized-feature-flag
frosso
changed the title
mdmoore
approved these changes
Nov 15, 2024
frosso
deleted the
chore/copy-of-express-checkout-ece-for-tokenized-feature-flag
branch
6 tasks
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 #9721
Changes proposed in this Pull Request
Continuing the groundwork to pave the path for a modification of the ECE to leverage the Store API.
I'm creating a copy of the ECE JS, so it can be modified.
This allows us to modify it in isolation, making safe changes.
Testing instructions
npm run start)tokenized-express-checkoutJS should be enqueued, indicating that the new scripts are being usednpm 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