Repository navigation
[5.x] Only count non-expired subscriptions on the plans index - #4382
Open
nfourtythree wants to merge 3 commits into
Open
nfourtythree wants to merge 3 commits into
nfourtythree wants to merge 3 commits into
Conversation
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The count still includes suspended and not-yet-started subscriptions, unlike the subscriptions index’s Active status.
1 open finding
What changed in this PR
Updates subscription plan counts to exclude expired subscriptions.
Changes:
- Adds active subscription count APIs.
- Uses the new count on the plans index.
- Documents the fix for #4381.
| File | Description |
|---|---|
CHANGELOG.md |
Documents the APIs and fix. |
src/base/Plan.php |
Exposes the active count. |
src/services/Subscriptions.php |
Implements the filtered count. |
src/templates/subscriptions/plans/index.twig |
Displays the active count. |
🧠 Review effort: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #4381.
The "Active subscriptions" column on Commerce → Subscription Plans was counting all subscriptions for a plan, including expired ones.
Added
Subscriptions::getActiveSubscriptionCountByPlanId()andPlan::getActiveSubscriptionCount(), and the plans index now uses them. The count uses a subscription element query withstatus(Subscription::STATUS_ACTIVE), so it follows the same rules as the "Active" status on the subscriptions index andPlan::getActiveUserSubscriptions(). Subscriptions that are expired, suspended, not yet started or trashed are not counted.getSubscriptionCountByPlanId()andPlan::getSubscriptionCount()are unchanged and still return the total count, so nothing that relies on them is affected.