Moving OC card method logic to the new OC payment method class #4579

wjrosa · 2025-08-12T15:06:07Z

Changes proposed in this Pull Request:

This PR moves all the specific Optimized Checkout logic of the card payment method to a new payment method class. The goal is to improve the code's organization and properly separate its concerns.

Testing instructions

Checkout to this branch on your test environment (dev/moving-oc-card-method-logic-to-single-method-class)
Connect your Stripe account
Enable the Optimized Checkout
Enable some payment methods
As a shopper, add any product to your cart
Go to the block checkout page
Confirm the Stripe (single) payment element is displayed and you are able to complete the purchase
Confirm the same for the classic checkout
Confirm that you can also add payment methods

Covered with tests (or have a good reason not to test in description ☝️)
Tested on mobile (or does not apply)

Changelog entry

This Pull Request does not require a changelog entry. (Comment required below)

Changelog Entry Comment

Comment

Post merge

Added testing instructions to the Release Testing Instructions wiki page (or does not apply)
Added the needs docs label (or does not apply)
Included this PR in the Release Thread scope (or does not apply)

….com/woocommerce/woocommerce-gateway-stripe into fix/removing-card-requirement-for-oc

…c-card-method-logic-to-single-method-class

wjrosa · 2025-08-21T18:13:56Z

@wjrosa card payment is working on both block and shortcode checkout pages but I can not pay with any other redirect methods. I have tested with EPS and iDeal. Checkout fails for both with the following error-

Good catch! That was a new validation we recently added for the payment intent. I was able to reproduce it here and fixed it in ce4817a.

wjrosa · 2025-08-21T18:58:06Z

The payment element loads with an error.

Thanks for the steps to reproduce the issue! I haved fixed it in c28b903

The Link button is present in the express payment section (this is not present when OC is disabled)

This specific behavior will be handled in STRIPE-678

…-method-class

Mayisha

Thanks for the updates @wjrosa. The result of functional testing with OC enabled is as following-

✅ Settings looks good.
✅ Enabled methods are rendered correctly on shortcode checkout page.
✅ Enabled methods are rendered correctly on block checkout page
✅ Card payment is working on both checkout pages.
✅ Redirect payment is working on both checkout pages.
🔴 When all the payment methods are disabled I see an error on shortcode checkout page. Block checkout looks good.

🔴 Payment method name is wrong when I pay with Google Pay

page	`develop`	this branch
Order received page
Order edit page

includes/class-wc-stripe-helper.php

includes/payment-methods/class-wc-stripe-upe-payment-method-oc.php

Co-authored-by: Mayisha <[email protected]>

…-method-class

… of https://github.com/woocommerce/woocommerce-gateway-stripe into dev/moving-oc-card-method-logic-to-single-method-class

wjrosa · 2025-08-25T21:47:58Z

Thanks for the great review once again, @Mayisha! And for the patience here.

🔴 When all the payment methods are disabled I see an error on shortcode checkout page. Block checkout looks good.

Fixed it in 7feb8d9

🔴 Payment method name is wrong when I pay with Google Pay

Fixed it in 4d60f51

Mayisha

Thanks @wjrosa for the fixes. Confirming that I don't see any of the errors/issues I mentioned in my previous comments.

Settings
✅ OC option is rendered correctly irrespective of the enabled payment methods.

Block checkout
✅ OC element is rendered when there are enabled payment methods.
✅ OC element is not rendered when there are no enabled payment methods. The express methods are also hidden.
✅ Checkout with card is successful.
✅ Checkout with Google Pay is successful and the payment method title is correct.
✅ Checkout with redirect payment method (iDeal/EPS) is successful.

Shortcode checkout
✅ OC element is rendered when there are enabled payment methods.
✅ OC element is not rendered when there are no enabled payment methods. The express methods are also hidden.
✅ Checkout with card is successful.
✅ Checkout with Google Pay is successful and the payment method title is correct.
✅ Checkout with redirect payment method (iDeal/EPS) is successful.

⚠️ Noting one observation with Link as I see STRIPE-678 is merged. When I have no payment methods enabled, I now see the Link button is available in the settings. But I don't see the Link button on checkout page in this branch.

wjrosa · 2025-08-26T14:05:24Z

Thanks, Mayisha! I have fixed the availability for the block checkout and created STRIPE-687 to address the same for the shortcode checkout.

malithsen

Looks good to me. I left some comments, but they are not merge blockers.

malithsen · 2025-08-26T13:56:43Z

includes/constants/class-wc-stripe-payment-methods.php

@@ -33,6 +33,7 @@ class WC_Stripe_Payment_Methods {
 	const SEPA_DEBIT        = 'sepa_debit';
 	const SOFORT            = 'sofort';
 	const WECHAT_PAY        = 'wechat_pay';
+	const OC                = 'card'; // This is a special case for the Optimized Checkout


nit: To avoid any ambiguity, should we set this to its own ID (eg: oc_container) and then map it to card where frontend/Stripe expects it?

I tried that, but it caused a lot of bugs (tried it again now and still couldn't do it). We still need some stuff from the card payment method class (even when inactive). That was the way I could make it as independent as possible. We can revisit this later

includes/payment-methods/class-wc-stripe-upe-payment-method-oc.php

malithsen · 2025-08-26T14:13:58Z

includes/payment-methods/class-wc-stripe-upe-payment-method-oc.php

+	 * @inheritDoc
+	 */
+	public function is_available() {
+		return true;


Should we do something like

Suggested change

return true;

if ( ! parent::is_available() ) return false;

return true;

I see the is_available method in WC_Payment_Gateway (which was in the previous inheritance chain) has some additional checks that might be useful.

Sure. Added it in f58a3fe. I didn't apply your suggestion directly due to linting.

wjrosa added 26 commits August 11, 2025 17:57

Removing card requirement for OC

9109f75

Merge branch 'develop' into fix/removing-card-requirement-for-oc

27848e1

Backend changes

6dd474b

Merge branch 'fix/removing-card-requirement-for-oc' of https://github…

fc32555

….com/woocommerce/woocommerce-gateway-stripe into fix/removing-card-requirement-for-oc

Backend changes

bfa1738

Changelog and readme entries

074f9fb

Fix tests

73d97f4

Fix tests

a93ecb0

unit test

172e0ed

Merge branch 'develop' into fix/removing-card-requirement-for-oc

896e3d0

Fix tests

e29852a

Fix shortcode checkout methods display

12c5bba

Moving OC card method logic to the new single method class

bd021ae

Removing unnecessary condition

52464b8

Condition is actually necessary

4c5faaa

Merge branch 'fix/removing-card-requirement-for-oc' into dev/moving-o…

bb83e47

…c-card-method-logic-to-single-method-class

Fix shortcode container label

0fd565e

Moving some methods

d51e259

Additional fixes

d515862

Fix add payment method title

bbf9f22

Adding specific frontend constant to avoid confusion

db7a424

Renaming class to OC

cc480ce

Improving docs

35c4062

Merge branch 'develop' into fix/removing-card-requirement-for-oc

799c5d6

Removing disabledButChecked prop and related code

d87a919

Removing the required for OC pill and related files

51c8994

wjrosa self-assigned this Aug 13, 2025

Renaming Single to OC

683e94e

wjrosa marked this pull request as ready for review August 13, 2025 12:37

Fix tests

f4ddf11

wjrosa added 2 commits August 21, 2025 11:22

Fix invalid intent log when intent data is missing

ae1cb67

Fix selected payment method type

ce4817a

wjrosa requested a review from Mayisha August 21, 2025 18:10

wjrosa added 2 commits August 21, 2025 15:15

Revert order lock changes

65ba94f

Fix methods availability

c28b903

wjrosa added this to the 9.9.0 milestone Aug 21, 2025

Merge branch 'develop' into dev/moving-oc-card-method-logic-to-single…

a1281a0

…-method-class

Mayisha requested changes Aug 25, 2025

View reviewed changes

includes/class-wc-stripe-helper.php Show resolved Hide resolved

includes/payment-methods/class-wc-stripe-upe-payment-method-oc.php Outdated Show resolved Hide resolved

includes/payment-methods/class-wc-stripe-upe-payment-method-oc.php Outdated Show resolved Hide resolved

wjrosa and others added 7 commits August 25, 2025 18:09

Update includes/class-wc-stripe-helper.php

be6a48c

Co-authored-by: Mayisha <[email protected]>

Removing unnecessary LPM_GATEWAY_CLASS constnat

f95015e

Update doc blocks

bf66fb1

Merge branch 'develop' into dev/moving-oc-card-method-logic-to-single…

0b78567

…-method-class

Fix methods availability at the shortcode checkout

7feb8d9

Merge branch 'dev/moving-oc-card-method-logic-to-single-method-class'…

2624188

… of https://github.com/woocommerce/woocommerce-gateway-stripe into dev/moving-oc-card-method-logic-to-single-method-class

Fix ECE methods title

4d60f51

wjrosa requested a review from Mayisha August 25, 2025 21:48

Fix payment intent amount comparison

11c628a

Mayisha approved these changes Aug 26, 2025

View reviewed changes

wjrosa added 2 commits August 26, 2025 11:01

Fix Link availability in the block checkout

fa4bee1

UI update

3c5f37d

malithsen approved these changes Aug 26, 2025

View reviewed changes

Adding call to parent is_available method

f58a3fe

wjrosa enabled auto-merge (squash) August 26, 2025 15:17

Fix tests

6b129cc

wjrosa merged commit a931019 into develop Aug 26, 2025
39 of 40 checks passed

wjrosa deleted the dev/moving-oc-card-method-logic-to-single-method-class branch August 26, 2025 15:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Moving OC card method logic to the new OC payment method class #4579

Moving OC card method logic to the new OC payment method class #4579

Uh oh!

wjrosa commented Aug 12, 2025 •

edited

Loading

Uh oh!

wjrosa commented Aug 21, 2025

Uh oh!

wjrosa commented Aug 21, 2025

Uh oh!

Mayisha left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wjrosa commented Aug 25, 2025

Uh oh!

Mayisha left a comment

Uh oh!

wjrosa commented Aug 26, 2025

Uh oh!

malithsen left a comment

Uh oh!

malithsen Aug 26, 2025

Uh oh!

wjrosa Aug 26, 2025

Uh oh!

Uh oh!

malithsen Aug 26, 2025

Uh oh!

wjrosa Aug 26, 2025

Uh oh!

Uh oh!

Uh oh!

	return true;
	if ( ! parent::is_available() ) return false;
	return true;

Moving OC card method logic to the new OC payment method class #4579

Moving OC card method logic to the new OC payment method class #4579

Uh oh!

Conversation

wjrosa commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed in this Pull Request:

Testing instructions

Changelog entry

Comment

Uh oh!

wjrosa commented Aug 21, 2025

Uh oh!

wjrosa commented Aug 21, 2025

Uh oh!

Mayisha left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wjrosa commented Aug 25, 2025

Uh oh!

Mayisha left a comment

Choose a reason for hiding this comment

Uh oh!

wjrosa commented Aug 26, 2025

Uh oh!

malithsen left a comment

Choose a reason for hiding this comment

Uh oh!

malithsen Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

wjrosa Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

malithsen Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

wjrosa Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

wjrosa commented Aug 12, 2025 •

edited

Loading