Skip to content

chore: backport enterprise customers payment changes to 0.86 #9528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjain1 merged 1 commit into from
Jun 5, 2026
+3 −5
Merged

chore: backport enterprise customers payment changes to 0.86 #9528

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions web-admin/src/features/billing/Payment.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import SettingsContainer from "@rilldata/web-admin/features/organizations/settings/SettingsContainer.svelte";
import { Button } from "@rilldata/web-common/components/button";
import CancelCircle from "@rilldata/web-common/components/icons/CancelCircle.svelte";
import { isEnterprisePlan, isManagedPlan } from "./plans/utils";
import { isManagedPlan } from "./plans/utils";

let { organization }: { organization: string } = $props();

Expand All @@ -28,14 +28,12 @@
let neverSubscribed = $derived(!!$categorisedIssues.data?.neverSubscribed);
let onTrial = $derived(!!$categorisedIssues.data?.trial);
let onManagedPlan = $derived(plan && isManagedPlan(plan.name));
let onEnterprisePlan = $derived(plan && isEnterprisePlan(plan.name));
// For enterprise and managed orgs, hide when payment details haven't been
// For managed orgs, hide when payment details haven't been
// entered yet (setup done via CLI). Once set up, show the Manage button.
// neverSubscribed orgs are always hidden since the billing page is not shown.
let pendingSetup = $derived(
neverSubscribed ||
((onManagedPlan || onEnterprisePlan) &&
needsPaymentSetup(paymentIssues ?? [])),
(onManagedPlan && needsPaymentSetup(paymentIssues ?? [])),
);

async function handleManagePayment() {
Expand Down
Loading