From 2e78dd29e39f2f9744682c707276629ef2b79565 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 7 Feb 2025 10:49:47 +0530 Subject: [PATCH 1/5] update: billing plans mapping to show enterprise. --- src/lib/constants.ts | 3 ++- src/lib/stores/billing.ts | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 2fc910428..c77f213b5 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -470,7 +470,8 @@ export enum BillingPlan { PRO = 'tier-1', SCALE = 'tier-2', GITHUB_EDUCATION = 'auto-1', - CUSTOM = 'cont-1' + CUSTOM = 'cont-1', + ENTERPRISE = 'ent-1' } export const feedbackDowngradeOptions = [ diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index a5b00f43e..2b5bdf6bb 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -34,7 +34,7 @@ import { user } from './user'; import { browser } from '$app/environment'; import { canSeeBilling } from './roles'; -export type Tier = 'tier-0' | 'tier-1' | 'tier-2' | 'auto-1' | 'cont-1'; +export type Tier = 'tier-0' | 'tier-1' | 'tier-2' | 'auto-1' | 'cont-1' | 'ent-1'; export const roles = [ { @@ -81,6 +81,8 @@ export function tierToPlan(tier: Tier) { return tierGitHubEducation; case BillingPlan.CUSTOM: return tierCustom; + case BillingPlan.ENTERPRISE: + return tierEnterprise; default: return tierFree; } @@ -199,6 +201,11 @@ export const tierCustom: TierData = { description: 'Team on a custom contract' }; +export const tierEnterprise: TierData = { + name: 'Enterprise', + description: 'For enterprises that need more power and premium support.' +}; + export const showUsageRatesModal = writable(false); export function checkForUsageFees(plan: Tier, id: PlanServices) { From 8658ab1067875c052529ad90fdcee349f527e342 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 7 Feb 2025 10:58:21 +0530 Subject: [PATCH 2/5] update: mark scalable as disabled if the current plan is not self-serviced. --- src/lib/components/billing/planSelection.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte index 4a6e1f7ca..e80d44177 100644 --- a/src/lib/components/billing/planSelection.svelte +++ b/src/lib/components/billing/planSelection.svelte @@ -77,7 +77,12 @@
  • - +

    From c0605a389449658635f045e7949d7cb177405078 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 7 Feb 2025 11:00:48 +0530 Subject: [PATCH 3/5] update: missed opacity on disabled scale plan. --- src/lib/components/billing/planSelection.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte index e80d44177..76d307374 100644 --- a/src/lib/components/billing/planSelection.svelte +++ b/src/lib/components/billing/planSelection.svelte @@ -83,8 +83,10 @@ value={BillingPlan.SCALE} padding={1.5} disabled={!selfService}> - -
    + +

    {tierScale.name} {#if $organization?.billingPlan === BillingPlan.SCALE && !isNewOrg} From 545aec0063fff7cf21a1ac8f454955583c2de5a4 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 7 Feb 2025 12:34:57 +0530 Subject: [PATCH 4/5] update: use current plan name instead of mapping. --- .../organization-[organization]/billing/planSummary.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index ab9e3ae10..447a14bb1 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -3,7 +3,7 @@ import { Card, CardGrid, Collapsible, CollapsibleItem, Heading } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { toLocaleDate } from '$lib/helpers/date'; - import { plansInfo, tierToPlan, upgradeURL } from '$lib/stores/billing'; + import { plansInfo, upgradeURL } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; import type { CreditList, Invoice, Plan } from '$lib/sdk/billing'; import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; @@ -48,7 +48,7 @@
    - {tierToPlan($organization?.billingPlan)?.name} plan + {currentPlan.name} plan
    {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION From ea4c76c9e0d1bef374f6ac4e990c903ac807662e Mon Sep 17 00:00:00 2001 From: Darshan Date: Mon, 10 Feb 2025 13:53:48 +0530 Subject: [PATCH 5/5] ran: formatter. --- .../organization-[organization]/billing/planSummary.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index 447a14bb1..c324bbd91 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -47,8 +47,7 @@
    - - {currentPlan.name} plan + {currentPlan.name} plan
    {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION