krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(subscriptions): use correct termination date field and add extra check when it is missing

Browse Source
This commit is contained in:
Matteo Pagliazzi
2020-05-14 12:56:12 +02:00
parent 41e22640f5
commit 092d6726b8
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/api/unit/libs/payments/stripe/calculateSubscriptionTerminationDate.test.js
View File

@@ -72,10 +72,18 @@ describe('#calculateSubscriptionTerminationDate', () => {
it('returns current terminated date if it exists and is later than newly calculated date', () => {
const expectedTerminationDate = moment().add({ months: 5 }).toDate();
plan.terminationDate = expectedTerminationDate;
plan.dateTerminated = expectedTerminationDate;
const terminationDate = calculateSubscriptionTerminationDate(nextBill, plan, groupPlanId);
expect(terminationDate).to.equal(expectedTerminationDate);
});
it('returns the calculated termination date if the plan does not have one', () => {
nextBill = moment().add(5, 'days');
const expectedTerminationDate = moment().add(5, 'days');
const terminationDate = calculateSubscriptionTerminationDate(nextBill, plan, groupPlanId);
expect(expectedTerminationDate.diff(terminationDate, 'days')).to.eql(0);
});
});

10
website/server/libs/payments/calculateSubscriptionTerminationDate.js
View File

@@ -18,6 +18,12 @@ export default function calculateSubscriptionTerminationDate (
const calculatedTerminationDate = moment().startOf('day').add({ days: remaining + extraDays });
return calculatedTerminationDate.isBefore(purchasedPlan.terminationDate)
? purchasedPlan.terminationDate : calculatedTerminationDate.toDate();
// If a termination date is already set, use the one further in the future
if (purchasedPlan.dateTerminated) {
return calculatedTerminationDate.isBefore(purchasedPlan.dateTerminated)
? purchasedPlan.dateTerminated : calculatedTerminationDate.toDate();
}
// Otherwise the calculated one
return calculatedTerminationDate.toDate();
}