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

fix offset calculation

Browse Source
This commit is contained in:
Phillip Thelen
2023-02-17 15:42:31 +01:00
parent d69de2948b
commit 3f56b7fa3f
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/unit/libs/payments/payments.test.js
+16 -1
View File
@@ -505,12 +505,27 @@ describe('payments/index', () => {
expect(user.purchased.plan.perkMonthCount).to.eql(2);
});
it('sets plan.perkMonthCount to zero when creating new subscription', async () => {
it('sets plan.perkMonthCount to zero when creating new monthly subscription', async () => {
user.purchased.plan.perkMonthCount = 2;
await api.createSubscription(data);
expect(user.purchased.plan.perkMonthCount).to.eql(0);
});
it('sets plan.perkMonthCount to zero when creating new 3 month subscription', async () => {
user.purchased.plan.perkMonthCount = 2;
await api.createSubscription(data);
expect(user.purchased.plan.perkMonthCount).to.eql(0);
});
it('updates plan.consecutive.offset when changing subscription type', async () => {
await api.createSubscription(data);
expect(user.purchased.plan.consecutive.offset).to.eql(3);
data.sub.key = "basic_6mo";
await api.createSubscription(data);
expect(user.purchased.plan.consecutive.offset).to.eql(6);
});
it('awards the Royal Purple Jackalope pet', async () => {
await api.createSubscription(data);
website/server/libs/payments/subscriptions.js
+1 -1
View File
@@ -255,7 +255,7 @@ async function createSubscription (data) {
// Block sub perks
if (months > 0 && (!data.gift || !isNewSubscription)) {
if (!data.gift && !groupId) {
plan.consecutive.offset = months;
plan.consecutive.offset = block.months;
}
await plan.incrementPerkCounterAndReward(recipient._id, months);
}