The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Skip click/lead/sale commissions for non-active program enrollments (#4018)
Pedro Ladeira98c42a75e993
diff --git a/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts b/apps/web/app/(ee)/api/cron/aggregate-clicks/route.tsindex 3011afd8cb..1b872e635c 100644--- a/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts+++ b/apps/web/app/(ee)/api/cron/aggregate-clicks/route.ts@@ -5,6 +5,7 @@ import { qstash } from "@/lib/cron";import { verifyQstashSignature } from "@/lib/cron/verify-qstash";import { verifyVercelSignature } from "@/lib/cron/verify-vercel";import { getTopLinksByCountries } from "@/lib/tinybird/get-top-links-by-countries";+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";import { prisma } from "@dub/prisma";import { CommissionType, Prisma } from "@dub/prisma/client";import {@@ -63,6 +64,9 @@ async function handler(req: Request) {const linksWithClickRewards = await prisma.link.findMany({where: {programEnrollment: {+ status: {+ in: COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES,+ },clickRewardId: {not: null,},diff --git a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.tsindex c0b7fc40d4..d49f4b119c 100644--- a/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts+++ b/apps/web/app/(ee)/api/workflows/create-partner-commission/route.ts@@ -19,6 +19,7 @@ import {createPartnerCommissionSchema,} from "@/lib/zod/schemas/commissions";import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";import { prisma } from "@dub/prisma";import {Commission,@@ -180,6 +181,16 @@ async function stepCreateCommission(amount = 0;}+ if (+ ["click", "lead", "sale"].includes(event) &&+ !COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES.includes(programEnrollment.status)+ ) {+ return logAndReturn({+ commission: null,+ outputLog: `Partner ${partnerId} is not eligible for commissions (status: ${programEnrollment.status}) in program ${programId}, skipping ${event} commission creation...`,+ });+ }+let earnings = 0;let reward: RewardProps | null = null;let firstCommission: Pick<diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsxindex ffd9bfd6d9..c237c45da3 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx@@ -9,6 +9,7 @@ import {EnrolledPartnerExtendedProps,EnrolledPartnerProps,} from "@/lib/types";+import { COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES } from "@/lib/zod/schemas/partners";import { PageContent } from "@/ui/layout/page-content";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";import { useArchivePartnerModal } from "@/ui/modals/archive-partner-modal";@@ -176,7 +177,18 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {nested: true,});- useKeyboardShortcut("c", () => setCreateCommissionSheetOpen(true));+ const canCreateCommission = COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES.includes(+ partner.status,+ );+ const createCommissionDisabledTooltip = canCreateCommission+ ? undefined+ : `You can't create a commission for a partner that is ${partner.status}.`;++ useKeyboardShortcut("c", () => {+ if (canCreateCommission) {+ setCreateCommissionSheetOpen(true);+ }+ });const { createClawbackSheet, setIsOpen: setClawbackSheetOpen } =useCreateClawbackSheet({});@@ -272,6 +284,7 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {text="Create commission"shortcut="C"onClick={() => setCreateCommissionSheetOpen(true)}+ disabledTooltip={createCommissionDisabledTooltip}className="hidden h-8 w-fit px-3 sm:h-9 md:flex"/>@@ -337,6 +350,7 @@ function PageControls({ partner }: { partner: EnrolledPartnerProps }) {setCreateCommissionSheetOpen(true);setIsOpen(false);}}+ disabledTooltip={createCommissionDisabledTooltip}className="md:hidden">Create commissiondiff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.tsindex f310ef90cb..c86ea6c652 100644--- a/apps/web/lib/zod/schemas/partners.ts+++ b/apps/web/lib/zod/schemas/partners.ts@@ -46,6 +46,9 @@ export const INACTIVE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] = [ProgramEnrollmentStatus.rejected,];+export const COMMISSION_ELIGIBLE_ENROLLMENT_STATUSES: ProgramEnrollmentStatus[] =+ [...ACTIVE_ENROLLMENT_STATUSES, ProgramEnrollmentStatus.invited];+export const exportPartnerColumns = [{ id: "id", label: "ID", default: true },{ id: "name", label: "Name", default: true },