Skip to content

fix: show org payment method for all team members on billing tab #2959

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
lohanidamodar merged 2 commits into from
Apr 7, 2026
Merged

fix: show org payment method for all team members on billing tab #2959

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56c959e
fix: show org payment method for all team members on billing tab
lohanidamodar Apr 7, 2026
784c4fd
fix: correct type annotations for payment method promises
lohanidamodar Apr 7, 2026
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
81 changes: 43 additions & 38 deletions src/routes/(console)/organization-[organization]/billing/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,26 +70,54 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {

const areCreditsSupported = isCloud ? currentPlan?.supportsCredits : false;

const [paymentMethods, addressList, billingAddress, availableCredit, billingPlanDowngrade] =
await Promise.all([
sdk.forConsole.account.listPaymentMethods(),
sdk.forConsole.account.listBillingAddresses(),
billingAddressPromise,
areCreditsSupported
? sdk.forConsole.organizations.getAvailableCredits({
organizationId: organization.$id
const primaryPaymentMethodPromise: Promise<Models.PaymentMethod | null> | null =
organization.paymentMethodId
? sdk.forConsole.organizations
.getPaymentMethod({
organizationId: organization.$id,
paymentMethodId: organization.paymentMethodId
})
: null,
organization.billingPlanDowngrade
? sdk.forConsole.console.getPlan({
planId: organization.billingPlanDowngrade
.catch(() => null)
: null;

const backupPaymentMethodPromise: Promise<Models.PaymentMethod | null> | null =
organization.backupPaymentMethodId
? sdk.forConsole.organizations
.getPaymentMethod({
organizationId: organization.$id,
paymentMethodId: organization.backupPaymentMethodId
})
: null
]);
.catch(() => null)
: null;

const [
paymentMethods,
addressList,
billingAddress,
availableCredit,
billingPlanDowngrade,
primary,
backup
] = await Promise.all([
sdk.forConsole.account.listPaymentMethods(),
sdk.forConsole.account.listBillingAddresses(),
billingAddressPromise,
areCreditsSupported
? sdk.forConsole.organizations.getAvailableCredits({
organizationId: organization.$id
})
: null,
organization.billingPlanDowngrade
? sdk.forConsole.console.getPlan({
planId: organization.billingPlanDowngrade
})
: null,
primaryPaymentMethodPromise,
backupPaymentMethodPromise
]);

// make number
const credits = availableCredit ? availableCredit.available : null;
const { backup, primary } = getOrganizationPaymentMethods(organization, paymentMethods);

return {
paymentMethods,
Expand All @@ -112,26 +140,3 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
primaryPaymentMethod: primary
};
};

function getOrganizationPaymentMethods(
organization: Models.Organization,
paymentMethods: Models.PaymentMethodList
): {
backup: Models.PaymentMethod | null;
primary: Models.PaymentMethod | null;
} {
let backup: Models.PaymentMethod | null = null;
let primary: Models.PaymentMethod | null = null;

for (const paymentMethod of paymentMethods.paymentMethods) {
if (paymentMethod.$id === organization.paymentMethodId) {
primary = paymentMethod;
} else if (paymentMethod.$id === organization.backupPaymentMethodId) {
backup = paymentMethod;
}

if (primary && backup) break;
}

return { primary, backup };
}
Loading