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

fix(subscriptions): better next-hourglass logic

Browse Source
This commit is contained in:
SabreCat
2022-09-12 15:17:39 -05:00
parent 38bf0b3721
commit 1a86943711
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/common/script/cron.js
View File

@@ -8,6 +8,7 @@ import defaults from 'lodash/defaults';
import invert from 'lodash/invert'; import invert from 'lodash/invert';
import moment from 'moment'; import moment from 'moment';
import 'moment-recur'; import 'moment-recur';
import subscriptionBlocks from './content/subscriptionBlocks';
export const DAY_MAPPING = { export const DAY_MAPPING = {
0: 'su', 0: 'su',
@@ -286,7 +287,13 @@ export function getPlanContext (user, now) {
const dateUpdatedMoment = moment(plan.dateUpdated).startOf('month'); const dateUpdatedMoment = moment(plan.dateUpdated).startOf('month');
const elapsedMonths = moment(subscriptionEndDate).diff(dateUpdatedMoment, 'months'); const elapsedMonths = moment(subscriptionEndDate).diff(dateUpdatedMoment, 'months');
const monthsTillNextHourglass = plan.consecutive.offset || (3 - (plan.consecutive.count % 3)); const planMonths = subscriptionBlocks[plan.planId].months || 1;
let monthsTillNextHourglass;
if (planMonths > 1) {
monthsTillNextHourglass = plan.consecutive.offset + 1;
} else {
monthsTillNextHourglass = 3 - (plan.consecutive.count % 3);
}
const possibleNextHourglassDate = moment(plan.dateUpdated) const possibleNextHourglassDate = moment(plan.dateUpdated)
.add(monthsTillNextHourglass, 'months'); .add(monthsTillNextHourglass, 'months');