diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte b/src/lib/components/billing/planExcess.svelte similarity index 100% rename from src/routes/console/wizard/cloudOrganizationChangeTier/planExcess.svelte rename to src/lib/components/billing/planExcess.svelte diff --git a/src/routes/console/organization-[organization]/change-plan/+page.svelte b/src/routes/console/organization-[organization]/change-plan/+page.svelte index 714ba703d..92bbc10cb 100644 --- a/src/routes/console/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/console/organization-[organization]/change-plan/+page.svelte @@ -92,7 +92,7 @@ billingPlan = plan as BillingPlan; } } - billingPlan = $organization.billingPlan; + billingPlan = BillingPlan.PRO; }); async function loadPaymentMethods() { @@ -262,7 +262,7 @@ .
{#if anyOrgFree && billingPlan === BillingPlan.PRO} -{element.streetAddress}
- {#if element?.addressLine2} -{element.addressLine2}
- {/if} -{element.city}
-{element.state}
-{element.postalCode}
-{element.country}
-Plan
-- For more details on our plans, visit our pricing page. -
-{tierFree.description}
-- {tierPro.description} -
-- {tierScale.description} -
-Organization name
-{$organization.name}
-Additional members
-{collaboratorsNumber} members
-Payment
- {#await fetchCard()} -- Card ending in {card.last4} -
-{plan.name} plan
-{formatCurrency(plan.price)}
- - -Additional members ({collaboratorsNumber})
-{formatCurrency(collaboratorPrice * collaboratorsNumber)}
- - {#if couponData?.status === 'active'} - -Credits applied ({couponData.credits})
--{formatCurrency(couponData.credits)}
- - {/if} - {/if} - {@const estimatedTotal = - couponData?.status === 'active' - ? totalExpences - couponData.credits >= 0 - ? totalExpences - couponData.credits - : 0 - : totalExpences} - - -Estimated total
-- {formatCurrency(estimatedTotal)} -
- - -- This amount, and any additional usage fees, will be charged on a recurring 30-day - billing cycle{!$plansInfo.get($changeOrganizationTier.billingPlan)?.trialDays - ? '' - : ` after your trial period ends on ${toLocaleDate(billingPayDate.toString())}`}. -
-- Restrict your resource usage by setting a budget cap. . -
- {#if budgetEnabled} -