Disable launch your store on trial sites #1507

chihsuan · 2024-08-29T08:40:01Z

Changes proposed in this Pull Request:

Closes #1504.

Apply all of the below for trial plans (both ecommerce and business trial plans)

@ilyasfoo I'm using wc_calypso_bridge_is_ecommerce_trial_plan() to check if the store is on a trial plan. I'm not sure if this is sufficient. Please let me know if there is a better way to check if the store is on any trial plan. 🙏

Hide Site visibility settings tabs
Hide Launch your store task
Disable WPCOM coming soon page override implemented in this PR
Disable the coming soon banner shown in frontend
Hide site visibility badge

This PR is a very minor change/addition and does not require testing instructions (if checked you can ignore/remove the next section).

How to test the changes in this Pull Request:

Have you followed the Writing high-quality testing instructions guide?

Setting up a free eCommerce trial site for development peapX7-1D4-p2
Use master branch
Enable LYS feature flag (via beta tester or you can remove these lines).
Go to /wp-admin/admin.php?page=wc-settings&tab=site-visibility
Enable Coming Soon mode
Checkout this branch
Go to /wp-admin/admin.php?page=wc-settings&tab=site-visibility and confirm you're redirected to /wp-admin/admin.php?page=wc-settings
Confirm Site visibility settings tabs are hidden
Go to WooCommerce > Home and confirm Launch your store task is hidden
Go to the frontend and confirm the coming soon banner is not shown
Go to the frontend in incognito mode and confirm the LYS coming soon page is not shown
Confirm site visibility badge is not shown

Other information:

Have you added an explanation of what your changes do and why you'd like us to include them?
Have you written new tests for your changes, as applicable?

FOR PR REVIEWER ONLY:

I have reviewed that everything is sanitized/escaped appropriately for any SQL or XSS injection possibilities. I made sure Linting is not ignored or disabled.

github-actions · 2024-08-29T08:49:57Z

Size Change: 0 B

Total Size: 201 kB

ℹ️ View Unchanged

Filename	Size
`./build/53.js`	1.08 kB
`./build/index.css`	878 B
`./build/index.js`	126 kB
`./build/marketing.js`	58.3 kB
`./build/payment-gateway-suggestions.css`	1.24 kB
`./build/payment-gateway-suggestions.js`	6.57 kB
`./build/plugins.js`	3.93 kB
`./build/style-index.css`	2.15 kB
`./build/style-marketing.css`	800 B

_{compressed-size-action}

moon0326

LGTM and tested well 👍 🚀

ilyasfoo

@ilyasfoo I'm using wc_calypso_bridge_is_ecommerce_trial_plan() to check if the store is on a trial plan. I'm not sure if this is sufficient. Please let me know if there is a better way to check if the store is on any trial plan. 🙏

@chihsuan That's a good question! I tested in my business plan site and indeed this did not return true. I wrote a function that detects it, but it's only lightly tested with my business plan site:

public static function is_ecommerce_trial_plan() {
	if ( ! function_exists( 'wpcom_get_site_purchases' ) ) {
		return false;
	}

	if ( is_null( self::$is_wpcom_business_trial_plan ) ) {
		self::$is_wpcom_business_trial_plan = false;
	} else {
		return self::$is_wpcom_business_trial_plan;
	}

	$all_site_purchases      = wpcom_get_site_purchases();
	$plan_purchases          = array_filter(
		$all_site_purchases,
		function ( $purchase ) {
			return 'bundle' === $purchase->product_type;
		}
	);

	if ( 1 === count( $plan_purchases ) ) {
		// We have exactly one plan
		$plan_purchase = reset( $plan_purchases );
		if ( 'wp-bundle-hosting-trial' === $plan_purchase->billing_product_slug ) {
			self::$is_wpcom_business_trial_plan = true;
		}
	}

	return self::$is_wpcom_business_trial_plan ?? false;
}

chihsuan · 2024-09-03T05:39:31Z

That's a good question! I tested in my business plan site and indeed this did not return true. I wrote a function that detects it, but it's only lightly tested with my business plan site:

Thanks @ilyasfoo, I'll try that out and look into it more. 🙌

- Update trial plan checks

chihsuan · 2024-09-03T08:06:08Z

@ilyasfoo 👋 I added a helper function wc_calypso_bridge_is_trial_plan in 5f5352d. It checks if the plan is a trial plan by reusing is_ecommerce_trial_plan and checking the plan slug against a list of trial plans wp-bundle-hosting-trial, wp-bundle-migration-trial (See fbhepr%2Skers%2Sjcpbz%2Sjc%2Qpbagrag%2Snqzva%2Qcyhtvaf%2Sjcpbz%2Qovyyvat%2Scebqhpgf%2Sohfvarff%2Qgevny%2Qohaqyr.cuc%3Se%3Q29r2n341%23274%2Q277-og).

I tested the code on a business plan site, and it worked as expected. Could you please take a look at the change and possibly review it? Thanks! 🙏

ilyasfoo

Thanks for working on this, @chihsuan! Apologies for missing this in the issue description, but we should also hide the admin bar badge 🙏

We should also revert the coming soon should_show_a8c_coming_soon_page to use WPCOM's coming soon when it's a trial site.

ilyasfoo · 2024-09-04T03:03:30Z

class-wc-calypso-bridge-dotcom-features.php

+	}
+
+	/**
+	 * Check if the site has a specific plan.


Duplicate comment here

ilyasfoo · 2024-09-04T03:09:23Z

class-wc-calypso-bridge-dotcom-features.php

+	 *
+	 * @return bool True if the site has the specified plan, false otherwise.
+	 */
+	private static function has_plan( $plan, $exact_one_plan = false ) {


Nit: Would it be better if we support passing array for $plan? I'm unsure how performant is this check, and we have a prior art in checking for multiple plan string.

Also, I think it's better to have $exact_one_plan check to true since it's how it was done before in similar checks

Sounds good! Updated it here 0ec8e66

adrianduffell · 2024-09-04T06:08:07Z

We should also revert the coming soon should_show_a8c_coming_soon_page to use WPCOM's coming soon when it's a trial site.

@ilyasfoo @chihsuan is the concern here that free trial users could customize the Woo template too much? I suppose they could add a checkout block or something 🤔

I'm happy with this for now, but I think it would be worth returning to when we create a newsletter signup template. I think it would be good to allow free trial users to have access to that. Instead, perhaps in Core we need to place direct protections on the checkout when coming soon mode is active.

ilyasfoo · 2024-09-04T06:55:01Z

@ilyasfoo @chihsuan is the concern here that free trial users could customize the Woo template too much? I suppose they could add a checkout block or something 🤔

@adrianduffell Good point, my original concern was that it was showing the live site since we were in live mode and WPCOM coming soon was bypassed. I think free trial users being able to add a checkout block is also a valid concern.

I'm happy with this for now, but I think it would be worth returning to when we create a newsletter signup template. I think it would be good to allow free trial users to have access to that. Instead, perhaps in Core we need to place direct protections on the checkout when coming soon mode is active.

I agree, let's revisit this in the future 👍

adrianduffell · 2024-09-04T13:16:25Z

my original concern was that it was showing the live site since we were in live mode and WPCOM coming soon was bypassed

@ilyasfoo With #1506, would the woo coming soon mode now always be on for free trial sites? (by inheriting the WPCOM value)

ilyasfoo · 2024-09-05T02:17:04Z

With #1506, would the woo coming soon mode now always be on for free trial sites? (by inheriting the WPCOM value)

@adrianduffell Yes, the state will be coming soon since the site is "Unlaunched"

chihsuan · 2024-09-05T03:47:22Z

Thanks for working on this, @chihsuan! Apologies for missing this in the issue description, but we should also hide the admin bar badge 🙏
We should also revert the coming soon `should_show_a8c_coming_soon_page` to use WPCOM's coming soon when it's a trial site.

Hey @ilyasfoo, I've pushed the changes to hide the admin bar badge and to use WPCOM's coming soon page for trial sites. Could you take a look again? Thanks. 🙏

You will need to use WooCommerce trunk or 9.3 beta to test the admin badge.

wp plugin install https://github.com/woocommerce/woocommerce/releases/download/nightly/woocommerce-trunk-nightly.zip --activate

ilyasfoo

Awesome, @chihsuan! This is testing well, LGTM! 🚢

class-wc-calypso-bridge-dotcom-features.php

Co-authored-by: Ilyas Foo <[email protected]>

chihsuan self-assigned this Aug 29, 2024

chihsuan requested review from a team, ilyasfoo and moon0326 August 29, 2024 08:48

moon0326 approved these changes Aug 30, 2024

View reviewed changes

ilyasfoo reviewed Sep 2, 2024

View reviewed changes

chihsuan added 4 commits September 3, 2024 14:06

Disable launch your store on trial sites

433eccb

Add changelog

672a78b

Fix doc and revert changes

035060f

Fix conflict

b524143

chihsuan force-pushed the update/disable-lys-on-trial-sites branch from 2025944 to b524143 Compare September 3, 2024 06:08

Add is_trial_plan()

5f5352d

- Update trial plan checks

chihsuan force-pushed the update/disable-lys-on-trial-sites branch from e4a48f7 to 5f5352d Compare September 3, 2024 08:00

Improve docs

7709ac6

Update version to x.x.x

ef2740e

ilyasfoo requested changes Sep 4, 2024

View reviewed changes

chihsuan added 2 commits September 5, 2024 11:39

Update plan check to support multiple plan checking

0ec8e66

Revert a8c coming soon change and hide site badge for trial sites

3d93028

chihsuan requested a review from ilyasfoo September 5, 2024 03:47

Update feature check

46ab4b2

ilyasfoo approved these changes Sep 5, 2024

View reviewed changes

class-wc-calypso-bridge-dotcom-features.php Outdated Show resolved Hide resolved

Update class-wc-calypso-bridge-dotcom-features.php

26a5e82

Co-authored-by: Ilyas Foo <[email protected]>

chihsuan merged commit aea181a into master Sep 5, 2024
3 checks passed

ilyasfoo mentioned this pull request Sep 10, 2024

wpcomsh: Update wc-calypso-bridge to 2.6.0 Automattic/jetpack#39313

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disable launch your store on trial sites #1507

Disable launch your store on trial sites #1507

chihsuan commented Aug 29, 2024 •

edited

Loading

github-actions bot commented Aug 29, 2024 •

edited

Loading

moon0326 left a comment

ilyasfoo left a comment •

edited

Loading

chihsuan commented Sep 3, 2024

chihsuan commented Sep 3, 2024 •

edited

Loading

ilyasfoo left a comment

ilyasfoo Sep 4, 2024

ilyasfoo Sep 4, 2024

chihsuan Sep 5, 2024

adrianduffell commented Sep 4, 2024

ilyasfoo commented Sep 4, 2024

adrianduffell commented Sep 4, 2024

ilyasfoo commented Sep 5, 2024

chihsuan commented Sep 5, 2024

ilyasfoo left a comment

Disable launch your store on trial sites #1507

Disable launch your store on trial sites #1507

Conversation

chihsuan commented Aug 29, 2024 • edited Loading

Changes proposed in this Pull Request:

How to test the changes in this Pull Request:

Other information:

FOR PR REVIEWER ONLY:

github-actions bot commented Aug 29, 2024 • edited Loading

moon0326 left a comment

Choose a reason for hiding this comment

ilyasfoo left a comment • edited Loading

Choose a reason for hiding this comment

chihsuan commented Sep 3, 2024

chihsuan commented Sep 3, 2024 • edited Loading

ilyasfoo left a comment

Choose a reason for hiding this comment

ilyasfoo Sep 4, 2024

Choose a reason for hiding this comment

ilyasfoo Sep 4, 2024

Choose a reason for hiding this comment

chihsuan Sep 5, 2024

Choose a reason for hiding this comment

adrianduffell commented Sep 4, 2024

ilyasfoo commented Sep 4, 2024

adrianduffell commented Sep 4, 2024

ilyasfoo commented Sep 5, 2024

chihsuan commented Sep 5, 2024

ilyasfoo left a comment

Choose a reason for hiding this comment

chihsuan commented Aug 29, 2024 •

edited

Loading

github-actions bot commented Aug 29, 2024 •

edited

Loading

ilyasfoo left a comment •

edited

Loading

chihsuan commented Sep 3, 2024 •

edited

Loading