Skip to content
Draft
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
7 changes: 7 additions & 0 deletions .changeset/billing-seat-tier-rows-payment-attempt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@clerk/shared': minor
'@clerk/clerk-js': minor
'@clerk/ui': minor
---

Surface seat-based billing details on payment attempts. The payment attempt resource now exposes a `totals` field (`BillingPaymentTotals`) carrying optional `baseFee` and `perUnitTotals` breakdowns. The payment-attempt detail page renders a "Seats" line (`{quantity} × {feePerBlock}`, or the tier total for unlimited tiers) between the plan title and subtotal when the subscription item is seat-billed.
5 changes: 4 additions & 1 deletion packages/clerk-js/src/core/resources/BillingPayment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import type {
BillingPaymentMethodResource,
BillingPaymentResource,
BillingPaymentStatus,
BillingPaymentTotals,
BillingSubscriptionItemResource,
} from '@clerk/shared/types';

import { billingMoneyAmountFromJSON } from '../../utils';
import { billingMoneyAmountFromJSON, billingPaymentTotalsFromJSON } from '../../utils';
import { unixEpochToDate } from '../../utils/date';
import { BaseResource, BillingPaymentMethod, BillingSubscriptionItem } from './internal';

Expand All @@ -22,6 +23,7 @@ export class BillingPayment extends BaseResource implements BillingPaymentResour
subscriptionItem!: BillingSubscriptionItemResource;
chargeType!: BillingPaymentChargeType;
status!: BillingPaymentStatus;
totals: BillingPaymentTotals | null = null;

constructor(data: BillingPaymentJSON) {
super();
Expand All @@ -42,6 +44,7 @@ export class BillingPayment extends BaseResource implements BillingPaymentResour
this.subscriptionItem = new BillingSubscriptionItem(data.subscription_item);
this.chargeType = data.charge_type;
this.status = data.status;
this.totals = data.totals ? billingPaymentTotalsFromJSON(data.totals) : null;
return this;
}
}
70 changes: 70 additions & 0 deletions packages/clerk-js/src/utils/__tests__/billing.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import type { BillingMoneyAmountJSON, BillingPaymentTotalsJSON } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { billingPaymentTotalsFromJSON } from '../billing';

const moneyJSON = (amount: number): BillingMoneyAmountJSON => ({
amount,
amount_formatted: (amount / 100).toFixed(2),
currency: 'USD',
currency_symbol: '$',
});

describe('billingPaymentTotalsFromJSON', () => {
it('maps subtotal, grand_total, and tax_total', () => {
const data: BillingPaymentTotalsJSON = {
subtotal: moneyJSON(4500),
grand_total: moneyJSON(5000),
tax_total: moneyJSON(500),
};

const totals = billingPaymentTotalsFromJSON(data);

expect(totals.subtotal.amount).toBe(4500);
expect(totals.grandTotal.amount).toBe(5000);
expect(totals.taxTotal.amount).toBe(500);
expect(totals.baseFee).toBeNull();
expect(totals.perUnitTotals).toBeUndefined();
});

it('maps base_fee when present', () => {
const data: BillingPaymentTotalsJSON = {
subtotal: moneyJSON(5000),
grand_total: moneyJSON(5000),
tax_total: moneyJSON(0),
base_fee: moneyJSON(1000),
};

expect(billingPaymentTotalsFromJSON(data).baseFee?.amount).toBe(1000);
});

it('maps per_unit_totals tiers with snake_case → camelCase conversion', () => {
const data: BillingPaymentTotalsJSON = {
subtotal: moneyJSON(5000),
grand_total: moneyJSON(5000),
tax_total: moneyJSON(0),
per_unit_totals: [
{
name: 'seats',
block_size: 1,
tiers: [
{ quantity: 5, fee_per_block: moneyJSON(1000), total: moneyJSON(5000) },
{ quantity: null, fee_per_block: moneyJSON(0), total: moneyJSON(0) },
],
},
],
};

const totals = billingPaymentTotalsFromJSON(data);

expect(totals.perUnitTotals).toHaveLength(1);
expect(totals.perUnitTotals?.[0].name).toBe('seats');
expect(totals.perUnitTotals?.[0].blockSize).toBe(1);
expect(totals.perUnitTotals?.[0].tiers[0]).toMatchObject({
quantity: 5,
feePerBlock: { amount: 1000 },
total: { amount: 5000 },
});
expect(totals.perUnitTotals?.[0].tiers[1].quantity).toBeNull();
});
});
12 changes: 12 additions & 0 deletions packages/clerk-js/src/utils/billing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import type {
BillingCreditsJSON,
BillingMoneyAmount,
BillingMoneyAmountJSON,
BillingPaymentTotals,
BillingPaymentTotalsJSON,
BillingPerUnitTotal,
BillingPerUnitTotalJSON,
BillingStatementTotals,
Expand Down Expand Up @@ -32,6 +34,16 @@ const billingPerUnitTotalsFromJSON = (data: BillingPerUnitTotalJSON[]): BillingP
}));
};

export const billingPaymentTotalsFromJSON = (data: BillingPaymentTotalsJSON): BillingPaymentTotals => {
return {
subtotal: billingMoneyAmountFromJSON(data.subtotal),
grandTotal: billingMoneyAmountFromJSON(data.grand_total),
taxTotal: billingMoneyAmountFromJSON(data.tax_total),
baseFee: data.base_fee ? billingMoneyAmountFromJSON(data.base_fee) : null,
perUnitTotals: data.per_unit_totals ? billingPerUnitTotalsFromJSON(data.per_unit_totals) : undefined,
};
};

export const billingCreditsFromJSON = (data: BillingCreditsJSON): BillingCredits => {
return {
proration: data.proration
Expand Down
34 changes: 34 additions & 0 deletions packages/shared/src/types/billing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,35 @@ export type BillingPaymentChargeType = 'checkout' | 'recurring';
*/
export type BillingPaymentStatus = 'pending' | 'paid' | 'failed';

/**
* The `BillingPaymentTotals` type represents the per-payment cost breakdown, including any base fee
* and per-unit (for example, seats) subtotals.
*
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change. It is advised to [pin](https://clerk.com/docs/pinning) the SDK version and the clerk-js version to avoid breaking changes.
*/
export interface BillingPaymentTotals {
/**
* The price of the items before taxes, credits, or discounts are applied.
*/
subtotal: BillingMoneyAmount;
/**
* The total amount for the payment, including taxes and after credits/discounts are applied.
*/
grandTotal: BillingMoneyAmount;
/**
* The amount of tax included in the payment.
*/
taxTotal: BillingMoneyAmount;
/**
* The flat base fee charged on top of any per-unit fees.
*/
baseFee?: BillingMoneyAmount | null;
/**
* Per-unit cost breakdown for this payment (for example, seats).
*/
perUnitTotals?: BillingPerUnitTotal[];
}

/**
* The `BillingPaymentResource` type represents a payment attempt for a user or Organization.
*
Expand Down Expand Up @@ -547,6 +576,11 @@ export interface BillingPaymentResource extends ClerkResource {
* The current status of the payment.
*/
status: BillingPaymentStatus;
/**
* Per-payment breakdown with optional base fee and per-unit (for example, seats) subtotals.
* Absent on older responses.
*/
totals?: BillingPaymentTotals | null;
}

/**
Expand Down
18 changes: 18 additions & 0 deletions packages/shared/src/types/json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,19 @@ export interface BillingStatementGroupJSON extends ClerkResourceJSON {
items: BillingPaymentJSON[];
}

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change. It is advised to [pin](https://clerk.com/docs/pinning) the SDK version and the clerk-js version to avoid breaking changes.
*
* Per-payment cost breakdown including optional base fee and per-unit (for example, seats) subtotals.
*/
export interface BillingPaymentTotalsJSON {
subtotal: BillingMoneyAmountJSON;
grand_total: BillingMoneyAmountJSON;
tax_total: BillingMoneyAmountJSON;
base_fee?: BillingMoneyAmountJSON | null;
per_unit_totals?: BillingPerUnitTotalJSON[];
}

/**
* @experimental This is an experimental API for the Billing feature that is available under a public beta, and the API is subject to change. It is advised to [pin](https://clerk.com/docs/pinning) the SDK version and the clerk-js version to avoid breaking changes.
*/
Expand All @@ -754,6 +767,11 @@ export interface BillingPaymentJSON extends ClerkResourceJSON {
subscription_item: BillingSubscriptionItemJSON;
charge_type: BillingPaymentChargeType;
status: BillingPaymentStatus;
/**
* Per-payment breakdown with optional base fee and per-unit (for example, seats)
* subtotals. Absent on older responses.
*/
totals?: BillingPaymentTotalsJSON | null;
}

/**
Expand Down
29 changes: 23 additions & 6 deletions packages/ui/src/components/PaymentAttempts/PaymentAttemptPage.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { __internal_usePaymentAttemptQuery } from '@clerk/shared/react/index';
import type { BillingSubscriptionItemResource } from '@clerk/shared/types';
import type { BillingPaymentResource } from '@clerk/shared/types';

import { Alert } from '@/ui/elements/Alert';
import { Header } from '@/ui/elements/Header';
import { LineItems } from '@/ui/elements/LineItems';
import { getSeatsPerUnitTotal, summarizeSeatCharges } from '@/ui/utils/billingPlanSeats';
import { formatDate } from '@/ui/utils/formatDate';
import { truncateWithEndVisible } from '@/ui/utils/truncateTextWithEndVisible';

Expand Down Expand Up @@ -42,8 +43,6 @@ export const PaymentAttemptPage = () => {
enabled: Boolean(params.paymentAttemptId),
});

const subscriptionItem = paymentAttempt?.subscriptionItem;

if (isLoading) {
return (
<Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
Expand Down Expand Up @@ -147,7 +146,7 @@ export const PaymentAttemptPage = () => {
{paymentAttempt.status}
</Badge>
</Box>
<PaymentAttemptBody subscriptionItem={subscriptionItem} />
<PaymentAttemptBody paymentAttempt={paymentAttempt} />
<Box
elementDescriptor={descriptors.paymentAttemptFooter}
as='footer'
Expand Down Expand Up @@ -198,18 +197,23 @@ export const PaymentAttemptPage = () => {
);
};

function PaymentAttemptBody({ subscriptionItem }: { subscriptionItem: BillingSubscriptionItemResource | undefined }) {
if (!subscriptionItem) {
function PaymentAttemptBody({ paymentAttempt }: { paymentAttempt: BillingPaymentResource | undefined }) {
if (!paymentAttempt) {
return null;
}

const { subscriptionItem } = paymentAttempt;

const fee =
subscriptionItem.planPeriod === 'month'
? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
subscriptionItem.plan.fee!
: // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
subscriptionItem.plan.annualMonthlyFee!;

const seatsTotal = subscriptionItem.seats != null ? getSeatsPerUnitTotal(paymentAttempt.totals) : undefined;
const seatSummary = summarizeSeatCharges(seatsTotal);

return (
<Box
elementDescriptor={descriptors.paymentAttemptBody}
Expand All @@ -225,6 +229,19 @@ function PaymentAttemptBody({ subscriptionItem }: { subscriptionItem: BillingSub
text={`${fee.currencySymbol}${fee.amountFormatted}`}
/>
</LineItems.Group>
{seatSummary && (
<LineItems.Group variant='tertiary'>
<LineItems.Title
title={localizationKeys('billing.seats')}
description={`${seatSummary.used} ${seatSummary.used === 1 ? 'seat' : 'seats'}${
seatSummary.included > 0 ? ` (${seatSummary.included} included)` : ''
} × ${seatSummary.paidTier.feePerBlock.currencySymbol}${seatSummary.paidTier.feePerBlock.amountFormatted}`}
/>
<LineItems.Description
text={`${seatSummary.paidTier.total.currencySymbol}${seatSummary.paidTier.total.amountFormatted}`}
/>
</LineItems.Group>
Comment on lines +232 to +243
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Handle unlimited paid tiers without quantity×rate text

The seats description always renders "{used} × {feePerBlock}". For unlimited paid tiers (paidTier.quantity === null), this is incorrect/misleading and conflicts with the intended “show tier total for unlimited tiers” behavior.

Proposed fix
         {seatSummary && (
           <LineItems.Group variant='tertiary'>
             <LineItems.Title
               title={localizationKeys('billing.seats')}
-              description={`${seatSummary.used} ${seatSummary.used === 1 ? 'seat' : 'seats'}${
-                seatSummary.included > 0 ? ` (${seatSummary.included} included)` : ''
-              } × ${seatSummary.paidTier.feePerBlock.currencySymbol}${seatSummary.paidTier.feePerBlock.amountFormatted}`}
+              description={
+                seatSummary.paidTier.quantity === null
+                  ? undefined
+                  : `${seatSummary.used} ${seatSummary.used === 1 ? 'seat' : 'seats'}${
+                      seatSummary.included > 0 ? ` (${seatSummary.included} included)` : ''
+                    } × ${seatSummary.paidTier.feePerBlock.currencySymbol}${seatSummary.paidTier.feePerBlock.amountFormatted}`
+              }
             />
             <LineItems.Description
               text={`${seatSummary.paidTier.total.currencySymbol}${seatSummary.paidTier.total.amountFormatted}`}
             />
           </LineItems.Group>
         )}
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/ui/src/components/PaymentAttempts/PaymentAttemptPage.tsx` around
lines 232 - 243, The seats description currently always renders a quantity×rate
string; update the JSX in the PaymentAttemptPage component so that when
seatSummary.paidTier.quantity === null (an unlimited paid tier) you do not
render the "× {feePerBlock}" piece and instead only show the tier total,
otherwise keep the existing "{used} × {feePerBlock}" behavior; specifically
adjust the LineItems.Title description expression (using seatSummary,
seatSummary.paidTier.quantity, seatSummary.paidTier.feePerBlock and
seatSummary.paidTier.total) to branch on paidTier.quantity and produce the
appropriate string for unlimited vs. limited tiers.

)}
<LineItems.Group
borderTop
variant='tertiary'
Expand Down
Loading
Loading