Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions web-admin/src/features/billing/plans/FreePlan.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import { formatCredit } from "@rilldata/web-admin/features/billing/plans/utils.ts";
import { getPlanCredits } from "@rilldata/web-admin/features/billing/plans/selectors.ts";
import { useCategorisedOrganizationBillingIssues } from "@rilldata/web-admin/features/billing/selectors.ts";
import { PricingDetailsCompact } from "@rilldata/web-common/features/billing/pricing-details.ts";
import PricingLink from "@rilldata/web-admin/features/billing/plans/modules/PricingLink.svelte";
import { m } from "@rilldata/web-common/lib/i18n/gen/messages";

Expand All @@ -30,14 +29,14 @@
>
{#snippet info()}
{m.billing_no_time_limit()}<br />
{PricingDetailsCompact}<br />
{m.billing_pricing_details_compact()}<br />
{m.billing_unit_spec()}
{/snippet}

{#snippet action()}
<button class="subscribe-btn" onclick={upgrade}
>{m.billing_upgrade_to_pro()}</button
>
<button class="subscribe-btn" onclick={upgrade}>
{m.billing_upgrade_to_paid_plan()}
</button>
{/snippet}

<div class="credit-section">
Expand Down
6 changes: 3 additions & 3 deletions web-admin/src/features/billing/plans/LegacyTrialPlan.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@
{/snippet}

{#snippet action()}
<button class="subscribe-btn" onclick={upgrade}
>{m.billing_upgrade_to_team()}</button
>
<button class="subscribe-btn" onclick={upgrade}>
{m.billing_upgrade_to_paid_plan()}
</button>
{/snippet}

<div class="trial-section">
Expand Down
8 changes: 2 additions & 6 deletions web-admin/src/features/billing/plans/ProPlan.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<script lang="ts">
import PlanContainer from "@rilldata/web-admin/features/billing/plans/PlanContainer.svelte";
import {
PricingDetails,
PricingDetailsCompact,
} from "@rilldata/web-common/features/billing/pricing-details.ts";
import DetailedUsageLink from "@rilldata/web-admin/features/billing/plans/modules/DetailedUsageLink.svelte";
import { m } from "@rilldata/web-common/lib/i18n/gen/messages";

Expand All @@ -23,10 +19,10 @@
{/snippet}

{#snippet info()}
{PricingDetailsCompact} {m.billing_cancel_anytime()}
{m.billing_pricing_details_compact()} {m.billing_cancel_anytime()}
{/snippet}

<div class="text-sm text-fg-tertiary mt-4 pb-4">
{PricingDetails}
{m.billing_pricing_details()}
</div>
</PlanContainer>
2 changes: 0 additions & 2 deletions web-common/src/features/billing/pricing-details.ts

This file was deleted.

7 changes: 4 additions & 3 deletions web-common/src/lib/i18n/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"billing_plan_badge_free_trial": "Free Trial",
"billing_plan_badge_managed": "Managed",
"billing_plan_badge_pro": "Pro",
"billing_plan_badge_pro_trial": "Pro Trial",
"billing_plan_badge_pro_trial": "Trial",
"billing_plan_badge_team": "Team",
"billing_plan_cancelled": "Your plan is cancelled {accessTimeout}.",
"billing_plan_header": "Plan",
Expand All @@ -231,6 +231,8 @@
"billing_plan_tagline_growth": "For growing teams and embedded analytics.",
"billing_plan_tagline_starter": "For small teams getting started.",
"billing_plan_was_cancelled": "Your {planName} plan was cancelled",
"billing_pricing_details": "You'll be billed monthly based on usage at $20/seat, $0.15/compute unit/hr and $1/GB storage/mo.",
"billing_pricing_details_compact": "$20/seat · $0.15/compute unit/hr · $1/GB storage/mo.",
"billing_prod_compute_units": "{count} Prod Compute Units",
"billing_projects": "Projects",
"billing_projects_hibernating": " and this org’s projects are now hibernating",
Expand Down Expand Up @@ -263,8 +265,7 @@
"billing_unlimited": "Unlimited",
"billing_update_payment": "Update payment",
"billing_update_payment_methods": "Update payment methods",
"billing_upgrade_to_pro": "Upgrade to Pro",
"billing_upgrade_to_team": "Upgrade to Team plan",
"billing_upgrade_to_paid_plan": "Upgrade to paid plan",
"billing_upgrade_to_wake": "Upgrade to wake projects and regain full access.",
"billing_upgrade_within_to_maintain": "Upgrade within {duration} to maintain access.",
"billing_upgrading_plan": "Upgrading to {plan} plan...",
Expand Down
5 changes: 3 additions & 2 deletions web-common/src/lib/i18n/messages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@
"billing_plan_tagline_growth": "Para equipos en crecimiento y analítica embebida.",
"billing_plan_tagline_starter": "Para equipos pequeños que están comenzando.",
"billing_plan_was_cancelled": "Su plan {planName} ha sido cancelado",
"billing_pricing_details": "Se le facturará mensualmente según el uso a $20/puesto, $0.15/unidad de cómputo/h y $1/GB de almacenamiento/mes.",
"billing_pricing_details_compact": "$20/puesto · $0.15/unidad de cómputo/h · $1/GB de almacenamiento/mes.",
"billing_prod_compute_units": "{count} unidades de cómputo de producción",
"billing_projects": "Proyectos",
"billing_projects_hibernating": " y los proyectos de esta organización están en hibernación",
Expand Down Expand Up @@ -263,8 +265,7 @@
"billing_unlimited": "Ilimitado",
"billing_update_payment": "Actualizar pago",
"billing_update_payment_methods": "Actualizar métodos de pago",
"billing_upgrade_to_pro": "Actualizar a Pro",
"billing_upgrade_to_team": "Actualizar al plan Equipo",
"billing_upgrade_to_paid_plan": "Actualizar a plan de pago",
"billing_upgrade_to_wake": "Actualice para reactivar los proyectos y recuperar el acceso completo.",
"billing_upgrade_within_to_maintain": "Actualice dentro de {duration} para mantener el acceso.",
"billing_upgrading_plan": "Actualizando al plan {plan}...",
Expand Down
Loading