From 0a443fd68109a680442a67ddebd3ee7cc2cf927e Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Wed, 13 Dec 2023 20:05:04 +0100
Subject: [PATCH] feat: overview usage break down WIP

---
 src/lib/sdk/billing.ts                        |  7 ++++
 .../billing/planSummary.svelte                | 35 +++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index f18d062c9..17ba60b6a 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -40,6 +40,13 @@ export type Invoice = {
     dueAt: string;
     clientSecret: string;
     tier: Tier;
+    usage: {
+        name: string;
+        value: number /* service over the limit*/;
+        amount: number /* price of service over the limit*/;
+        rate: number;
+        desc: string;
+    }[];
 };
 
 export type InvoiceList = {
diff --git a/src/routes/console/organization-[organization]/billing/planSummary.svelte b/src/routes/console/organization-[organization]/billing/planSummary.svelte
index 91840268e..a9465fbfc 100644
--- a/src/routes/console/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/console/organization-[organization]/billing/planSummary.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { base } from '$app/paths';
-    import { Box, CardGrid, Heading } from '$lib/components';
+    import { Box, CardGrid, EyebrowHeading, Heading } from '$lib/components';
     import { Pill } from '$lib/elements';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
@@ -12,6 +12,7 @@
     import { sdk } from '$lib/stores/sdk';
     import type { Invoice } from '$lib/sdk/billing';
     import { Query } from '@appwrite.io/console';
+    import { abbreviateNumber, formatNumberWithCommas } from '$lib/helpers/numbers';
 
     let currentInvoice: Invoice;
     const today = new Date();
@@ -25,8 +26,9 @@
 
     $: currentPlan = $plansInfo.plans.find((p) => p.$id === $organization?.billingPlan);
     $: extraUsage = currentInvoice?.amount - currentPlan?.price;
-
     $: isTrial = new Date($organization?.billingTrialEndDate).getTime() - today.getTime() > 0;
+
+    $: console.log(currentInvoice);
 </script>
 
 {#if $organization}
@@ -62,15 +64,26 @@
                         ${isTrial ? 0 : currentPlan?.price}
                     </p>
                 </div>
-                {#if currentInvoice && $organization?.billingPlan !== 'tier-0' && extraUsage > 0 && !isTrial}
-                    <div class="u-flex u-main-space-between u-margin-block-start-8">
-                        <p class="text u-color-text-gray">Extra usage</p>
-                        <p class="text">${extraUsage}</p>
-                    </div>
-                    <div class="u-flex u-main-space-between">
-                        <p class="text u-color-text-gray">Total to-date:</p>
-                        <p class="text">${currentInvoice?.amount}</p>
-                    </div>
+                {#if currentInvoice?.usage?.length && $organization?.billingPlan !== 'tier-0' && !isTrial}
+                    <EyebrowHeading tag="h6" size={3}>Excess</EyebrowHeading>
+                    <ul>
+                        {#each currentInvoice.usage as excess}
+                            {#if ['users', 'executions'].includes(excess.name)}
+                                <li class="u-flex u-main-space-between u-margin-block-start-8">
+                                    <p class="text u-color-text-gray">
+                                        <span title={formatNumberWithCommas(excess.value)}
+                                            >{abbreviateNumber(excess.value)}</span>
+                                        {excess.name}
+                                    </p>
+                                    <p class="text">${excess.amount}</p>
+                                </li>
+                            {/if}
+                        {/each}
+                        <li class="u-flex u-main-space-between u-margin-block-start-16">
+                            <Heading tag="h6" size="7">Total to-date:</Heading>
+                            <Heading tag="h6" size="7">${currentInvoice?.amount}</Heading>
+                        </li>
+                    </ul>
                 {/if}
             </Box>
             <div class="u-flex u-main-space-between u-cross-center">