Show notice for expired and expiring subscriptions in settings and in-app extensions page #47004

manzurahammed · 2024-04-28T09:13:01Z

Submission Review Guidelines:

I have followed the WooCommerce Contributing Guidelines and the WordPress Coding Standards.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have reviewed my code for security best practices.
Following the above guidelines will result in quick merges and clear and detailed feedback when appropriate.

Show notice on the WC settings page and marketplace page about expired and expiring subscriptions

Notices we want to show:

Expired subscriptions
Expiring Subscriptions expiring (Subscription expiring soon)

Changes proposed in this Pull Request:

Added notice in WC core settings page and extensions page

Note about notices:

Notice will show when the store are connected with woo commerce.com
Those should be dismissable
Once dismissed, they should not appear again for the user next time:

Messages we want to show:

expired subscriptions
- single expired subscription for product X and the user has only a single subscription to X: Your subscription for [product name] expired. Renew for [price] to continue receiving updates and streamlined support.
- single expired subscription for product X and the user has multiple subscriptions to X: One of your subscriptions for [product name] has expired. Renew for [price] to continue receiving updates and streamlined support.
- multiple expired subscriptions: You have X Woo extension subscriptions that expired. Renew to continue receiving updates and streamlined support.
subscriptions expiring soon
- single subscription for product X is about to expire and the user has only a single subscription to X: Your subscription for [product name] expires on [date]. Enable auto-renewal to continue receiving updates and streamlined support.
- single expired subscription for product X and the user has multiple subscriptions to X: One of your subscriptions for [product name] expires on [date]. Enable auto-renewal to continue receiving updates and streamlined support.
- multiple expired subscriptions: :You have X Woo extension subscriptions expiring soon. Enable auto-renewal to continue receiving updates and streamlined support.

How to test the changes in this Pull Request:

Using the WooCommerce Testing Instructions Guide, include your detailed testing instructions:

Build WooCommerce on your local environment, e.g.: cd plugins/woocommerce then nvm use && pnpm run build --filter=woocommerce.
Connected your store with local woocommerce.com test site.
Make sure you have no expired subscriptions and no subscriptions expiring in the next 7 days
Go to the WC setting page and Extension page and confirm you see no notices related to subscriptions
Make sure you have 2 paid subscriptions for the same product, note their order IDs: <order_id_a>, <order_id_b>
Set one of the orders as expiring soon by setting an expiry date in the next 7 days.

Set one of the orders as expiring soon by setting an expiry date in the next 7 days (From same two products). To do that, run the above query

Make sure that you have different products expiring soon, you should see a different message now:

Set one of the subscriptions as expired

Add more expired subscriptions and confirm that message changes properly
Dismiss the notice and refresh the page. You shouldn't see notice about expired/expiring subscriptions.

Changelog entry

Automatically create a changelog entry from the details below.

Significance

Patch
Minor
Major

Type

Fix - Fixes an existing bug
Add - Adds functionality
Update - Update existing functionality
Dev - Development related task
Tweak - A minor adjustment to the codebase
Performance - Address performance issues
Enhancement - Improvement to existing functionality

Message

Comment

github-actions · 2024-04-28T09:13:35Z

Hi @gedex, @hesahesa, @adrianduffell, @mehamasum,

Apart from reviewing the code changes, please make sure to review the testing instructions as well.

You can follow this guide to find out what good testing instructions should look like:
https://github.com/woocommerce/woocommerce/wiki/Writing-high-quality-testing-instructions

not showing expiring subs notice if expired sub notice render

hesahesa · 2024-05-15T07:15:09Z

plugins/woocommerce/src/Admin/PluginsHelper.php

+	public static function woo_subscriptions_notice_dismiss_api() {
+		register_rest_route(
+			'wc-admin',
+			'/woo_subscription_notice_dissmiss',


I would suggest making the endpoint path to be more general (because the endpoint is used to mark whether a notice is dismissed or not)

The notice type to be dismissed is already contained in the parameter, right?

hesahesa · 2024-05-15T07:25:55Z

plugins/woocommerce/src/Admin/PluginsHelper.php

+	 * Register the routes for  dismissal subscriptions notice.
+	 */
+	public static function woo_subscriptions_notice_dismiss_api() {
+		register_rest_route(


What do you think about putting the rest route API registration in the plugins/woocommerce/src/Admin/API instead? because it seems like it is more suitable place there

Good idea, I will move this endpoint to Admin/API section.

Addressed e5f740a

KokkieH · 2024-05-15T07:52:14Z

Just a heads up that Desire also has changes pending to the <Content/> component in #47452 to hide notices from the new Business Services tab we're adding in-app. It also changes how the <PluginInstallNotice/> is added, as adding it inside the <Products/> component was causing it to be rendered multiple times on the Search Results tab.

github-actions · 2024-05-15T08:53:15Z

Test using WordPress Playground

The changes in this pull request can be previewed and tested using a WordPress Playground instance.
WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Test this pull request with WordPress Playground.

Note that this URL is valid for 30 days from when this comment was last updated. You can update it by closing/reopening the PR or pushing a new commit.

manzurahammed · 2024-05-16T08:40:43Z

Thanks for the heads up, @KokkieH . I've updated the component logic to ensure that notices are hidden from the new Business Services tab.

https://github.com/woocommerce/woocommerce/pull/47004/files#diff-66d84dd7feb9389b0808515aed92c9eebc6bad572bd192d6ca327bee3b6796d1R198

…com/woocommerce/woocommerce into add-woo-admin-notice-for-expire-sub

gedex · 2024-05-21T02:39:25Z

I connected to an account that have expired subscriptions but none of those expired subscriptions are used on the site.

Is this expected for the store without any expired products being used and still got the notice? If the connected account is a builder / agency that have multiple clients this would confuse the client.

cc @mehamasum @hesahesa

gedex · 2024-05-21T02:58:26Z

Despite of the issue of all connected stores get the same notice, here's my tests based on PR's instruction:

user connected; expired
- has one expired sub — message: Your subscription for [product name] expired. Renew for [price] to continue receiving updates and streamlined support — ⚠️
- has multiple subs of the same product; one is expired — message: One of your subscriptions for [product name] has expired. Renew for [price] to continue receiving updates and streamlined support — ⚠️
- has multiple subs expired — message: You have X Woo extension subscriptions that expired. Renew to continue receiving updates and streamlined support
user connected; expiring
- has one sub — message: Your subscription for [product name] expires on [date]. Enable auto-renewal to continue receiving updates and streamlined support
- has multiple subs of the same product; one is expiring — message: One of your subscriptions for [product name] expires on [date]. Enable auto-renewal to continue receiving updates and streamlined support
- has multiple subs expiring — message: You have X Woo extension subscriptions expiring soon. Enable auto-renewal to continue receiving updates and streamlined support

gedex · 2024-05-21T03:32:20Z

has one expired sub — message: Your subscription for [product name] expired. Renew for [price] to continue receiving updates and streamlined support

has multiple subs of the same product; one is expired — message: One of your subscriptions for [product name] has expired. Renew for [price] to continue receiving updates and streamlined support

Price is missing

hesahesa · 2024-05-21T08:35:30Z

plugins/woocommerce/src/Admin/PluginsHelper.php

+			return array();
+		}
+
+		$subscriptions          = WC_Helper::get_subscriptions();


note that this gets connected user's subscriptions (does not consider the site it's connected from)

hesahesa · 2024-05-21T08:35:38Z

plugins/woocommerce/src/Admin/PluginsHelper.php

+			return array();
+		}
+
+		$subscriptions         = WC_Helper::get_subscriptions();


note that this gets connected user's subscriptions (does not consider the site it's connected from)

manzurahammed added 2 commits April 25, 2024 00:35

show notice on WC core about subs expired

871a924

add notice in wc core my subscription page

2210c68

manzurahammed requested a review from mehamasum April 28, 2024 09:13

github-actions bot added the plugin: woocommerce Issues related to the WooCommerce Core plugin. label Apr 28, 2024

manzurahammed requested review from gedex and hesahesa April 28, 2024 09:13

manzurahammed added 2 commits April 29, 2024 02:27

dismiss subscription notice

9bd125b

add rest api for dismiss subscription notioce

7a06303

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch 2 times, most recently from be8f6dc to d56a010 Compare April 29, 2024 13:32

dismiss notice permanently

d5864be

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch from d56a010 to d5864be Compare April 29, 2024 13:33

manzurahammed self-assigned this Apr 29, 2024

code refactor

e8faba9

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch 2 times, most recently from d533b14 to 6c6a1cb Compare April 30, 2024 13:17

fix issue in expired subs

608d8ef

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch 3 times, most recently from 2394111 to 00c4a3c Compare April 30, 2024 15:05

manzurahammed requested a review from adrianduffell April 30, 2024 15:09

not showing expiring subs notice if expired sub notice render

a2324fe

not showing expiring subs notice if expired sub notice render

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch from 00c4a3c to a2324fe Compare April 30, 2024 15:28

fix lint

3e9a875

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch from f56b72b to 3e9a875 Compare April 30, 2024 17:28

added changelog

cb9b3e4

manzurahammed marked this pull request as ready for review April 30, 2024 18:07

manzurahammed added 2 commits May 1, 2024 11:54

update comment

3d124d1

fix js lint

88b5db9

manzurahammed force-pushed the add-woo-admin-notice-for-expire-sub branch from d39e32f to 88b5db9 Compare May 1, 2024 17:12

update response

bfbd934

mehamasum changed the title ~~Show notice for expired and expiring subscriptions~~ Show notice for expired and expiring subscriptions in settings and in-app extensions page May 13, 2024

hesahesa reviewed May 15, 2024

View reviewed changes

Merge branch 'trunk' into add-woo-admin-notice-for-expire-sub

ddc6f74

manzurahammed added 3 commits May 16, 2024 13:18

Merge branch 'trunk' into add-woo-admin-notice-for-expire-sub

4a62fba

added new endpoint for notice

e5f740a

update the endpoint URL

382b449

manzurahammed and others added 6 commits May 16, 2024 14:43

update the endpoint URL

eaa73ae

Merge branch 'add-woo-admin-notice-for-expire-sub' of https://github.…

7b316cc

…com/woocommerce/woocommerce into add-woo-admin-notice-for-expire-sub

show notice after one month

06bc7f5

add css class for refactor

e708266

fix lint

1c2519a

Merge branch 'trunk' into add-woo-admin-notice-for-expire-sub

faace47

Add missing callback after the merge

f5c0c6f

hesahesa reviewed May 21, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show notice for expired and expiring subscriptions in settings and in-app extensions page #47004

Show notice for expired and expiring subscriptions in settings and in-app extensions page #47004

manzurahammed commented Apr 28, 2024 •

edited by gedex

github-actions bot commented Apr 28, 2024 •

edited

hesahesa May 15, 2024

hesahesa May 15, 2024

manzurahammed May 16, 2024

manzurahammed May 16, 2024

KokkieH commented May 15, 2024 •

edited

github-actions bot commented May 15, 2024 •

edited

manzurahammed commented May 16, 2024

gedex commented May 21, 2024

gedex commented May 21, 2024 •

edited

gedex commented May 21, 2024 •

edited

hesahesa May 21, 2024

hesahesa May 21, 2024

Show notice for expired and expiring subscriptions in settings and in-app extensions page #47004

Are you sure you want to change the base?

Show notice for expired and expiring subscriptions in settings and in-app extensions page #47004

Conversation

manzurahammed commented Apr 28, 2024 • edited by gedex

Submission Review Guidelines:

Changes proposed in this Pull Request:

How to test the changes in this Pull Request:

Changelog entry

Significance

Type

Message

Comment

github-actions bot commented Apr 28, 2024 • edited

hesahesa May 15, 2024

Choose a reason for hiding this comment

hesahesa May 15, 2024

Choose a reason for hiding this comment

manzurahammed May 16, 2024

Choose a reason for hiding this comment

manzurahammed May 16, 2024

Choose a reason for hiding this comment

KokkieH commented May 15, 2024 • edited

github-actions bot commented May 15, 2024 • edited

Test using WordPress Playground

manzurahammed commented May 16, 2024

gedex commented May 21, 2024

gedex commented May 21, 2024 • edited

gedex commented May 21, 2024 • edited

hesahesa May 21, 2024

Choose a reason for hiding this comment

hesahesa May 21, 2024

Choose a reason for hiding this comment

manzurahammed commented Apr 28, 2024 •

edited by gedex

github-actions bot commented Apr 28, 2024 •

edited

KokkieH commented May 15, 2024 •

edited

github-actions bot commented May 15, 2024 •

edited

gedex commented May 21, 2024 •

edited

gedex commented May 21, 2024 •

edited