From b3773342a531eca18df5de855c221be594b7cb65 Mon Sep 17 00:00:00 2001 From: mehfuz Date: Wed, 18 Nov 2026 19:26:51 -0800 Subject: [PATCH] Billing: sell paid plans on cloud models, drop web search upsell Plan cards, the Free plan line and the billing blurb no longer advertise web searches; paid plans are for cloud models. The 'Need more searches?' upsell is gone from web search settings. The billing page now derives everything from the plan paid for, so a stale subscription status can't show 'Active' beside Free. --- src/app/settings/sections/billing.tsx | 26 ++++++++++--------------- src/app/settings/sections/websearch.tsx | 23 ---------------------- 2 files changed, 10 insertions(+), 39 deletions(-) diff --git a/src/app/settings/sections/billing.tsx b/src/app/settings/sections/billing.tsx index 064bbe3..0eb4cae 100644 --- a/src/app/settings/sections/billing.tsx +++ b/src/app/settings/sections/billing.tsx @@ -156,8 +156,8 @@ function PlanRow({ <> {description ?
: null} {plan === 'free' - ? `${current.credits.toLocaleString()} credits a month, good for about ${current.searches.toLocaleString()} web searches; cloud models need a paid plan.` - : `${current.credits.toLocaleString()} credits a month, shared by cloud models and web searches.`} + ? 'Cloud models need a paid plan.' + : `${current.credits.toLocaleString()} credits a month for cloud models.`} )} @@ -168,15 +168,13 @@ function PlanRow({ ); } -/** What a plan buys, as lines on its card: only what the API meters. One - * pool pays for cloud models and web searches alike, so the searches line - * says what the credits would stretch to, not a second allowance. */ +/** What a plan buys, as lines on its card: cloud models and the monthly + * credits that pay for them. */ const planPerks = (p: PlanInfo, below: PlanInfo | null): string[] => { const perks: string[] = []; if (below && below.id !== 'free') perks.push(`Everything in ${below.name}`); perks.push(`${p.credits.toLocaleString()} credits a month`); perks.push('Cloud models, charged by what each call reads and writes'); - perks.push(`Web searches from the same credits, up to ${p.searches.toLocaleString()} a month`); return perks; }; @@ -364,15 +362,11 @@ export default function BillingSection() { // eslint-disable-next-line react-hooks/exhaustive-deps }, [user]); - // A user is Pro if the subscription endpoint reports premium/active OR the - // account itself is flagged paid/premium (premium granted outside Stripe has - // no subscription object, so /payments/subscription 404s). - const hasActiveSubscription = subscription?.status === 'active' || subscription?.status === 'will_cancel'; - // Billing reflects what the account pays for, not its entitlements: an - // admin or hand-granted premium account with no subscription shows Free. - const isPro = hasActiveSubscription || !!subscription?.is_premium || (user?.billing_plan ?? 'free') !== 'free'; - // Which plan, as the API names it: free, paid (Pro), plus or admin. - const plan: string = subscription?.plan ?? user?.billing_plan ?? (isPro ? 'paid' : 'free'); + // Which plan the account pays for, as the API names it: free, paid (Pro), + // plus or max. Everything below follows it, so a stale subscription status + // can never put an "Active" chip next to Free. + const plan: string = subscription?.plan ?? user?.billing_plan ?? 'free'; + const isPro = plan !== 'free'; const willCancel = subscription?.status === 'will_cancel'; // current_period_end is an ISO date-time string from the API. const periodEnd = subscription?.current_period_end @@ -450,7 +444,7 @@ export default function BillingSection() { plans={plans} description={ <> - Need more credits, more searches, or email support?{' '} + Want cloud models, more credits, or email support?{' '} )} - {/* Only on the plans that have somewhere to go. Shown before the - limit is hit as well as after — finding out at zero is too late - to be useful. The allowances themselves are on the billing page, - read from the API, so no number is kept here. */} - {(quota?.plan === 'free' || quota?.plan === 'paid' || quota?.plan === 'plus') && ( - - - {quota.plan === 'free' ? 'See plans' : quota.plan === 'paid' ? 'Upgrade to Plus' : 'Upgrade to Max'} - - - )} )}