psa-systems/bunyip
8
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

fix(admin-tier): count admin-granted lifetimes toward slot usage #131

Merged
David merged 2 commits from fix/bunyip-96 into main 2026-06-12 12:39:53 +02:00
Conversation 0 Commits 2 Files changed 1 +7 -1
David commented 2026-06-12 11:58:38 +02:00
Owner
Copy link

count_tier_assignments excluded lifetime memberships granted via admin override (subscription_override_by IS NOT NULL), so the Tier Settings page reported "0 lifetime slots used" despite active admin-granted lifetimes, and the lifetime-slot cap could not be enforced against them. An admin-granted lifetime occupies a real slot, so it must count the same as an organically-claimed one. Drop the override predicate so both the slot-usage display and the signup cap derive from a single, consistent count.

#BUNYIP-96

Branch-backed replacement for #123 (original was AGit/branchless, no merge button once behind main). Rebased clean onto current main.

count_tier_assignments excluded lifetime memberships granted via admin override (subscription_override_by IS NOT NULL), so the Tier Settings page reported "0 lifetime slots used" despite active admin-granted lifetimes, and the lifetime-slot cap could not be enforced against them. An admin-granted lifetime occupies a real slot, so it must count the same as an organically-claimed one. Drop the override predicate so both the slot-usage display and the signup cap derive from a single, consistent count. #BUNYIP-96 Branch-backed replacement for #123 (original was AGit/branchless, no merge button once behind main). Rebased clean onto current main.
fix(admin-tier): count admin-granted lifetimes toward slot usage
All checks were successful
Check / fmt / clippy / build / test (pull_request) Successful in 1m5s
Details
836b478561 
count_tier_assignments excluded lifetime memberships granted via admin override (subscription_override_by IS NOT NULL), so the Tier Settings page reported "0 lifetime slots used" despite active admin-granted lifetimes, and the lifetime-slot cap could not be enforced against them. An admin-granted lifetime occupies a real slot, so it must count the same as an organically-claimed one. Drop the override predicate so both the slot-usage display and the signup cap derive from a single, consistent count.

#BUNYIP-96
Merge branch 'main' into fix/bunyip-96
All checks were successful
Create release / Create release from merged PR (pull_request) Has been skipped
Details
Check / fmt / clippy / build / test (pull_request) Successful in 1m3s
Details
4d4cbd17a2
David merged commit 6709e70bed into main 2026-06-12 12:39:53 +02:00
David deleted branch fix/bunyip-96 2026-06-12 12:39:53 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
psa-systems/bunyip!131
No description provided.