From 3b9138c21ff372a677ee9bc477df01e2b97736ec Mon Sep 17 00:00:00 2001 From: ernstmul Date: Fri, 20 Dec 2024 13:40:50 +0100 Subject: [PATCH 1/2] Filter the new users count to not include future days --- .../usage/[[invoice]]/+page.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index 82c211c19..287d24e61 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -143,9 +143,11 @@ Users

The total number of users across all projects in your organization.

- {#if data.organizationUsage.users} + {@const users = data.organizationUsage.users.filter( + (user) => new Date(user.date) < new Date() + )} {@const current = data.organizationUsage.usersTotal} {@const max = getServiceLimit('users', tier, plan)} Date: Fri, 20 Dec 2024 14:00:09 +0100 Subject: [PATCH 2/2] Move users usage data tot .ts --- .../usage/[[invoice]]/+page.svelte | 5 +---- .../organization-[organization]/usage/[[invoice]]/+page.ts | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index 287d24e61..636f88fdd 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -145,9 +145,6 @@

The total number of users across all projects in your organization.

{#if data.organizationUsage.users} - {@const users = data.organizationUsage.users.filter( - (user) => new Date(user.date) < new Date() - )} {@const current = data.organizationUsage.usersTotal} {@const max = getServiceLimit('users', tier, plan)} { } } + const usersUsageToDate = usage.users.filter((user) => new Date(user.date) < new Date()); + return { organizationUsage: usage, projectNames, invoices, currentInvoice, organizationMembers, - plan + plan, + usersUsageToDate }; };