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

stripe webhook for unpaid subs: add 3 days of remaining time

Browse Source
This commit is contained in:
Matteo Pagliazzi
2017-03-28 21:51:55 +02:00
parent d170f0b1bd
commit 1d7b733759
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/api/v3/unit/libs/stripePayments.test.js
View File

@@ -12,6 +12,7 @@ import payments from '../../../../../website/server/libs/payments';
import common from '../../../../../website/common'; import common from '../../../../../website/common';
import logger from '../../../../../website/server/libs/logger'; import logger from '../../../../../website/server/libs/logger';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import moment from 'moment';
const i18n = common.i18n; const i18n = common.i18n;
@@ -878,6 +879,7 @@ describe('Stripe Payments', () => {
let cancelSubscriptionOpts = payments.cancelSubscription.lastCall.args[0]; let cancelSubscriptionOpts = payments.cancelSubscription.lastCall.args[0];
expect(cancelSubscriptionOpts.user._id).to.equal(subscriber._id); expect(cancelSubscriptionOpts.user._id).to.equal(subscriber._id);
expect(cancelSubscriptionOpts.paymentMethod).to.equal('Stripe'); expect(cancelSubscriptionOpts.paymentMethod).to.equal('Stripe');
expect(Math.round(moment(cancelSubscriptionOpts.nextBill).diff(new Date(), 'days', true))).to.equal(3);
expect(cancelSubscriptionOpts.groupId).to.be.undefined; expect(cancelSubscriptionOpts.groupId).to.be.undefined;
stripe.events.retrieve.restore(); stripe.events.retrieve.restore();
@@ -988,6 +990,7 @@ describe('Stripe Payments', () => {
let cancelSubscriptionOpts = payments.cancelSubscription.lastCall.args[0]; let cancelSubscriptionOpts = payments.cancelSubscription.lastCall.args[0];
expect(cancelSubscriptionOpts.user._id).to.equal(leader._id); expect(cancelSubscriptionOpts.user._id).to.equal(leader._id);
expect(cancelSubscriptionOpts.paymentMethod).to.equal('Stripe'); expect(cancelSubscriptionOpts.paymentMethod).to.equal('Stripe');
expect(Math.round(moment(cancelSubscriptionOpts.nextBill).diff(new Date(), 'days', true))).to.equal(3);
expect(cancelSubscriptionOpts.groupId).to.equal(subscriber._id); expect(cancelSubscriptionOpts.groupId).to.equal(subscriber._id);
stripe.events.retrieve.restore(); stripe.events.retrieve.restore();

2
website/server/libs/payments.js
View File

@@ -424,7 +424,7 @@ api.cancelSubscription = async function cancelSubscription (data) {
defaultRemainingDays = 2; defaultRemainingDays = 2;
} }
let remaining = data.nextBill ? moment(data.nextBill).diff(new Date(), 'days') : defaultRemainingDays; let remaining = data.nextBill ? moment(data.nextBill).diff(new Date(), 'days', true) : defaultRemainingDays;
if (plan.extraMonths < 0) plan.extraMonths = 0; if (plan.extraMonths < 0) plan.extraMonths = 0;
let extraDays = Math.ceil(30.5 * plan.extraMonths); let extraDays = Math.ceil(30.5 * plan.extraMonths);
let nowStr = `${now.format('MM')}/${moment(plan.dateUpdated).format('DD')}/${now.format('YYYY')}`; let nowStr = `${now.format('MM')}/${moment(plan.dateUpdated).format('DD')}/${now.format('YYYY')}`;

2
website/server/libs/stripePayments.js
View File

@@ -328,6 +328,8 @@ api.handleWebhooks = async function handleWebhooks (options, stripeInc) {
user, user,
groupId, groupId,
paymentMethod: this.constants.PAYMENT_METHOD, paymentMethod: this.constants.PAYMENT_METHOD,
// Give three extra days to allow the user to resubscribe without losing benefits
nextBill: moment().add({days: 3}).toDate(),
}); });
break; break;