Skip to content

feat(portal): require approval for reset proration on same-interval #14058

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
maximevast merged 4 commits into from
Sep 1, 2026
+16 −40
Merged

feat(portal): require approval for reset proration on same-interval #14058

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
512c3d9
customer-portal: require approval for reset proration on same-interva…
maximevast Aug 31, 2026
3f8c4b1
fix: don't require invoice approval during a trial
maximevast Aug 31, 2026
aadb8e5
customer-portal: remove the immediate-charge confirmation
maximevast Sep 1, 2026
127ea03
customer-portal: make the proration message switch exhaustive
maximevast Sep 1, 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
9 changes: 6 additions & 3 deletions clients/apps/web/src/components/CustomerPortal/CustomerChangePlanModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,13 @@ const CustomerChangePlanModal = ({

switch (prorationBehavior) {
case 'invoice':
return "I'll be charged immediately with a proration for the current month."
return "I'll be charged immediately, with a proration for the current period."
case 'prorate':
return 'Your next invoice will include the new plan plus the proration for the current month.'
return 'Your next invoice will include the new plan plus the proration for the current period.'
case 'next_period':
return 'The new plan will be applied on your next billing cycle.'
case 'reset':
return "I'll be charged the full amount for the new plan immediately, and my billing period restarts today."
}
}, [
selectedProduct,
Expand All @@ -177,7 +179,8 @@ const CustomerChangePlanModal = ({
const willIssueInvoice =
trialOutcome?.kind === 'ends' ||
willTriggerImmediateCycle ||
prorationBehavior === 'invoice'
(!isTrialing &&
(prorationBehavior === 'invoice' || prorationBehavior === 'reset'))
const [approveImmediateInvoice, setApproveImmediateInvoice] = useState(false)

const canChangePlan = useMemo(() => {
Expand Down
6 changes: 4 additions & 2 deletions clients/apps/web/src/components/CustomerPortal/CustomerSeatQuantityManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@ export const CustomerSeatQuantityManager = ({
if (!prorationBehavior) return null
switch (prorationBehavior) {
case 'invoice':
return "I'll be charged immediately with a proration for the current month."
return "You'll be charged immediately, with a proration for the current period."
case 'prorate':
return 'Your next invoice will include the updated seats plus the proration for the current month.'
return 'Your next invoice will include the updated seats plus the proration for the current period.'
case 'next_period':
return 'The seat update will be applied on your next billing cycle.'
case 'reset':
return "You'll be charged the full new amount immediately, and your billing period restarts today."
}
}, [prorationBehavior])

Expand Down
Loading