TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

Handled week & day interval for calculating MRR

Browse Source 
refs https://github.com/TryGhost/Team/issues/635

It's possible that we have subscriptions in the system which have been
created externally, and so using an interval of week or day. This change
ensures that we handle the mrr_delta for these subscriptions correctly.
This commit is contained in:
Fabien O'Carroll 2021-05-20 16:56:14 +01:00
parent f3ecb44e08
commit 98fe7785d6
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ghost/members-api/lib/repositories/member/index.js
View File

@ -1,4 +1,5 @@
const _ = require('lodash');
module.exports = class MemberRepository {
/**
* @param {object} deps
@ -185,7 +186,10 @@ module.exports = class MemberRepository {
from_plan: subscription.get('plan_id'),
to_plan: null,
currency: subscription.get('plan_currency'),
mrr_delta: -1 * (subscription.get('plan_interval') === 'month' ? subscription.get('plan_amount') : Math.floor(subscription.get('plan_amount') / 12))
mrr_delta: -1 * getMRRDelta({
interval: subscription.get('plan_interval'),
amount: subscription.get('plan_amount')
})
}, options);
}
}
@ -321,28 +325,6 @@ module.exports = class MemberRepository {
plan_amount: subscriptionPriceData.unit_amount,
plan_currency: subscriptionPriceData.currency
};
function getMRRDelta({interval, amount, status}) {
if (status === 'trialing') {
return 0;
}
if (status === 'incomplete') {
return 0;
}
if (status === 'incomplete_expired') {
return 0;
}
if (status === 'canceled') {
return 0;
}
if (interval === 'year') {
return Math.floor(amount / 12);
}
if (interval === 'month') {
return amount;
}
}
if (model) {
const updated = await this._StripeCustomerSubscription.edit(subscriptionData, {
...options,
@ -729,3 +711,34 @@ module.exports = class MemberRepository {
return true;
}
};
function getMRRDelta({interval, amount, status = null}) {
if (status === 'trialing') {
return 0;
}
if (status === 'incomplete') {
return 0;
}
if (status === 'incomplete_expired') {
return 0;
}
if (status === 'canceled') {
return 0;
}
if (interval === 'year') {
return Math.floor(amount / 12);
}
if (interval === 'month') {
return amount;
}
if (interval === 'week') {
return amount * 4;
}
if (interval === 'day') {
return amount * 30;
}
}