Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Payouts upgrade messaging (#4175)

Marcus Farrell1dfc9fe3733d
diff --git a/apps/web/app/(ee)/api/groups/route.ts b/apps/web/app/(ee)/api/groups/route.ts
index 90396ffd8e..faa7a3b2d3 100644
--- a/apps/web/app/(ee)/api/groups/route.ts
+++ b/apps/web/app/(ee)/api/groups/route.ts
@@ -93,6 +93,7 @@ export const POST = withWorkspace(
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.groupsLimit,
type: "groups",
}),
diff --git a/apps/web/app/api/analytics/dashboard/route.ts b/apps/web/app/api/analytics/dashboard/route.ts
index 1e7b9dadde..5205fca968 100644
--- a/apps/web/app/api/analytics/dashboard/route.ts
+++ b/apps/web/app/api/analytics/dashboard/route.ts
@@ -4,7 +4,6 @@ import { DubApiError, handleAndReturnErrorResponse } from "@/lib/api/errors";
import { assertValidDateRangeForPlan } from "@/lib/api/utils/assert-valid-date-range-for-plan";
import { exceededLimitError } from "@/lib/exceeded-limit-error";
import { prisma } from "@/lib/prisma";
-import { PlanProps } from "@/lib/types";
import { redis } from "@/lib/upstash";
import { parseAnalyticsQuery } from "@/lib/zod/schemas/analytics";
import { DUB_DEMO_LINKS, DUB_WORKSPACE_ID, getSearchParams } from "@dub/utils";
@@ -140,7 +139,8 @@ export const GET = async (req: Request) => {
throw new DubApiError({
code: "forbidden",
message: exceededLimitError({
- plan: workspace.plan as PlanProps,
+ plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.usageLimit,
type: "clicks",
}),
diff --git a/apps/web/app/api/domains/route.ts b/apps/web/app/api/domains/route.ts
index da704e4c82..c6faf086ee 100644
--- a/apps/web/app/api/domains/route.ts
+++ b/apps/web/app/api/domains/route.ts
@@ -177,6 +177,7 @@ export const POST = withWorkspace(
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.domainsLimit,
type: "domains",
}),
diff --git a/apps/web/app/api/folders/route.ts b/apps/web/app/api/folders/route.ts
index d8a580df64..7466711caf 100644
--- a/apps/web/app/api/folders/route.ts
+++ b/apps/web/app/api/folders/route.ts
@@ -68,6 +68,7 @@ export const POST = withWorkspace(
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: foldersLimit,
type: "folders",
}),
diff --git a/apps/web/app/api/links/bulk/route.ts b/apps/web/app/api/links/bulk/route.ts
index 1c32b1533d..424d09c074 100644
--- a/apps/web/app/api/links/bulk/route.ts
+++ b/apps/web/app/api/links/bulk/route.ts
@@ -52,6 +52,7 @@ export const POST = withWorkspace(
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.linksLimit,
type: "links",
}),
diff --git a/apps/web/app/api/links/sync/route.ts b/apps/web/app/api/links/sync/route.ts
index e8e28fd11c..8232d15bc5 100644
--- a/apps/web/app/api/links/sync/route.ts
+++ b/apps/web/app/api/links/sync/route.ts
@@ -41,6 +41,7 @@ export const POST = withWorkspace(
return new Response(
exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.linksLimit,
type: "links",
}),
diff --git a/apps/web/app/api/tags/route.ts b/apps/web/app/api/tags/route.ts
index 244698c34d..37bbad565d 100644
--- a/apps/web/app/api/tags/route.ts
+++ b/apps/web/app/api/tags/route.ts
@@ -107,6 +107,7 @@ export const POST = withWorkspace(
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.tagsLimit,
type: "tags",
}),
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
index cc430e2f23..1f835c1f8f 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
@@ -60,6 +60,7 @@ export const POST = withSession(async ({ session, params }) => {
id: true,
slug: true,
plan: true,
+ planPeriod: true,
usersLimit: true,
_count: {
select: {
@@ -93,6 +94,7 @@ export const POST = withSession(async ({ session, params }) => {
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan as PlanProps,
+ planPeriod: workspace.planPeriod,
limit: workspace.usersLimit,
type: "users",
}),
@@ -134,6 +136,7 @@ export const POST = withSession(async ({ session, params }) => {
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan as PlanProps,
+ planPeriod: workspace.planPeriod,
limit: workspace.usersLimit,
type: "users",
}),
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts
index 40bb47bb2c..d5407d1737 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/route.ts
@@ -132,6 +132,7 @@ export const POST = withWorkspace(
code: "exceeded_limit",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.usersLimit,
type: "users",
}),
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
index 5ece478241..6743ad190b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
@@ -53,7 +53,7 @@ export default function WorkspaceMembersPage() {
const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();
- const { role, plan, usersLimit } = useWorkspace();
+ const { role, plan, planPeriod, usersLimit } = useWorkspace();
const { data: session } = useSession();
const { id: workspaceId } = useWorkspace();
const { users: workspaceUsers } = useWorkspaceUsers();
@@ -106,7 +106,12 @@ export default function WorkspaceMembersPage() {
const inviteUserLimitError =
isAtUserLimit && plan
- ? exceededLimitError({ plan, limit: usersLimit, type: "users" })
+ ? exceededLimitError({
+ plan,
+ planPeriod,
+ limit: usersLimit,
+ type: "users",
+ })
: undefined;
const availableRolesForPlan = useMemo(() => {
diff --git a/apps/web/lib/actions/partners/confirm-payouts.ts b/apps/web/lib/actions/partners/confirm-payouts.ts
index e175909a8f..06967804f3 100644
--- a/apps/web/lib/actions/partners/confirm-payouts.ts
+++ b/apps/web/lib/actions/partners/confirm-payouts.ts
@@ -90,6 +90,7 @@ export const confirmPayoutsAction = authActionClient
throw new Error(
exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.payoutsLimit,
type: "payouts",
}),
diff --git a/apps/web/lib/ai/generate-partner-network-invite-email.ts b/apps/web/lib/ai/generate-partner-network-invite-email.ts
index 1bbfd17eed..b04440c19b 100644
--- a/apps/web/lib/ai/generate-partner-network-invite-email.ts
+++ b/apps/web/lib/ai/generate-partner-network-invite-email.ts
@@ -10,6 +10,7 @@ import { prisma } from "@/lib/prisma";
import { PlanProps } from "@/lib/types";
import { emailSchema } from "@/lib/zod/schemas/auth";
import { anthropic } from "@ai-sdk/anthropic";
+import { PlanPeriod } from "@prisma/client";
import { generateText, Output } from "ai";
import * as z from "zod/v4";
import { authActionClient } from "../actions/safe-action";
@@ -89,6 +90,7 @@ export const generatePartnerNetworkInviteEmailAction = authActionClient
workspaceId: workspace.id,
aiLimit: workspace.aiLimit,
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
});
try {
@@ -229,10 +231,12 @@ async function reserveAIUsageCredit({
workspaceId,
aiLimit,
plan,
+ planPeriod,
}: {
workspaceId: string;
aiLimit: number;
plan: PlanProps;
+ planPeriod: PlanPeriod | null;
}) {
const { count } = await prisma.project.updateMany({
where: {
@@ -253,6 +257,7 @@ async function reserveAIUsageCredit({
code: "forbidden",
message: exceededLimitError({
plan,
+ planPeriod,
limit: aiLimit,
type: "AI",
}),
diff --git a/apps/web/lib/api/links/usage-checks.ts b/apps/web/lib/api/links/usage-checks.ts
index 6bcb3c22e8..1f95ec0017 100644
--- a/apps/web/lib/api/links/usage-checks.ts
+++ b/apps/web/lib/api/links/usage-checks.ts
@@ -9,6 +9,7 @@ export const throwIfClicksUsageExceeded = (workspace: WorkspaceWithUsers) => {
code: "forbidden",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.usageLimit,
type: "clicks",
}),
@@ -26,6 +27,7 @@ export const throwIfLinksUsageExceeded = (workspace: WorkspaceWithUsers) => {
code: "forbidden",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.linksLimit,
type: "links",
}),
@@ -39,6 +41,7 @@ export const throwIfAIUsageExceeded = (workspace: WorkspaceWithUsers) => {
code: "forbidden",
message: exceededLimitError({
plan: workspace.plan,
+ planPeriod: workspace.planPeriod,
limit: workspace.aiLimit,
type: "AI",
}),
diff --git a/apps/web/lib/exceeded-limit-error.ts b/apps/web/lib/exceeded-limit-error.ts
index 8f0687f1a1..db60463768 100644
--- a/apps/web/lib/exceeded-limit-error.ts
+++ b/apps/web/lib/exceeded-limit-error.ts
@@ -1,29 +1,41 @@
import { capitalize, currencyFormatter } from "@dub/utils";
+import { PlanPeriod } from "@prisma/client";
import { PlanProps } from "./types";
export const exceededLimitError = ({
plan,
+ planPeriod,
limit,
type,
}: {
plan: PlanProps;
+ planPeriod?: PlanPeriod | null;
limit: number;
type:
| "clicks"
+ | "payouts"
| "links"
- | "AI"
| "domains"
| "tags"
- | "users"
| "folders"
- | "payouts"
- | "groups";
+ | "groups"
+ | "users"
+ | "AI";
}) => {
- return `You've reached your ${
- ["links", "AI", "payouts"].includes(type) ? "monthly" : ""
- } limit of ${
+ const periodSpecificResources = ["clicks", "links", "payouts", "AI"];
+
+ // planPeriod is null for workspaces without a billing period (e.g. free plans),
+ // whose limits reset monthly
+ const period = planPeriod ?? "monthly";
+
+ const upgradeMessage =
+ periodSpecificResources.includes(type) && period === "monthly"
+ ? "Go yearly for 12x usage upfront, or upgrade for higher limits."
+ : "Please upgrade for higher limits.";
+
+ return `You've reached your${periodSpecificResources.includes(type) ? ` ${period}` : ""} limit of ${
type === "payouts"
? currencyFormatter(limit)
: `${limit} ${limit === 1 ? type.slice(0, -1) : type}`
- } on the ${capitalize(plan)} plan. Please upgrade for higher limits.`;
+ } on the ${capitalize(plan)} plan. ${upgradeMessage}`;
};
diff --git a/apps/web/ui/partners/confirm-payouts-sheet.tsx b/apps/web/ui/partners/confirm-payouts-sheet.tsx
index 9596fab1e2..274c053cfe 100644
--- a/apps/web/ui/partners/confirm-payouts-sheet.tsx
+++ b/apps/web/ui/partners/confirm-payouts-sheet.tsx
@@ -23,7 +23,7 @@ import useCommissionsCount from "@/lib/swr/use-commissions-count";
import usePaymentMethods from "@/lib/swr/use-payment-methods";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
-import { PayoutResponse, PlanProps } from "@/lib/types";
+import { PayoutResponse } from "@/lib/types";
import { X } from "@/ui/shared/icons";
import {
Button,
@@ -84,6 +84,7 @@ function ConfirmPayoutsSheetContent() {
id: workspaceId,
slug,
plan,
+ planPeriod,
role,
defaultProgramId,
payoutsUsage,
@@ -916,18 +917,20 @@ function ConfirmPayoutsSheetContent() {
amount === 0
}
disabledTooltip={
- payoutsUsage &&
- payoutsLimit &&
- amount &&
+ plan &&
+ typeof payoutsUsage === "number" &&
+ typeof payoutsLimit === "number" &&
+ typeof amount === "number" &&
payoutsUsage + amount > payoutsLimit ? (
<TooltipContent
title={exceededLimitError({
- plan: plan as PlanProps,
+ plan,
+ planPeriod,
limit: payoutsLimit,
type: "payouts",
})}
cta="Upgrade"
- href={`/${slug}/settings/billing/upgrade`}
+ href={`/${slug}/settings/billing/upgrade?planPeriod=yearly`}
/>
) : amount && amount < INVOICE_MIN_PAYOUT_AMOUNT_CENTS ? (
"Your payout total is less than the minimum invoice amount of $10."