From 0be3489e18dd84caa57cd6af410a8724078e0112 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Thu, 3 Oct 2024 14:28:40 +0200 Subject: [PATCH] Final plan changes --- src/lib/stores/billing.ts | 7 +++++++ src/lib/stores/organization.ts | 6 +++++- .../organization-[organization]/billing/planSummary.svelte | 7 ++++--- .../(console)/organization-[organization]/header.svelte | 3 +-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 85fa408a0..d69ea8f76 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -77,6 +77,8 @@ export function tierToPlan(tier: Tier) { return tierPro; case BillingPlan.SCALE: return tierScale; + case BillingPlan.GITHUB_EDUCATION: + return tierGitHubEducation; default: return tierFree; } @@ -173,6 +175,11 @@ export const tierFree: TierData = { description: 'For personal hobby projects of small scale and students.' }; +export const tierGitHubEducation: TierData = { + name: 'GitHub Education', + description: 'For members of GitHub student developers program.' +}; + export const tierPro: TierData = { name: 'Pro', description: 'For pro developers and production projects that need the ability to scale.' diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index f0f363d56..b27110cbb 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -41,5 +41,9 @@ export const organizationList = derived( page, ($page) => $page.data.organizations as Models.TeamList> ); -export const organization = derived(page, ($page) => $page.data?.organization as Organization); + +// TODO: remove override to tier-3 when BE PR, https://github.com/appwrite-labs/cloud/pull/816, has been merged and deployed --> +export const organization = derived(page, ($page) => { + return { ...($page.data?.organization as Organization), billingPlan: 'tier-3' as Tier }; +}); export const members = derived(page, ($page) => $page.data.members as Models.MembershipList); diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index fd2024f1b..53bf6ac50 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -58,7 +58,7 @@ {isTrial ? formatCurrency(0) : formatCurrency(currentPlan?.price)} - {#if $organization?.billingPlan !== BillingPlan.FREE && extraUsage > 0} + {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0} Add-ons
- {$organization?.billingPlan === BillingPlan.FREE + {$organization?.billingPlan === BillingPlan.FREE || + $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION ? formatCurrency(0) : formatCurrency(currentInvoice?.amount ?? 0)}
@@ -171,7 +172,7 @@ Upgrade - {:else} + {:else if $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}