From 449fe5a7f8dee1f758fcd3dddeaf9a47704caee5 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 16 Jun 2025 05:22:47 +0000
Subject: [PATCH] fix plan selection

---
 src/lib/components/billing/planSelection.svelte            | 4 ++--
 .../organization-[organization]/change-plan/+page.svelte   | 7 ++++---
 .../organization-[organization]/change-plan/+page.ts       | 6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte
index b69e3aa7e..d4842102f 100644
--- a/src/lib/components/billing/planSelection.svelte
+++ b/src/lib/components/billing/planSelection.svelte
@@ -13,8 +13,8 @@
     export let isNewOrg = false;
     export let selfService = true;
 
-    $: isBasePlan = BASE_BILLING_PLANS.includes($currentPlan?.$id);
     $: plans = Object.values(page.data.plans.plans) as Plan[];
+    $: currentPlanInList = plans.filter((plan) => plan.$id === $currentPlan?.$id).length > 0;
 </script>
 
 <Layout.Stack>
@@ -41,7 +41,7 @@
             </Typography.Text>
         </LabelCard>
     {/each}
-    {#if $currentPlan && !isBasePlan}
+    {#if $currentPlan && !currentPlanInList}
         <LabelCard
             name="plan"
             bind:group={billingPlan}
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index c35ee6882..144ce5a9d 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -91,8 +91,9 @@
         if ($currentPlan?.$id === BillingPlan.SCALE) {
             selectedPlan = BillingPlan.SCALE;
         } else {
-            selectedPlan = BillingPlan.PRO;
+            selectedPlan = $currentPlan?.$id as BillingPlan || BillingPlan.FREE;
         }
+        console.log('Selected plan:', selectedPlan);
     });
 
     async function handleSubmit() {
@@ -247,8 +248,8 @@
         }
     }
 
-    $: isUpgrade = $plansInfo.get(selectedPlan).order > $currentPlan?.order;
-    $: isDowngrade = $plansInfo.get(selectedPlan).order < $currentPlan?.order;
+    $: isUpgrade = $plansInfo.get(selectedPlan)?.order > $currentPlan?.order;
+    $: isDowngrade = $plansInfo.get(selectedPlan)?.order < $currentPlan?.order;
     $: isButtonDisabled = $organization?.billingPlan === selectedPlan;
 </script>
 
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.ts b/src/routes/(console)/organization-[organization]/change-plan/+page.ts
index b698d60dc..ce18725fc 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.ts
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.ts
@@ -8,9 +8,10 @@ export const load: PageLoad = async ({ depends, parent, url }) => {
     const { members, organization, currentPlan, organizations } = await parent();
     depends(Dependencies.UPGRADE_PLAN);
 
-    const [coupon, paymentMethods] = await Promise.all([
+    const [coupon, paymentMethods, plans] = await Promise.all([
         getCoupon(url),
-        sdk.forConsole.billing.listPaymentMethods()
+        sdk.forConsole.billing.listPaymentMethods(),
+        sdk.forConsole.billing.listPlans()
     ]);
 
     let plan = getPlanFromUrl(url);
@@ -29,6 +30,7 @@ export const load: PageLoad = async ({ depends, parent, url }) => {
     return {
         members,
         plan,
+        plans,
         coupon,
         selfService,
         hasFreeOrgs,