Fix: show current plan in the select plan list

This commit is contained in:
Damodar Lohani committed 2025-02-25 06:03:36 +00:00
1 parent 99a6d81fa1
commit 7a2064b7b4
2 files changed
+49 -3

No files matched your search

+48 -2
View File
@@ -2,7 +2,7 @@
import { BillingPlan } from '$lib/constants';
import { formatCurrency } from '$lib/helpers/numbers';
import { plansInfo } from '$lib/stores/billing';
import { organization } from '$lib/stores/organization';
import { currentPlan, organization } from '$lib/stores/organization';
import { LabelCard } from '..';
export let billingPlan: string;
@@ -10,16 +10,62 @@
export let isNewOrg = false;
let classes: string = '';
export { classes as class };
let isCurrentPlanShown: boolean = false;
function currentPlanExists() {
for (let plan in $plansInfo.values()) {
if (plan.$id === $currentPlan.$id) {
return true;
}
}
return false;
}
$: isCurrentPlanShown = currentPlanExists();
</script>
{#if billingPlan}
<ul class="u-flex u-flex-vertical u-gap-16 u-margin-block-start-8 {classes}">
{#if !isCurrentPlanShown}
<li>
<LabelCard
name="plan"
bind:group={billingPlan}
disabled={($currentPlan.$id === BillingPlan.FREE && anyOrgFree) ||
!$currentPlan.selfService}
value={$currentPlan.$id}
tooltipShow={$currentPlan.$id === BillingPlan.FREE && anyOrgFree}
tooltipText={$currentPlan.$id === BillingPlan.FREE
? 'You are limited to 1 Free organization per account.'
: ''}
padding={1.5}>
<svelte:fragment slot="custom" let:disabled>
<div
class="u-flex u-flex-vertical u-gap-4 u-width-full-line"
class:u-opacity-50={disabled}>
<h4 class="body-text-2 u-bold">
{$currentPlan.name}
<span class="inline-tag">Current plan</span>
</h4>
<p class="u-color-text-offline u-small">
{$currentPlan.desc}
</p>
<p>
{formatCurrency($currentPlan?.price ?? 0)}
</p>
</div>
</svelte:fragment>
</LabelCard>
</li>
{/if}
{#each $plansInfo.values() as plan}
<li>
<LabelCard
name="plan"
bind:group={billingPlan}
disabled={(plan.$id === BillingPlan.FREE && anyOrgFree) || !plan.selfService}
disabled={(plan.$id === BillingPlan.FREE && anyOrgFree) ||
!$currentPlan.selfService}
value={plan.$id}
tooltipShow={plan.$id === BillingPlan.FREE && anyOrgFree}
tooltipText={plan.$id === BillingPlan.FREE
@@ -233,7 +233,7 @@
{:else}
<Button
text
disabled={$organization?.markedForDeletion || !currentPlan.selfService}
disabled={$organization?.markedForDeletion}
href={$upgradeURL}
on:click={() =>
trackEvent('click_organization_plan_update', {