krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix subcriptions remaining time disappearing after cancelling (#10761)

Browse Source 
* add hasCancelled method for group/user, prevent cancelling a subscription twice

* wip

* paypal: do not cancel a subscription twice

* make sure hasCancelled and hasNotCancelled return a boolean result
This commit is contained in:
Matteo Pagliazzi
2018-10-18 12:14:07 +02:00
committed by GitHub
parent 061d990e39
commit 1f44444a50
5 changed files with 86 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/server/models/group.js
View File

@@ -1421,7 +1421,12 @@ schema.methods.isSubscribed = function isSubscribed () {
schema.methods.hasNotCancelled = function hasNotCancelled () {
let plan = this.purchased.plan;
return this.isSubscribed() && !plan.dateTerminated;
return Boolean(this.isSubscribed() && !plan.dateTerminated);
};
schema.methods.hasCancelled = function hasNotCancelled () {
let plan = this.purchased.plan;
return Boolean(this.isSubscribed() && plan.dateTerminated);
};
schema.methods.updateGroupPlan = async function updateGroupPlan (removingMember) {