Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 469
feat(*): Seat-based billing support#8006
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
340d3bf
feat(clerk-js,shared): Add parsing for SBB fields (#7785)
dstaley a3f8ab3
Merge branch 'main' into feat/seat-based-billing
dstaley f2e39f4
Merge branch 'main' into feat/seat-based-billing
dstaley 0e036d2
feat(clerk-js,localizations,shared,ui): Render seat costs in PricingT…
dstaley c0052f1
feat(clerk-js,localizations,msw,shared,ui): Add display for member li…
dstaley 383499a
Merge branch 'main' into feat/seat-based-billing
dstaley 192be6e
fix(ui): Assert non-null fee
dstaley 2fe3197
Merge branch 'main' into feat/seat-based-billing
dstaley d5b41a1
feat(clerk-js,ui): Show SBB totals in Checkout (#8005)
dstaley 403efb1
feat(ui): Disable invite button when over maxAllowedMemberships (#8089)
dstaley 0104ebd
feat(ui): Render seat limits on subscription items (#8069)
dstaley 174a6f0
feat(ui): Render seat limits in SubscriptionDetails (#8115)
dstaley 7f6e3a4
Merge branch 'main' into feat/seat-based-billing
dstaley b98d919
fix(clerk-js): Bump bundle limit
dstaley 255bdfc
fix(ui): rm console.log
dstaley e65db01
text(ui): Update for new DOM structure
dstaley 5d0c49a
test(ui): Remove SBB rendering tests
dstaley 5adbece
fix(ui): Bump bundle limit
dstaley dc73582
Merge branch 'main' into feat/seat-based-billing
dstaley 02ce6eb
Merge branch 'main' into feat/seat-based-billing
dstaley a1d50a5
chore(repo): Update changelog
dstaley d9234e5
fix(localizations,ui): Disable switch to plan button when over seat l…
dstaley 74984c2
Merge branch 'main' into feat/seat-based-billing
dstaley 0278220
fix(ui): Render Card background in PricingTable when plan has seat fe…
dstaley 2390e62
Merge branch 'main' into feat/seat-based-billing
jacekradko 73c9f3d
fix(ui): Guard against invalid API unit price responses (#8176)
dstaley 6d3adfd
fix(ui): Update useMemo deps
dstaley 8dccb02
fix(ui): Use membersCount and pendingInvitationsCount
dstaley 0604eb3
Merge branch 'main' into feat/seat-based-billing
dstaley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| --- | ||
| '@clerk/localizations': minor | ||
| '@clerk/clerk-js': minor | ||
| '@clerk/shared': minor | ||
| '@clerk/ui': minor | ||
| --- | ||
| Add support for seat-based billing plans in Clerk Billing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,341 @@ | ||
| import { | ||
| clerkHandlers, | ||
| http, | ||
| HttpResponse, | ||
| EnvironmentService, | ||
| SessionService, | ||
| setClerkState, | ||
| type MockScenario, | ||
| UserService, | ||
| } from '@clerk/msw'; | ||
| export function CheckoutSeats(): MockScenario { | ||
| const user = UserService.create(); | ||
| const session = SessionService.create(user); | ||
| setClerkState({ | ||
| environment: EnvironmentService.MULTI_SESSION, | ||
| session, | ||
| user, | ||
| }); | ||
| const subscriptionHandler = http.get('https://*.clerk.accounts.dev/v1/me/billing/subscription', () => { | ||
| return HttpResponse.json({ | ||
| response: { | ||
| data: {}, | ||
| }, | ||
| }); | ||
| }); | ||
| const paymentMethodsHandler = http.get('https://*.clerk.accounts.dev/v1/me/billing/payment_methods', () => { | ||
| return HttpResponse.json({ | ||
| response: { | ||
| data: {}, | ||
| }, | ||
| }); | ||
| }); | ||
| const checkoutAccountCreditHandler = http.post('https://*.clerk.accounts.dev/v1/me/billing/checkouts', () => { | ||
| return HttpResponse.json({ | ||
| response: { | ||
| object: 'commerce_checkout', | ||
| id: 'string', | ||
| plan: { | ||
| object: 'commerce_plan', | ||
| id: 'string', | ||
| name: 'Pro', | ||
| fee: { | ||
| amount: 0, | ||
| amount_formatted: '25.00', | ||
| currency: 'string', | ||
| currency_symbol: '$', | ||
| }, | ||
| annual_monthly_fee: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| annual_fee: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| description: null, | ||
| is_default: true, | ||
| is_recurring: true, | ||
| publicly_visible: true, | ||
| has_base_fee: true, | ||
| for_payer_type: 'string', | ||
| slug: 'string', | ||
| avatar_url: null, | ||
| free_trial_enabled: true, | ||
| free_trial_days: null, | ||
| features: [ | ||
| { | ||
| object: 'feature', | ||
| id: 'string', | ||
| name: 'string', | ||
| description: null, | ||
| slug: 'string', | ||
| avatar_url: null, | ||
| }, | ||
| ], | ||
| }, | ||
| plan_period: 'month', | ||
| payer: { | ||
| object: 'commerce_payer', | ||
| id: 'string', | ||
| instance_id: 'string', | ||
| user_id: null, | ||
| first_name: null, | ||
| last_name: null, | ||
| email: null, | ||
| organization_id: null, | ||
| organization_name: null, | ||
| image_url: 'https://example.com', | ||
| created_at: 1, | ||
| updated_at: 1, | ||
| }, | ||
| payment_method: { | ||
| object: 'commerce_payment_method', | ||
| id: 'string', | ||
| payer_id: 'string', | ||
| payment_type: 'card', | ||
| is_default: true, | ||
| gateway: 'string', | ||
| gateway_external_id: 'string', | ||
| gateway_external_account_id: null, | ||
| last4: null, | ||
| status: 'active', | ||
| wallet_type: null, | ||
| card_type: null, | ||
| expiry_year: null, | ||
| expiry_month: null, | ||
| created_at: 1, | ||
| updated_at: 1, | ||
| is_removable: true, | ||
| }, | ||
| external_gateway_id: 'string', | ||
| status: 'needs_confirmation', | ||
| totals: { | ||
| subtotal: { | ||
| amount: 4500, | ||
| amount_formatted: '45.00', | ||
| currency: 'string', | ||
| currency_symbol: '$', | ||
| }, | ||
| tax_total: { | ||
| amount: 1, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| grand_total: { | ||
| amount: 1, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| total_due_after_free_trial: { | ||
| amount: 1, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| total_due_now: { | ||
| amount: 4500, | ||
| amount_formatted: '45.00', | ||
| currency: 'string', | ||
| currency_symbol: '$', | ||
| }, | ||
| past_due: null, | ||
| credit: { | ||
| amount: 1, | ||
| amount_formatted: '5.00', | ||
| currency: 'string', | ||
| currency_symbol: '$', | ||
| }, | ||
| per_unit_totals: [ | ||
| { | ||
| name: 'seats', | ||
| block_size: 1, | ||
| tiers: [ | ||
| { | ||
| quantity: 10, | ||
| fee_per_block: { | ||
| amount: 0, | ||
| amount_formatted: '0.00', | ||
| currency: 'USD', | ||
| currency_symbol: '$', | ||
| }, | ||
| total: { | ||
| amount: 0, | ||
| amount_formatted: '0.00', | ||
| currency: 'USD', | ||
| currency_symbol: '$', | ||
| }, | ||
| }, | ||
| { | ||
| quantity: 2, | ||
| fee_per_block: { | ||
| amount: 1000, | ||
| amount_formatted: '10.00', | ||
| currency: 'USD', | ||
| currency_symbol: '$', | ||
| }, | ||
| total: { | ||
| amount: 2000, | ||
| amount_formatted: '20.00', | ||
| currency: 'USD', | ||
| currency_symbol: '$', | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| subscription_item: { | ||
| object: 'commerce_subscription_item', | ||
| id: 'string', | ||
| instance_id: 'string', | ||
| status: 'active', | ||
| credit: { | ||
| amount: { | ||
| amount: 1, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| cycle_days_remaining: 1, | ||
| cycle_days_total: 1, | ||
| cycle_remaining_percent: 1, | ||
| }, | ||
| plan_id: 'string', | ||
| price_id: 'string', | ||
| plan: { | ||
| object: 'commerce_plan', | ||
| id: 'string', | ||
| name: 'string', | ||
| fee: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| annual_monthly_fee: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| annual_fee: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| description: null, | ||
| is_default: true, | ||
| is_recurring: true, | ||
| publicly_visible: true, | ||
| has_base_fee: true, | ||
| for_payer_type: 'string', | ||
| slug: 'string', | ||
| avatar_url: null, | ||
| free_trial_enabled: true, | ||
| free_trial_days: null, | ||
| features: [ | ||
| { | ||
| object: 'feature', | ||
| id: 'string', | ||
| name: 'string', | ||
| description: null, | ||
| slug: 'string', | ||
| avatar_url: null, | ||
| }, | ||
| ], | ||
| }, | ||
| plan_period: 'month', | ||
| payment_method_id: 'string', | ||
| payment_method: { | ||
| object: 'commerce_payment_method', | ||
| id: 'string', | ||
| payer_id: 'string', | ||
| payment_type: 'card', | ||
| is_default: true, | ||
| gateway: 'string', | ||
| gateway_external_id: 'string', | ||
| gateway_external_account_id: null, | ||
| last4: null, | ||
| status: 'active', | ||
| wallet_type: null, | ||
| card_type: null, | ||
| expiry_year: null, | ||
| expiry_month: null, | ||
| created_at: 1, | ||
| updated_at: 1, | ||
| is_removable: true, | ||
| }, | ||
| lifetime_paid: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| amount: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| next_payment: { | ||
| amount: { | ||
| amount: 0, | ||
| amount_formatted: 'string', | ||
| currency: 'string', | ||
| currency_symbol: 'string', | ||
| }, | ||
| date: 1, | ||
| }, | ||
| payer_id: 'string', | ||
| payer: { | ||
| object: 'commerce_payer', | ||
| id: 'string', | ||
| instance_id: 'string', | ||
| user_id: null, | ||
| first_name: null, | ||
| last_name: null, | ||
| email: null, | ||
| organization_id: null, | ||
| organization_name: null, | ||
| image_url: 'https://example.com', | ||
| created_at: 1, | ||
| updated_at: 1, | ||
| }, | ||
| is_free_trial: true, | ||
| period_start: 1, | ||
| period_end: null, | ||
| proration_date: 'string', | ||
| canceled_at: null, | ||
| past_due_at: null, | ||
| ended_at: null, | ||
| created_at: 1, | ||
| updated_at: 1, | ||
| }, | ||
| plan_period_start: 1, | ||
| is_immediate_plan_change: true, | ||
| free_trial_ends_at: 1, | ||
| needs_payment_method: true, | ||
| }, | ||
| }); | ||
| }); | ||
| return { | ||
| description: 'Checkout with seats', | ||
| handlers: [checkoutAccountCreditHandler, subscriptionHandler, paymentMethodsHandler, ...clerkHandlers], | ||
| initialState: { session, user }, | ||
| name: 'checkout-seats', | ||
| }; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| export { UserButtonSignedIn } from './user-button-signed-in'; | ||
| export { CheckoutAccountCredit } from './checkout-account-credit'; | ||
| export { CheckoutSeats } from './checkout-seats'; | ||
| export { OrgProfileSeatLimit } from './org-profile-seat-limit'; | ||
| export { PricingTableSBB } from './pricing-table-sbb'; | ||
| export { AnnualOnlyPlans } from './annual-only-plans'; | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.