Making OCS enabled by default for new installs #4811

wjrosa · 2025-11-18T19:44:50Z

Changes proposed in this Pull Request:

As originally envisioned, with this PR, we are making the Optimized Checkout Suite feature enabled by default for all new installations. This is to make sure merchants are using the latest integration recommended by Stripe.

Testing instructions

Checkout and build this branch on a new test environment (update/making-ocs-enabled-by-default-for-new-installs)
Connect your Stripe account
Confirm the Optimized Checkout feature is enabled in settings:

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)

…new-installs

daledupreez · 2025-11-19T20:02:57Z

includes/connect/class-wc-stripe-connect.php

 			$options['enabled']                         = 'yes';
 			$options['testmode']                        = $is_test ? 'yes' : 'no';
 			$options['upe_checkout_experience_enabled'] = $this->get_upe_checkout_experience_enabled();
+			$options['optimized_checkout_element']      = $this->get_optimized_checkout_element_default_value();


I will keep thinking about this tomorrow, but it feels like it might be really good to add some unit tests so we can correctly track what is going on here and what edge cases might exist.

I am concerned that we might have edge cases where merchants upgrade, and then reconnect, and we auto-enable Optimized Checkout just because we hadn't saved any data in that sub-option from before that reconnection attempt.

Might it be better to create some code in WC_Stripe::install() and/or hook into the woocommerce_stripe_updated action to set/pick the default value for optimized checkout based on whether there is data in the wc_stripe_version option from before? That way OCS would be default-on for fresh new installs only, whereas we'd leave it off for any other install.

Mayisha

It looks good and is working well as per my testing in JN sites. 👍

New installations
- Directly installed this branch build in a fresh JN site.
- Connected to a test Stripe account.
- OCS is enabled after account connection.
Existing account
- Installed Stripe 10.1.0 in a fresh site.
- Connected to a test Stripe account.
- Changed a few settings keeping OCS disabled.
- Updated the plugin with this branch's build.
- Refreshed settings page -> OCS disabled.
- Reconnected to the Stripe account -> OCS disabled.
- Disconnected the Stripe account, connected again -> OCS disabled.

On the topic of tracking possible edge cases, can we add some logs when we auto enable OCS?

daledupreez

I just confirmed that the current logic will not work as expected for upgrades from versions where Optimized Checkout was not initialised by default, and then the merchant reconnects.

I specifically tested the following:

Install Stripe 9.5.2 on a fresh site
Connect to Stripe
Verify that the optimized_checkout_element sub-option is empty -- wp option pluck woocommerce_stripe_settings optimized_checkout_element
- I also confirm that sync is enabled, but that may not be relevant -- wp option pluck woocommerce_stripe_settings pmc_enabled should show yes
Upgrade to a Stripe build from this branch
Verify that the optimized_checkout_element sub-option is still empty -- wp option pluck woocommerce_stripe_settings optimized_checkout_element
Reconnect to Stripe
Verify that the optimized_checkout_element sub-option is now set to yes -- wp option pluck woocommerce_stripe_settings optimized_checkout_element

…new-installs

wjrosa · 2025-11-25T13:57:37Z

Good catch, Dale! Thanks. I have updated the main implementation in 3ee6a77. I have also included unit tests specific for this behavior.

includes/class-wc-stripe.php

…new-installs

daledupreez

🙌 This is pretty much exactly what I was thinking, @wjrosa! My only minor comment is that we should use a more specific option name to match the specificity of the current use case. I'll re-test once we confirm the option name we want to use.

includes/class-wc-stripe.php

changelog.txt

Co-authored-by: daledupreez <dale.du.preez@automattic.com>

daledupreez

Testing went smoothly, for both a simulated new install, reconnection, and simulated upgrade. However, I did notice an issue we should address in this PR.

includes/connect/class-wc-stripe-connect.php

daledupreez · 2025-12-04T14:08:35Z

includes/connect/class-wc-stripe-connect.php

 			$options[ $prefix . 'publishable_key' ]     = $publishable_key;
 			$options[ $prefix . 'secret_key' ]          = $secret_key;
 			$options[ $prefix . 'connection_type' ]     = $type;
 			$options['pmc_enabled']                     = 'connect' === $type ? 'yes' : 'no'; // When not connected via Connect OAuth, the PMC is disabled.


Thought for a follow-up/separate PR: maybe we should default to '' or not even set pmc_enabled when we don't have connect type.

Suggested change

$options['pmc_enabled'] = 'connect' === $type ? 'yes' : 'no'; // When not connected via Connect OAuth, the PMC is disabled.

$options['pmc_enabled'] = 'connect' === $type ? 'yes' : ''; // When not connected via Connect OAuth, defer the decision until we try to get a valid PMC.

Co-authored-by: daledupreez <dale.du.preez@automattic.com>

daledupreez

Thanks for the tweak! The update looks good to me based on inspection. 🚀

…new-installs

Making OCS enabled by default for new installs

2ca2bf1

wjrosa self-assigned this Nov 18, 2025

wjrosa marked this pull request as ready for review November 18, 2025 19:44

wjrosa requested review from a team, Mayisha and daledupreez and removed request for a team November 18, 2025 19:53

Merge branch 'develop' into update/making-ocs-enabled-by-default-for-…

8943509

…new-installs

daledupreez reviewed Nov 19, 2025

View reviewed changes

Mayisha approved these changes Nov 20, 2025

View reviewed changes

daledupreez requested changes Nov 20, 2025

View reviewed changes

wjrosa added 2 commits November 25, 2025 09:30

Merge branch 'develop' into update/making-ocs-enabled-by-default-for-…

36fb55d

…new-installs

Moving the main implementation to the install method + unit tests

3ee6a77

wjrosa requested a review from daledupreez November 25, 2025 13:57

daledupreez reviewed Nov 27, 2025

View reviewed changes

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

wjrosa added 3 commits November 28, 2025 09:34

Merge branch 'develop' into update/making-ocs-enabled-by-default-for-…

5e53aae

…new-installs

Merge branch 'develop' into update/making-ocs-enabled-by-default-for-…

17eba2f

…new-installs

Enable OCS only for new installs

7f2b87d

wjrosa requested a review from daledupreez December 2, 2025 16:34

wjrosa added 3 commits December 3, 2025 10:12

Fix tests

e44c7a8

Unit test

dc154cd

Revert unnecessary changes

b89501e

daledupreez reviewed Dec 4, 2025

View reviewed changes

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

changelog.txt Outdated Show resolved Hide resolved

wjrosa and others added 4 commits December 4, 2025 10:26

Update changelog.txt

e18e509

Co-authored-by: daledupreez <dale.du.preez@automattic.com>

Readme entry update

eab10a5

Update includes/class-wc-stripe.php

8a2abb7

Co-authored-by: daledupreez <dale.du.preez@automattic.com>

Update usages of the new option

71d221a

wjrosa requested a review from daledupreez December 4, 2025 13:31

daledupreez requested changes Dec 4, 2025

View reviewed changes

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

7e49b59

Co-authored-by: daledupreez <dale.du.preez@automattic.com>

wjrosa requested a review from daledupreez December 4, 2025 17:02

daledupreez approved these changes Dec 4, 2025

View reviewed changes

wjrosa added 2 commits December 4, 2025 16:22

Update comment

9c9c3aa

Merge branch 'develop' into update/making-ocs-enabled-by-default-for-…

41473f5

…new-installs

wjrosa enabled auto-merge (squash) December 4, 2025 19:24

wjrosa merged commit a58814c into develop Dec 4, 2025
40 checks passed

wjrosa deleted the update/making-ocs-enabled-by-default-for-new-installs branch December 4, 2025 19:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Making OCS enabled by default for new installs #4811

Making OCS enabled by default for new installs #4811

wjrosa commented Nov 18, 2025 •

edited

Loading

Uh oh!

daledupreez Nov 19, 2025

Uh oh!

Mayisha left a comment

Uh oh!

daledupreez left a comment •

edited

Loading

Uh oh!

wjrosa commented Nov 25, 2025

Uh oh!

Uh oh!

daledupreez left a comment

Uh oh!

Uh oh!

Uh oh!

daledupreez left a comment

Uh oh!

Uh oh!

daledupreez Dec 4, 2025

Uh oh!

daledupreez left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	$options['pmc_enabled'] = 'connect' === $type ? 'yes' : 'no'; // When not connected via Connect OAuth, the PMC is disabled.
	$options['pmc_enabled'] = 'connect' === $type ? 'yes' : ''; // When not connected via Connect OAuth, defer the decision until we try to get a valid PMC.

Making OCS enabled by default for new installs #4811

Making OCS enabled by default for new installs #4811

Conversation

wjrosa commented Nov 18, 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!

daledupreez Nov 19, 2025

Choose a reason for hiding this comment

Uh oh!

Mayisha left a comment

Choose a reason for hiding this comment

Uh oh!

daledupreez left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wjrosa commented Nov 25, 2025

Uh oh!

Uh oh!

daledupreez left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

daledupreez left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

daledupreez Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

daledupreez left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wjrosa commented Nov 18, 2025 •

edited

Loading

daledupreez left a comment •

edited

Loading