diff --git a/core/server/services/stats/lib/mrr-stats-service.js b/core/server/services/stats/lib/mrr-stats-service.js index e83a611b33..1415f7aa0a 100644 --- a/core/server/services/stats/lib/mrr-stats-service.js +++ b/core/server/services/stats/lib/mrr-stats-service.js @@ -13,15 +13,7 @@ class MrrStatsService { const knex = this.db.knex; const rows = await knex('members_stripe_customers_subscriptions') .select(knex.raw(`plan_currency as currency`)) - .select(knex.raw(`SUM( - CASE WHEN plan_interval = 'year' THEN - FLOOR(plan_amount / 12) - ELSE - plan_amount - END - ) AS mrr`)) - .whereIn('status', ['active', 'unpaid', 'past_due']) - .where('cancel_at_period_end', 0) + .select(knex.raw(`SUM(mrr) AS mrr`)) .groupBy('plan_currency') .orderBy('currency'); diff --git a/test/utils/fixtures/data-generator.js b/test/utils/fixtures/data-generator.js index 922fc3000f..9dc3e5900f 100644 --- a/test/utils/fixtures/data-generator.js +++ b/test/utils/fixtures/data-generator.js @@ -506,7 +506,7 @@ DataGenerator.Content = { plan_interval: 'month', plan_amount: '1000', plan_currency: 'usd', - mrr: 1000 + mrr: 0 }, { id: ObjectId().toHexString(),