Update add product task to only show "subscriptions" product type for stores in the US #33068

chihsuan · 2022-05-17T04:28:14Z

All Submissions:

Have you followed the WooCommerce Contributing guideline?
Does your code follow the WordPress' coding standards?
Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Changes proposed in this Pull Request:

Closes #33062.

Enable the Subscription product template only for merchants in the US both on the card and stack layout.

How to test the changes in this Pull Request:

Make sure your site has woocommerce_allow_tracking option set to yes
Go to Tools > WCA Test Helper > Experiments
Enable treatment for woocommerce_products_task_layout_stacked
Go to OBW
Set Country to the US
Select "Subscriptions" in the Product Types step.
Navigate to WooCommerce > Home
Go to "Add products" task
Observe that the subscriptions product type is shown
Go to woocommmerce > Settings
Change Country / State to another country.
Go back to "Add products" task
Observe that the subscriptions product type is hidden.

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?
Have you successfully run tests with your changes locally?
Have you created a changelog file for each project being changed, ie pnpm nx changelog <project>?

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.

botwoo · 2022-05-17T04:50:36Z

📊 Test reports for this pull request have been published and are accessible through the following links:

REST API Test Report
E2E Test Report (TBC)

Latest commit referenced in the reports: Hide subscription product type when store country is unknown c551477
This comment will automatically be updated with the latest referenced commit when you push new changes to this pull request.

Visit the WooCommerce Test Reports homepage to view all published reports. See the FAQs page if you're having problems accessing them.

botwoo · 2022-05-17T05:20:56Z

📊 Test reports for 3f6d917 Add changelog have been published and are accessible through the following links:

REST API Test Report
E2E Test Report (TBC)

Visit the WooCommerce Test Reports homepage to view all published reports. See the FAQs page if you're having problems accessing them.

ilyasfoo

Tested well, looking great @chihsuan! Feedback on TOS link:

ilyasfoo · 2022-05-17T10:10:15Z

plugins/woocommerce-admin/client/payments/payment-settings-banner.tsx

+							components: {
+								tosLink: (
+									<Link
+										href="https://woocommerce.com/posts/terms-of-service-update/"


I think the usual TOS link we use is https://wordpress.com/tos/

Good catch! I'll fix it in another PR.

Payment changes are not related to this PR. They're showing here because something is wrong after rebased. They have already been merged into the trunk.

A fix PR is ready: #33082

ilyasfoo · 2022-05-17T10:17:53Z

plugins/woocommerce-admin/client/tasks/fills/experimental-products/index.tsx

+		const country =
+			typeof settings.woocommerce_default_country === 'string'
+				? settings.woocommerce_default_country
+				: 'US';


I think we should default to non-US experience since the opposite can be slightly risky. The reason being is subscription type products are only supported for US countries afaik, so if a non-US store owner sets it up, it may end up not working and confuses the owner.

The other way around isn't too critical, subscription template will go missing which is only sub-optimal, but not breaking.

Good point!!! Changed in c551477

ilyasfoo · 2022-05-17T10:21:34Z

plugins/woocommerce-admin/client/tasks/fills/experimental-products/utils.tsx

-		( productType ) => ! exclude.includes( productType.key )
-	);
+export const getProductTypes = ( {
+	exclude,


Nice update! Much more expressive imo.

…nts in the US

ilyasfoo

Tested well, LGTM! 🚢

github-actions · 2022-05-18T03:13:11Z

Hi @chihsuan, thanks for merging this pull request. Please take a look at these follow-up tasks you may need to perform:

Add the release: add testing instructions label

github-actions bot added focus: react admin plugin: woocommerce Issues related to the WooCommerce Core plugin. labels May 17, 2022

chihsuan force-pushed the update/33062-subscriptions-product-type-only-in-the-us branch from 8f3146b to 10b91de Compare May 17, 2022 04:28

github-actions bot removed the plugin: woocommerce Issues related to the WooCommerce Core plugin. label May 17, 2022

chihsuan force-pushed the update/33062-subscriptions-product-type-only-in-the-us branch from 10b91de to d8d6967 Compare May 17, 2022 04:36

github-actions bot added the plugin: woocommerce Issues related to the WooCommerce Core plugin. label May 17, 2022

chihsuan marked this pull request as ready for review May 17, 2022 04:49

chihsuan force-pushed the update/33062-subscriptions-product-type-only-in-the-us branch from d8d6967 to 3f6d917 Compare May 17, 2022 04:49

chihsuan self-assigned this May 17, 2022

chihsuan requested a review from a team May 17, 2022 04:49

ilyasfoo suggested changes May 17, 2022

View reviewed changes

chihsuan added 4 commits May 18, 2022 10:15

Convert getProductTypes method to use object param

657e40e

Update product task to only show subscription product type for mercha…

017d8c2

…nts in the US

Add changelog

103afc0

Hide subscription product type when store country is unknown

c551477

chihsuan force-pushed the update/33062-subscriptions-product-type-only-in-the-us branch from 3f6d917 to c551477 Compare May 18, 2022 02:19

chihsuan requested a review from ilyasfoo May 18, 2022 02:20

chihsuan mentioned this pull request May 18, 2022

Fix payment settings banner TOS link #33082

Merged

8 tasks

ilyasfoo approved these changes May 18, 2022

View reviewed changes

chihsuan merged commit 9a15f68 into trunk May 18, 2022

chihsuan deleted the update/33062-subscriptions-product-type-only-in-the-us branch May 18, 2022 03:12

github-actions bot added this to the 6.6.0 milestone May 18, 2022

github-actions bot mentioned this pull request Jun 15, 2022

Test WooCommerce 6.6 UVLabs/location-picker-at-checkout-for-woocommerce#35

Closed

github-actions bot mentioned this pull request Jul 8, 2022

Test WooCommerce 6.6 UVLabs/location-picker-at-checkout-for-woocommerce#42

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update add product task to only show "subscriptions" product type for stores in the US #33068

Update add product task to only show "subscriptions" product type for stores in the US #33068

Uh oh!

chihsuan commented May 17, 2022 •

edited

Loading

Uh oh!

botwoo commented May 17, 2022 •

edited

Loading

Uh oh!

botwoo commented May 17, 2022

Uh oh!

ilyasfoo left a comment

Uh oh!

ilyasfoo May 17, 2022

Uh oh!

chihsuan May 18, 2022 •

edited

Loading

Uh oh!

chihsuan May 18, 2022

Uh oh!

ilyasfoo May 17, 2022

Uh oh!

chihsuan May 18, 2022

Uh oh!

ilyasfoo May 17, 2022

Uh oh!

ilyasfoo left a comment

Uh oh!

github-actions bot commented May 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Update add product task to only show "subscriptions" product type for stores in the US #33068

Update add product task to only show "subscriptions" product type for stores in the US #33068

Uh oh!

Conversation

chihsuan commented May 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

All Submissions:

Changes proposed in this Pull Request:

How to test the changes in this Pull Request:

Other information:

FOR PR REVIEWER ONLY:

Uh oh!

botwoo commented May 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

botwoo commented May 17, 2022

Uh oh!

ilyasfoo left a comment

Choose a reason for hiding this comment

Uh oh!

ilyasfoo May 17, 2022

Choose a reason for hiding this comment

Uh oh!

chihsuan May 18, 2022 • 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!

chihsuan May 18, 2022

Choose a reason for hiding this comment

Uh oh!

ilyasfoo May 17, 2022

Choose a reason for hiding this comment

Uh oh!

chihsuan May 18, 2022

Choose a reason for hiding this comment

Uh oh!

ilyasfoo May 17, 2022

Choose a reason for hiding this comment

Uh oh!

ilyasfoo left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented May 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

chihsuan commented May 17, 2022 •

edited

Loading

botwoo commented May 17, 2022 •

edited

Loading

chihsuan May 18, 2022 •

edited

Loading