Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update group plan eligibility check

Browse Source
This commit is contained in:
Hafiz
2026-01-13 13:39:27 -06:00
parent dcb3b1633b
commit 3a91fde01d
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/components/group-plans/groupPlanSelectionModal.vue
+4 -4
View File
@@ -395,11 +395,11 @@ export default {
return this.userGuilds.filter(group => {
const leaderId = group.leader?._id || group.leader;
if (leaderId !== this.user._id) return false;
const plan = group.purchased?.plan;
if (!plan?.customerId) return false;
const purchased = group.purchased;
if (!purchased?.wasUpgraded) return false;
if (this.activeGroupPlanIds.includes(group._id)) return false;
if (!plan.dateTerminated) return false;
return new Date(plan.dateTerminated) < new Date();
if (!purchased.dateTerminated) return false;
return new Date(purchased.dateTerminated) < new Date();
});
},
upgradeableParty () {
website/server/models/group.js
+11 -1
View File
@@ -156,7 +156,17 @@ schema.plugin(baseModel, {
noSet: ['_id', 'balance', 'quest', 'memberCount', 'chat', 'bannedWordsAllowed', 'challengeCount', 'tasksOrder', 'purchased', 'managers'],
private: ['purchased.plan'],
toJSONTransform (plainObj, originalDoc) {
if (plainObj.purchased) plainObj.purchased.active = originalDoc.hasActiveGroupPlan();
if (plainObj.purchased) {
plainObj.purchased.active = originalDoc.hasActiveGroupPlan();
// Expose non-sensitive plan info for upgrade flow
const plan = originalDoc.purchased?.plan;
if (plan?.customerId) {
plainObj.purchased.wasUpgraded = true;
if (plan.dateTerminated) {
plainObj.purchased.dateTerminated = plan.dateTerminated;
}
}
}
},
});