From 3f60b98036e62e30db3626e3cece989ee36d7b49 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 3 Apr 2025 10:04:58 +0530
Subject: [PATCH 1/3] fix: change-plan from account.

---
 src/lib/components/support.svelte             | 22 +++++++---
 .../change-plan/+page.svelte                  | 43 +++++++++++--------
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index d28cce1032..2791d7b733 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -5,17 +5,29 @@
     import { isSupportOnline, showSupportModal } from '$routes/(console)/wizard/support/store';
     import { trackEvent } from '$lib/actions/analytics';
     import { localeShortTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
-    import { upgradeURL } from '$lib/stores/billing';
+    import { plansInfo } from '$lib/stores/billing';
     import { Card } from '$lib/components/index';
     import { app } from '$lib/stores/app';
-    import { currentPlan } from '$lib/stores/organization';
+    import { currentPlan, organizationList } from '$lib/stores/organization';
     import { isCloud } from '$lib/system';
+    import { base } from '$app/paths';
 
     export let show = false;
 
     export let showHeader = true;
 
-    $: hasPremiumSupport = $currentPlan?.premiumSupport ?? false;
+    $: hasPremiumSupport = $currentPlan?.premiumSupport ?? areAllOrganizationsPaid ?? false;
+
+    $: areAllOrganizationsPaid = $organizationList.teams.every(
+        (team) => $plansInfo.get(team['billingPlan'])?.premiumSupport
+    );
+
+    // there can only be one free organization
+    $: freeOrganization = $organizationList.teams.find(
+        (team) => !$plansInfo.get(team['billingPlan'])?.premiumSupport
+    );
+
+    $: upgradeURL = `${base}/organization-${freeOrganization.$id}/change-plan`;
 
     $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeShortTimezoneName()}`;
 
@@ -54,7 +66,7 @@
         }
     ];
 
-    const showCloudSupport = (index) => {
+    const showCloudSupport = (index: number) => {
         return (index === 0 && isCloud) || index > 0;
     };
 </script>
@@ -82,7 +94,7 @@
                     <div class="u-flex u-gap-12 u-cross-center">
                         {#if !hasPremiumSupport}
                             <Button
-                                href={$upgradeURL}
+                                href={upgradeURL}
                                 on:click={() => {
                                     trackEvent('click_organization_upgrade', {
                                         from: 'button',
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index d858f14d87..bae622f70f 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -28,13 +28,13 @@
         WizardSecondaryFooter
     } from '$lib/layout';
     import { type Coupon, type PaymentList } from '$lib/sdk/billing';
-    import { isOrganization, plansInfo, tierToPlan, type Tier } from '$lib/stores/billing';
+    import { isOrganization, plansInfo, type Tier, tierToPlan } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
     import {
         currentPlan,
         organization,
-        organizationList,
-        type Organization
+        type Organization,
+        organizationList
     } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { confirmPayment } from '$lib/stores/stripe';
@@ -83,8 +83,7 @@
         if ($page.url.searchParams.has('code')) {
             const coupon = $page.url.searchParams.get('code');
             try {
-                const response = await sdk.forConsole.billing.getCouponAccount(coupon);
-                couponData = response;
+                couponData = await sdk.forConsole.billing.getCouponAccount(coupon);
             } catch (e) {
                 couponData = {
                     code: null,
@@ -137,7 +136,7 @@
     async function downgrade() {
         try {
             await sdk.forConsole.billing.updatePlan(
-                $organization.$id,
+                selectedOrg.$id,
                 billingPlan,
                 paymentMethodId,
                 null
@@ -155,7 +154,7 @@
                     reason: feedbackDowngradeOptions.find(
                         (option) => option.value === feedbackDowngradeReason
                     )?.label,
-                    orgId: $organization.$id,
+                    orgId: selectedOrg.$id,
                     userId: $user.$id,
                     message: feedbackMessage ?? ''
                 })
@@ -168,7 +167,7 @@
                 type: 'success',
                 isHtml: true,
                 message: `
-                        <b>${$organization.name}</b> plan has been successfully updated.`
+                        <b>${selectedOrg.name}</b> plan has been successfully updated.`
             });
 
             trackEvent(Submit.OrganizationDowngrade, {
@@ -211,7 +210,7 @@
 
     async function upgrade() {
         try {
-            //Add collaborators
+            // Add collaborators
             let newCollaborators = [];
             if (collaborators?.length) {
                 newCollaborators = collaborators.filter(
@@ -220,7 +219,7 @@
                 );
             }
             const org = await sdk.forConsole.billing.updatePlan(
-                $organization.$id,
+                selectedOrg.$id,
                 billingPlan,
                 paymentMethodId,
                 null,
@@ -274,9 +273,15 @@
         }
     }
 
-    $: isSamePlan = billingPlan === $currentPlan.$id;
-    $: isUpgrade = isSamePlan ? false : $plansInfo.get(billingPlan)?.order > $currentPlan.order;
-    $: isDowngrade = isSamePlan ? false : $plansInfo.get(billingPlan)?.order < $currentPlan.order;
+    $: selectedOrg =
+        $organization ??
+        ($organizationList.teams.find(
+            (team) => team.$id === $page.params.organization
+        ) as Organization);
+    $: currentOrgPlan = $currentPlan ?? $plansInfo.get(selectedOrg?.billingPlan);
+    $: isSamePlan = billingPlan === currentOrgPlan.$id;
+    $: isUpgrade = isSamePlan ? false : $plansInfo.get(billingPlan)?.order > currentOrgPlan.order;
+    $: isDowngrade = isSamePlan ? false : $plansInfo.get(billingPlan)?.order < currentOrgPlan.order;
     $: if (billingPlan !== BillingPlan.FREE) {
         loadPaymentMethods();
     }
@@ -313,10 +318,10 @@
                     <Alert type="warning" class="u-margin-block-start-24">
                         <svelte:fragment slot="title">
                             Your organization will switch to {tierToPlan(billingPlan).name} plan on {toLocaleDate(
-                                $organization.billingNextInvoiceDate
+                                selectedOrg.billingNextInvoiceDate
                             )}.
                         </svelte:fragment>
-                        You will retain access to {tierToPlan($organization.billingPlan).name} plan features
+                        You will retain access to {tierToPlan(selectedOrg.billingPlan).name} plan features
                         until your billing period ends. {#if extraMembers > 0}After that,
                             <b
                                 >you will be charged {formatCurrency(
@@ -328,7 +333,7 @@
                 {/if}
             {/if}
             <!-- Show email input if upgrading from free plan -->
-            {#if billingPlan !== BillingPlan.FREE && $organization.billingPlan !== billingPlan && $organization.billingPlan !== BillingPlan.CUSTOM && isUpgrade}
+            {#if billingPlan !== BillingPlan.FREE && selectedOrg.billingPlan !== billingPlan && selectedOrg.billingPlan !== BillingPlan.CUSTOM && isUpgrade}
                 <FormList class="u-margin-block-start-16">
                     <InputTags
                         bind:tags={collaborators}
@@ -369,14 +374,14 @@
             {/if}
         </Form>
         <svelte:fragment slot="aside">
-            {#if billingPlan !== BillingPlan.FREE && $organization.billingPlan !== billingPlan && $organization.billingPlan !== BillingPlan.CUSTOM && isUpgrade}
+            {#if billingPlan !== BillingPlan.FREE && selectedOrg.billingPlan !== billingPlan && selectedOrg.billingPlan !== BillingPlan.CUSTOM && isUpgrade}
                 <EstimatedTotal
                     bind:billingBudget
                     bind:couponData
-                    organizationId={$organization.$id}
+                    organizationId={selectedOrg.$id}
                     {billingPlan}
                     {collaborators} />
-            {:else if $organization.billingPlan !== BillingPlan.CUSTOM}
+            {:else if selectedOrg.billingPlan !== BillingPlan.CUSTOM}
                 <PlanComparisonBox downgrade={isDowngrade} />
             {/if}
         </svelte:fragment>

From a29036a71c8f0fdbc49adbe77b98d7c7baaf77be Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 3 Apr 2025 10:09:43 +0530
Subject: [PATCH 2/3] fix: type.

---
 src/lib/components/support.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 2791d7b733..c43c4f54e4 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -8,7 +8,7 @@
     import { plansInfo } from '$lib/stores/billing';
     import { Card } from '$lib/components/index';
     import { app } from '$lib/stores/app';
-    import { currentPlan, organizationList } from '$lib/stores/organization';
+    import { currentPlan, type Organization, organizationList } from '$lib/stores/organization';
     import { isCloud } from '$lib/system';
     import { base } from '$app/paths';
 
@@ -19,12 +19,12 @@
     $: hasPremiumSupport = $currentPlan?.premiumSupport ?? areAllOrganizationsPaid ?? false;
 
     $: areAllOrganizationsPaid = $organizationList.teams.every(
-        (team) => $plansInfo.get(team['billingPlan'])?.premiumSupport
+        (team) => $plansInfo.get((team as Organization).billingPlan)?.premiumSupport
     );
 
     // there can only be one free organization
     $: freeOrganization = $organizationList.teams.find(
-        (team) => !$plansInfo.get(team['billingPlan'])?.premiumSupport
+        (team) => !$plansInfo.get((team as Organization).billingPlan)?.premiumSupport
     );
 
     $: upgradeURL = `${base}/organization-${freeOrganization.$id}/change-plan`;

From 31d27852419adfd8f350f49d4a04a0b4a7313a33 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 3 Apr 2025 13:38:53 +0530
Subject: [PATCH 3/3] address comment.

---
 src/lib/components/support.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index c43c4f54e4..cad7a08bfa 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -16,9 +16,9 @@
 
     export let showHeader = true;
 
-    $: hasPremiumSupport = $currentPlan?.premiumSupport ?? areAllOrganizationsPaid ?? false;
+    $: hasPremiumSupport = $currentPlan?.premiumSupport ?? allOrgsHavePremiumSupport ?? false;
 
-    $: areAllOrganizationsPaid = $organizationList.teams.every(
+    $: allOrgsHavePremiumSupport = $organizationList.teams.every(
         (team) => $plansInfo.get((team as Organization).billingPlan)?.premiumSupport
     );