The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
update isLegacyBusinessPlan logic
Steven Teyea376f92fad3
diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.tsindex 0818899884..d953e78bdb 100644--- a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts@@ -45,7 +45,7 @@ export async function updateWorkspacePlan({| "trialEndsAt"| "billingCycleEndsAt"| "subscriptionCanceledAt"- | "payoutsLimit"+ | "partnersLimit"> & {plan: string;restrictedTokens: {@@ -81,7 +81,7 @@ export async function updateWorkspacePlan({// - workspace changes their plan period / tier// - trialEndsAt changes (i.e. free trial -> paid subscription)// - cancellationFields changes (billingCycleEndsAt or subscriptionCanceledAt)- // - the payouts limit increases and the updated price ID is a new business price ID+ // - the partners limit increases and the updated price ID is a new business price IDif (workspace.plan !== newPlanName ||workspace.planPeriod !== planPeriod ||@@ -90,7 +90,7 @@ export async function updateWorkspacePlan({workspace.billingCycleEndsAt !== cancellationFields.billingCycleEndsAt ||workspace.subscriptionCanceledAt !==cancellationFields.subscriptionCanceledAt ||- (workspace.payoutsLimit < newPlan.limits.payouts &&+ (workspace.partnersLimit < newPlan.limits.partners &&NEW_BUSINESS_PRICE_IDS.includes(priceId))) {const [updatedWorkspace] = await Promise.allSettled([diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsxindex 8cb927031d..49f6a548fc 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/auth.tsx@@ -10,7 +10,7 @@ import { ReactNode } from "react";import { PartnersUpgradeCTA } from "./partners-upgrade-cta";export default function ProgramAuth({ children }: { children: ReactNode }) {- const { plan, defaultProgramId, payoutsLimit, loading } = useWorkspace();+ const { plan, defaultProgramId, partnersLimit, loading } = useWorkspace();const { loading: programLoading } = useProgram();if (loading || (defaultProgramId && programLoading)) {@@ -20,7 +20,7 @@ export default function ProgramAuth({ children }: { children: ReactNode }) {if (!defaultProgramId ||!getPlanCapabilities(plan).canManageProgram ||- isLegacyBusinessPlan({ plan, payoutsLimit })+ isLegacyBusinessPlan({ plan, partnersLimit })) {return (<PageContent>diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners-upgrade-cta.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners-upgrade-cta.tsxindex b3913451b1..5423eca044 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners-upgrade-cta.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners-upgrade-cta.tsx@@ -14,12 +14,12 @@ export function PartnersUpgradeCTA({title?: string;description?: string;}) {- const { slug, plan, store, payoutsLimit } = useWorkspace();+ const { slug, plan, store, partnersLimit } = useWorkspace();const { canManageProgram } = getPlanCapabilities(plan);const { cta, href } = useMemo(() => {- if (!canManageProgram || isLegacyBusinessPlan({ plan, payoutsLimit })) {+ if (!canManageProgram || isLegacyBusinessPlan({ plan, partnersLimit })) {return {cta: "Upgrade plan",href: `/${slug}/upgrade?plan=business`,@@ -30,7 +30,7 @@ export function PartnersUpgradeCTA({href: `/${slug}/program/new`,};}- }, [canManageProgram, slug, payoutsLimit]);+ }, [canManageProgram, slug, partnersLimit]);return (<div className="flex min-h-[calc(100vh-60px)] flex-col items-center justify-center gap-6 overflow-hidden px-4 py-10">diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsxindex c8b412b48a..d1eb05054f 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx@@ -268,7 +268,7 @@ export default function PlanUsage() {<div className="flex flex-col items-start justify-between gap-y-4 p-6 md:px-8 lg:flex-row"><div><h2 className="text-xl font-medium">- {plan && isLegacyBusinessPlan({ plan, payoutsLimit })+ {plan && isLegacyBusinessPlan({ plan, partnersLimit })? "Business (Legacy)": capitalize(plan)}{" "}Plandiff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsxindex 4a079f673d..73e978a919 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/upgrade/page.tsx@@ -58,7 +58,7 @@ export default function WorkspaceBillingUpgradePage() {planTier: currentPlanTier = 1,planPeriod: currentPlanPeriod,stripeId,- payoutsLimit,+ partnersLimit,trialEndsAt,} = useWorkspace();@@ -168,7 +168,7 @@ export default function WorkspaceBillingUpgradePage() {planTier === currentPlanTier &&!isLegacyBusinessPlan({plan: currentPlan,- payoutsLimit,+ partnersLimit,}),);const isCurrentPlanAndPeriod =diff --git a/apps/web/lib/actions/partners/create-program.ts b/apps/web/lib/actions/partners/create-program.tsindex 1d9cd89214..79cf802b4f 100644--- a/apps/web/lib/actions/partners/create-program.ts+++ b/apps/web/lib/actions/partners/create-program.ts@@ -36,7 +36,7 @@ export const createProgram = async ({| "logo"| "name"| "plan"- | "payoutsLimit"+ | "partnersLimit"| "trialEndsAt"| "store"| "webhookEnabled"@@ -53,7 +53,7 @@ export const createProgram = async ({!canManageProgram ||isLegacyBusinessPlan({plan: workspace.plan,- payoutsLimit: workspace.payoutsLimit,+ partnersLimit: workspace.partnersLimit,})) {throw new Error(diff --git a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx b/apps/web/ui/layout/sidebar/workspace-dropdown.tsxindex 081e5ea842..fa696d8b11 100644--- a/apps/web/ui/layout/sidebar/workspace-dropdown.tsx+++ b/apps/web/ui/layout/sidebar/workspace-dropdown.tsx@@ -44,7 +44,7 @@ export function WorkspaceDropdown() {...selectedWorkspace,plan: isLegacyBusinessPlan({plan: selectedWorkspace.plan,- payoutsLimit: selectedWorkspace.payoutsLimit,+ partnersLimit: selectedWorkspace.partnersLimit,})? "business (legacy)": selectedWorkspace.plan,diff --git a/packages/utils/package.json b/packages/utils/package.jsonindex a8ec2ce7d4..8966c7f77b 100644--- a/packages/utils/package.json+++ b/packages/utils/package.json@@ -1,7 +1,7 @@{"name": "@dub/utils","description": "Utility functions and constants for Dub",- "version": "0.1.55",+ "version": "0.1.56","sideEffects": false,"main": "./dist/index.mjs","module": "./dist/index.mjs",diff --git a/packages/utils/src/constants/pricing/pricing-plans.tsx b/packages/utils/src/constants/pricing/pricing-plans.tsxindex 5213f9c431..defc264154 100644--- a/packages/utils/src/constants/pricing/pricing-plans.tsx+++ b/packages/utils/src/constants/pricing/pricing-plans.tsx@@ -651,8 +651,8 @@ export const getSuggestedPlan = ({export const isLegacyBusinessPlan = ({plan = "business",- payoutsLimit = 0,+ partnersLimit = 0,}: {plan?: string;- payoutsLimit?: number;-}) => plan === "business" && payoutsLimit === 0;+ partnersLimit?: number;+}) => plan === "business" && partnersLimit === 0;