The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Improve update commissions API & UIs (#3666)
Kiran K88212ea2d861
diff --git a/apps/web/app/(ee)/api/commissions/[commissionId]/route.ts b/apps/web/app/(ee)/api/commissions/[commissionId]/route.tsindex 15c69f4875..4d6b21f4ea 100644--- a/apps/web/app/(ee)/api/commissions/[commissionId]/route.ts+++ b/apps/web/app/(ee)/api/commissions/[commissionId]/route.ts@@ -1,21 +1,15 @@-import { convertCurrency } from "@/lib/analytics/convert-currency";-import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";+import { updatePartnerCommission } from "@/lib/api/commissions/update-partner-commission";import { transformCustomerForCommission } from "@/lib/api/customers/transform-customer";import { DubApiError } from "@/lib/api/errors";-import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";-import { getProgramEnrollmentOrThrow } from "@/lib/api/programs/get-program-enrollment-or-throw";-import { calculateSaleEarnings } from "@/lib/api/sales/calculate-sale-earnings";import { parseRequestBody } from "@/lib/api/utils";import { withWorkspace } from "@/lib/auth";-import { determinePartnerReward } from "@/lib/partners/determine-partner-reward";import {CommissionDetailSchema,CommissionEnrichedSchema,- updateCommissionSchema,+ updateCommissionSchemaExtended,} from "@/lib/zod/schemas/commissions";import { prisma } from "@dub/prisma";-import { waitUntil } from "@vercel/functions";import { NextResponse } from "next/server";// GET /api/commissions/:commissionId - get a single commission by ID@@ -103,176 +97,31 @@ export const PATCH = withWorkspace(const { commissionId } = params;- const commission = await prisma.commission.findUnique({- where: {- id: commissionId,- programId,- },- include: {- partner: true,- },- });-- if (!commission) {- throw new DubApiError({- code: "not_found",- message: `Commission ${commissionId} not found.`,- });- }-- if (commission.status === "paid") {- throw new DubApiError({- code: "bad_request",- message: `Cannot update commission: Commission ${commissionId} has already been paid.`,- });- }-- const { partner, amount: originalAmount } = commission;-- let { amount, modifyAmount, currency, status } =- updateCommissionSchema.parse(await parseRequestBody(req));-- let finalAmount: number | undefined;- let finalEarnings: number | undefined;-- if (amount || modifyAmount) {- if (commission.type !== "sale") {- throw new DubApiError({- code: "bad_request",- message: `Cannot update amount: Commission ${commissionId} is not a sale commission.`,- });- }-- // if currency is not USD, convert it to USD based on the current FX rate- // TODO: allow custom "defaultCurrency" on workspace table in the future- if (currency !== "usd") {- const valueToConvert = modifyAmount || amount;- if (valueToConvert) {- const { currency: convertedCurrency, amount: convertedAmount } =- await convertCurrency({ currency, amount: valueToConvert });-- if (modifyAmount) {- modifyAmount = convertedAmount;- } else {- amount = convertedAmount;- }- currency = convertedCurrency;- }- }-- finalAmount = Math.max(- modifyAmount ? originalAmount + modifyAmount : amount ?? originalAmount,- 0, // Ensure the amount is not negative- );-- const programEnrollment = await getProgramEnrollmentOrThrow({- partnerId: partner.id,- programId,- include: {- partner: true,- links: true,- saleReward: true,- },- });-- const reward = determinePartnerReward({- event: "sale",- programEnrollment,- });-- if (!reward) {- throw new DubApiError({- code: "not_found",- message: `No reward found for partner ${partner.id} in program ${programId}.`,- });- }-- // Recalculate the earnings based on the new amount- finalEarnings = calculateSaleEarnings({- reward,- sale: {- amount: finalAmount,- quantity: commission.quantity,- },- });- }-- const isRefunded = finalAmount === 0 || finalEarnings === 0;-- const updatedCommission = await prisma.commission.update({- where: {- id: commission.id,- },- data: {- // if the sale/commission is fully refunded, we don't need to update the amount or earnings- // we just update status to refunded and exclude it from the payout- // same goes for updating status to refunded, duplicate, canceled, or fraudulent- amount: isRefunded ? undefined : finalAmount,- earnings: isRefunded ? undefined : finalEarnings,- status: status ?? (isRefunded ? "refunded" : undefined),- ...(status || isRefunded ? { payoutId: null } : {}),- },- include: {- customer: true,- partner: true,- },+ const {+ saleAmount,+ modifySaleAmount,+ earnings,+ currency,+ status,+ updateHistoricalCommissions,+ // Deprecated fields+ amount,+ modifyAmount,+ } = updateCommissionSchemaExtended.parse(await parseRequestBody(req));++ const updatedCommission = await updatePartnerCommission({+ workspaceId: workspace.id,+ programId,+ commissionId,+ userId: session.user.id,+ saleAmount: saleAmount ?? amount,+ modifySaleAmount: modifySaleAmount ?? modifyAmount,+ currency,+ status,+ earnings,+ updateHistoricalCommissions,});- // If the commission has already been added to a payout, we need to update the payout amount- if (commission.status === "processed" && commission.payoutId) {- waitUntil(- prisma.$transaction(async (tx) => {- const commissionAggregate = await tx.commission.aggregate({- where: {- payoutId: commission.payoutId,- },- _sum: {- earnings: true,- },- });-- const newPayoutAmount = commissionAggregate._sum.earnings ?? 0;-- if (newPayoutAmount === 0) {- console.log(`Deleting payout ${commission.payoutId}`);- await tx.payout.delete({ where: { id: commission.payoutId! } });- } else {- console.log(- `Updating payout ${commission.payoutId} to ${newPayoutAmount}`,- );- await tx.payout.update({- where: { id: commission.payoutId! },- data: { amount: newPayoutAmount },- });- }- }),- );- }-- waitUntil(- Promise.allSettled([- syncTotalCommissions({- partnerId: commission.partnerId,- programId: commission.programId,- }),-- recordAuditLog({- workspaceId: workspace.id,- programId,- action: "commission.updated",- description: `Commission ${commissionId} updated`,- actor: session.user,- targets: [- {- type: "commission",- id: commission.id,- metadata: updatedCommission,- },- ],- }),- ]),- );-return NextResponse.json(CommissionEnrichedSchema.parse({...updatedCommission,diff --git a/apps/web/app/(ee)/api/commissions/bulk/route.ts b/apps/web/app/(ee)/api/commissions/bulk/route.tsnew file mode 100644index 0000000000..f8c68e3c1e--- /dev/null+++ b/apps/web/app/(ee)/api/commissions/bulk/route.ts@@ -0,0 +1,35 @@+import { bulkUpdatePartnerCommissions } from "@/lib/api/commissions/bulk-update-partner-commissions";+import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";+import { parseRequestBody } from "@/lib/api/utils";+import { withWorkspace } from "@/lib/auth";+import { bulkUpdateCommissionsSchema } from "@/lib/zod/schemas/commissions";+import { NextResponse } from "next/server";++// PATCH /api/commissions/bulk — bulk update commission status+export const PATCH = withWorkspace(+ async ({ workspace, req, session }) => {+ const programId = getDefaultProgramIdOrThrow(workspace);++ const { commissionIds, status } = bulkUpdateCommissionsSchema.parse(+ await parseRequestBody(req),+ );++ const updatedCommissions = await bulkUpdatePartnerCommissions({+ workspaceId: workspace.id,+ programId,+ commissionIds,+ status,+ userId: session.user.id,+ });++ return NextResponse.json(+ updatedCommissions.map((c) => ({+ id: c.id,+ status: c.status,+ })),+ );+ },+ {+ requiredRoles: ["owner", "member"],+ },+);diff --git a/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts b/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.tsindex 485d9bc74e..e44df5ac36 100644--- a/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts+++ b/apps/web/app/(ee)/api/cron/partners/ban/cancel-commissions.ts@@ -1,10 +1,13 @@+import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";import { prisma } from "@dub/prisma";// Mark the commissions as canceledexport async function cancelCommissions({+ workspaceId,programId,partnerId,}: {+ workspaceId: string;programId: string;partnerId: string;}) {@@ -34,6 +37,9 @@ export async function cancelCommissions({},select: {id: true,+ amount: true,+ earnings: true,+ status: true,},orderBy: {id: "asc",@@ -56,6 +62,13 @@ export async function cancelCommissions({},});+ await trackCommissionStatusUpdate({+ workspaceId,+ programId,+ commissions,+ newStatus: "canceled",+ });+canceledCommissions += count;} catch (error) {failedBatches++;diff --git a/apps/web/app/(ee)/api/cron/partners/ban/route.ts b/apps/web/app/(ee)/api/cron/partners/ban/route.tsindex 09f58b2122..5f6b1ed4cd 100644--- a/apps/web/app/(ee)/api/cron/partners/ban/route.ts+++ b/apps/web/app/(ee)/api/cron/partners/ban/route.ts@@ -25,7 +25,7 @@ export const POST = withCron(async ({ rawBody }) => {console.info(`Banning partner ${partnerId} from program ${programId}...`);- const { partner, links, ...programEnrollment } =+ const { partner, links, program, ...programEnrollment } =await getProgramEnrollmentOrThrow({partnerId,programId,@@ -37,6 +37,11 @@ export const POST = withCron(async ({ rawBody }) => {discountCode: true,},},+ program: {+ select: {+ workspaceId: true,+ },+ },},});@@ -109,6 +114,7 @@ export const POST = withCron(async ({ rawBody }) => {// Mark the commissions as canceledawait cancelCommissions({+ workspaceId: program.workspaceId,programId,partnerId,});diff --git a/apps/web/app/(ee)/api/cron/payouts/aggregate-due-commissions/route.ts b/apps/web/app/(ee)/api/cron/payouts/aggregate-due-commissions/route.tsindex 00cf613bd6..7386733071 100644--- a/apps/web/app/(ee)/api/cron/payouts/aggregate-due-commissions/route.ts+++ b/apps/web/app/(ee)/api/cron/payouts/aggregate-due-commissions/route.ts@@ -1,3 +1,4 @@+import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";import { createId } from "@/lib/api/create-id";import { handleAndReturnErrorResponse } from "@/lib/api/errors";import { qstash } from "@/lib/cron";@@ -62,6 +63,7 @@ async function handler(req: Request) {select: {id: true,name: true,+ workspaceId: true,},},},@@ -103,7 +105,9 @@ async function handler(req: Request) {select: {id: true,createdAt: true,+ amount: true,earnings: true,+ status: true,partnerId: true,programId: true,},@@ -219,6 +223,19 @@ async function handler(req: Request) {},});+ const workspaceId = partnerGroups.find(+ (p) => p.program.id === programId,+ )?.program.workspaceId;++ if (workspaceId) {+ await trackCommissionStatusUpdate({+ workspaceId,+ programId,+ commissions,+ newStatus: "processed",+ });+ }+// if we're reusing a pending payout, we need to update the amount and periodEndif (existingPendingPayouts.find((p) => p.id === payoutToUse.id)) {await prisma.payout.update({diff --git a/apps/web/app/(ee)/api/paypal/webhook/payouts-item-succeeded.ts b/apps/web/app/(ee)/api/paypal/webhook/payouts-item-succeeded.tsindex a00e0ddbb6..059c794a82 100644--- a/apps/web/app/(ee)/api/paypal/webhook/payouts-item-succeeded.ts+++ b/apps/web/app/(ee)/api/paypal/webhook/payouts-item-succeeded.ts@@ -1,3 +1,4 @@+import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";import { prisma } from "@dub/prisma";import { payoutsItemSchema } from "./utils";@@ -37,6 +38,18 @@ export async function payoutsItemSucceeded(event: any) {return;}+ const commissions = await prisma.commission.findMany({+ where: {+ payoutId: payout.id,+ },+ select: {+ id: true,+ amount: true,+ earnings: true,+ status: true,+ },+ });+await Promise.all([prisma.payout.update({where: {@@ -58,4 +71,11 @@ export async function payoutsItemSucceeded(event: any) {},}),]);++ await trackCommissionStatusUpdate({+ workspaceId: payout.program.workspaceId,+ programId: payout.program.id,+ commissions,+ newStatus: "paid",+ });}diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/charge-refunded.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/charge-refunded.tsindex 44c6ed67b0..fa1a0dcbb9 100644--- a/apps/web/app/(ee)/api/stripe/integration/webhook/charge-refunded.ts+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/charge-refunded.ts@@ -1,3 +1,4 @@+import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";import { stripeAppClient } from "@/lib/stripe";import { StripeMode } from "@/lib/types";@@ -60,9 +61,10 @@ export async function chargeRefunded(event: Stripe.Event, mode: StripeMode) {},select: {id: true,+ amount: true,+ earnings: true,status: true,payoutId: true,- earnings: true,partnerId: true,programId: true,},@@ -113,5 +115,12 @@ export async function chargeRefunded(event: Stripe.Event, mode: StripeMode) {programId: commission.programId,});+ await trackCommissionStatusUpdate({+ workspaceId: workspace.id,+ programId: commission.programId,+ commissions: [commission],+ newStatus: "refunded",+ });+return `Commission ${commission.id} updated to status "refunded"`;}diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsxindex 6a75972bb8..79284e5b6f 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/[commissionId]/page-client.tsx@@ -4,26 +4,27 @@ import { useCommission } from "@/lib/swr/use-commission";import useGroups from "@/lib/swr/use-groups";import useWorkspace from "@/lib/swr/use-workspace";import { CommissionDetail, CommissionResponse } from "@/lib/types";+import { CommissionActivity } from "@/ui/activity-logs/commission-activity";import { CustomerAvatar } from "@/ui/customers/customer-avatar";import { PageContent } from "@/ui/layout/page-content";import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";-import { ActivityEvent } from "@/ui/partners/activity-event";import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";+import { useEditCommissionModal } from "@/ui/partners/edit-commission-modal";import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";import { PartnerAvatar } from "@/ui/partners/partner-avatar";-import { CommentCardDisplay } from "@/ui/partners/partner-comments";import { ConditionalLink } from "@/ui/shared/conditional-link";-import { UserAvatar } from "@/ui/users/user-avatar";import {+ Button,ChevronRight,InvoiceDollar,StatusBadge,Table,useTable,} from "@dub/ui";+import { Pen2 } from "@dub/ui/icons";import {cn,currencyFormatter,@@ -32,7 +33,6 @@ import {pluralize,} from "@dub/utils";import { Row } from "@tanstack/react-table";-import { addDays } from "date-fns";import Link from "next/link";import { redirect } from "next/navigation";@@ -105,6 +105,9 @@ function CommissionDetailsContent({const { groups } = useGroups();const group = groups?.find((g) => g.id === commission.partner.groupId);+ const { openEditCommissionModal, EditCommissionModal } =+ useEditCommissionModal();+const statusBadge = CommissionStatusBadges[commission.status];const itemsTable = useTable<CommissionDetail>({@@ -269,6 +272,7 @@ function CommissionDetailsContent({return (<div className="flex flex-col gap-6 lg:flex-row">+ <EditCommissionModal /><div className="order-last min-w-0 flex-1 lg:order-first"><Table {...itemsTable} />@@ -277,9 +281,20 @@ function CommissionDetailsContent({<div className="order-first w-full shrink-0 lg:order-last lg:w-[360px]"><div className="rounded-xl border border-neutral-200 bg-white p-4">- <h3 className="text-content-emphasis mb-2 text-base font-semibold">- Commission details- </h3>+ <div className="mb-2 flex items-center justify-between">+ <h3 className="text-content-emphasis text-base font-semibold">+ Commission details+ </h3>+ {commission.status !== "paid" && (+ <Button+ variant="secondary"+ icon={<Pen2 className="size-3.5" />}+ text="Edit"+ className="h-7 w-fit rounded-lg px-2"+ onClick={() => openEditCommissionModal(commission)}+ />+ )}+ </div><div className="flex flex-col gap-1">{Object.entries(detailRows).map(([key, value]) => (<div@@ -301,194 +316,6 @@ function CommissionDetailsContent({);}-function CommissionActivity({- commission,- slug,-}: {- commission: CommissionDetail;- slug: string;-}) {- return (- <div className="mt-6">- <h3 className="mb-4 text-base font-medium text-neutral-900">Activity</h3>- <div className="flex flex-col">- {[- // Paid event- ...(commission.status === "paid" && commission.payout?.id- ? [- {- icon: CommissionStatusBadges["paid"].icon,- timestamp: commission.payout?.paidAt ?? null,- children: (- <>- <span className="text-sm text-neutral-700">- Commission- </span>- <StatusBadge- icon={null}- variant={CommissionStatusBadges["paid"].variant}- >- {CommissionStatusBadges["paid"].label}- </StatusBadge>- {commission.payout.user && (- <>- <span className="text-sm text-neutral-500">by</span>- <div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">- <UserAvatar- user={commission.payout.user}- className="size-4"- />- <span className="text-[13px] text-neutral-700">- {commission.payout.user.name}- </span>- </div>- </>- )}- <Link- href={`/${slug}/program/payouts/${commission.payout.id}`}- className="flex h-6 cursor-pointer items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1 transition-colors hover:bg-neutral-200"- >- <InvoiceDollar className="size-4 shrink-0 text-neutral-500" />- <span className="font-mono text-[13px] text-neutral-700">- {commission.payout.id}- </span>- </Link>- </>- ),- },- ]- : []),-- // Processed event- ...(["paid", "processed"].includes(commission.status)- ? [- {- icon: CommissionStatusBadges["processed"].icon,- timestamp: addDays(- commission.createdAt,- commission.holdingPeriodDays ?? 0,- ),- children: (- <>- <span className="text-sm text-neutral-700">- Commission- </span>- <StatusBadge- icon={null}- variant={CommissionStatusBadges["processed"].variant}- >- {CommissionStatusBadges["processed"].label}- </StatusBadge>- {commission.holdingPeriodDays ? (- <span className="text-sm text-neutral-700">- after {commission.holdingPeriodDays}-day{" "}- <a- href="https://dub.co/help/article/partner-payouts#payout-holding-period"- target="_blank"- rel="noopener noreferrer"- className="cursor-help underline decoration-dotted underline-offset-2"- >- holding period- </a>- </span>- ) : null}- </>- ),- },- ]- : []),-- ...(["canceled", "duplicate", "fraud", "refunded"].includes(- commission.status,- )- ? [- {- icon: CommissionStatusBadges[commission.status].icon,- timestamp: commission.updatedAt,- children: (- <>- <span className="text-sm text-neutral-700">- Commission marked as- </span>- <StatusBadge- icon={null}- variant={- CommissionStatusBadges[commission.status].variant- }- >- {CommissionStatusBadges[commission.status].label}- </StatusBadge>- </>- ),- },- ]- : []),-- // Pending / created event- {- icon: CommissionStatusBadges["pending"].icon,- timestamp: commission.createdAt,- note: (() => {- const text = commission.reward- ? `Earn ${- commission.reward.type === "percentage"- ? `${commission.reward.amountInPercentage ?? 0}%`- : currencyFormatter(- commission.reward.amountInCents ?? 0,- { trailingZeroDisplay: "stripIfInteger" },- )- } per ${commission.reward.event}`- : commission.description ?? null;-- if (!text) return undefined;-- return (- <CommentCardDisplay- user={commission.user}- timestamp={commission.createdAt}- text={text}- />- );- })(),- children: (- <>- <span className="text-sm text-neutral-700">Commission</span>- <StatusBadge- icon={null}- variant={CommissionStatusBadges["pending"].variant}- >- {CommissionStatusBadges["pending"].label}- </StatusBadge>- {commission.user ? (- <>- <span className="text-sm text-neutral-500">by</span>- <div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">- <UserAvatar user={commission.user} className="size-4" />- <span className="text-[13px] text-neutral-700">- {commission.user.name}- </span>- </div>- </>- ) : null}- </>- ),- },- ].map((event, index, arr) => (- <ActivityEvent- key={index}- icon={event.icon}- timestamp={event.timestamp}- note={event.note}- isLast={index === arr.length - 1}- >- {event.children}- </ActivityEvent>- ))}- </div>- </div>- );-}-function CommissionDetailSkeleton() {return (<div className="flex flex-col gap-6 lg:flex-row">diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsxindex 7f6015e1ff..90b2a91b6f 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/commissions-table.tsx@@ -9,6 +9,7 @@ import useWorkspace from "@/lib/swr/use-workspace";import { CommissionResponse, FraudGroupCountByPartner } from "@/lib/types";import { CLAWBACK_REASONS_MAP } from "@/lib/zod/schemas/commissions";import { CustomerRowItem } from "@/ui/customers/customer-row-item";+import { useBulkEditCommissionsModal } from "@/ui/partners/bulk-edit-commissions-modal";import { CommissionRowMenu } from "@/ui/partners/commission-row-menu";import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";import { CommissionTypeBadge } from "@/ui/partners/commission-type-badge";@@ -19,6 +20,7 @@ import { FilterButtonTableRow } from "@/ui/shared/filter-button-table-row";import SimpleDateRangePicker from "@/ui/shared/simple-date-range-picker";import {AnimatedSizeContainer,+ Button,EditColumnsButton,Filter,StatusBadge,@@ -30,7 +32,7 @@ import {useRouterStuff,useTable,} from "@dub/ui";-import { MoneyBill2 } from "@dub/ui/icons";+import { MoneyBill2, Pen2 } from "@dub/ui/icons";import {cn,currencyFormatter,@@ -133,6 +135,9 @@ export function CommissionsTable() {const { canManageFraudEvents } = getPlanCapabilities(workspace?.plan ?? "");+ const { openBulkEditCommissionsModal, BulkEditCommissionsModal } =+ useBulkEditCommissionsModal();+const columns = useMemo(() =>[@@ -315,7 +320,7 @@ export function CommissionsTable() {[slug, groups, program, workspace, fraudGroupCount],);- const table = useTable<CommissionResponse>({+ const { table, ...tableProps } = useTable<CommissionResponse>({data: commissions || [],columns,columnPinning: { right: ["menu"] },@@ -359,6 +364,35 @@ export function CommissionsTable() {));},+ getRowId: (row) => row.id,+ selectionControls: (table) => {+ const selectedCommissions = table+ .getSelectedRowModel()+ .rows.map((row) => row.original);++ const hasPaidCommission = selectedCommissions.some(+ (c) => c.status === "paid",+ );+ const exceedsLimit = selectedCommissions.length > 100;++ return (+ <Button+ variant="primary"+ text="Edit commissions"+ icon={<Pen2 className="size-3.5 shrink-0" />}+ className="h-7 w-fit rounded-lg px-2.5"+ disabledTooltip={+ hasPaidCommission+ ? "Some of the selected commissions have already been paid and cannot be edited."+ : undefined+ }+ disabled={exceedsLimit && !hasPaidCommission}+ onClick={() => {+ openBulkEditCommissionsModal(selectedCommissions);+ }}+ />+ );+ },thClassName: "border-l-0",tdClassName: "border-l-0",resourceName: (p) => `commission${p ? "s" : ""}`,@@ -376,9 +410,10 @@ export function CommissionsTable() {return (<div className="flex flex-col gap-3">+ <BulkEditCommissionsModal /><CommissionsFilters />{commissions?.length !== 0 || isLoading ? (- <Table {...table} />+ <Table {...tableProps} table={table} />) : (<AnimatedEmptyStatetitle="No commissions found"diff --git a/apps/web/lib/actions/partners/mark-commission-duplicate.ts b/apps/web/lib/actions/partners/mark-commission-duplicate.tsdeleted file mode 100644index f8362134c3..0000000000--- a/apps/web/lib/actions/partners/mark-commission-duplicate.ts+++ /dev/null@@ -1,107 +0,0 @@-"use server";--import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";-import { DubApiError } from "@/lib/api/errors";-import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";-import { prisma } from "@dub/prisma";-import { waitUntil } from "@vercel/functions";-import * as z from "zod/v4";-import { authActionClient } from "../safe-action";-import { throwIfNoPermission } from "../throw-if-no-permission";--const markCommissionDuplicateSchema = z.object({- workspaceId: z.string(),- commissionId: z.string(),-});--// Mark a commission as duplicate-export const markCommissionDuplicateAction = authActionClient- .inputSchema(markCommissionDuplicateSchema)- .action(async ({ parsedInput, ctx }) => {- const { workspace, user } = ctx;- const { commissionId } = parsedInput;-- throwIfNoPermission({- role: workspace.role,- requiredRoles: ["owner", "member"],- });-- const programId = getDefaultProgramIdOrThrow(workspace);-- const commission = await prisma.commission.findUniqueOrThrow({- where: {- id: commissionId,- },- include: {- payout: true,- },- });-- if (commission.programId !== programId) {- throw new DubApiError({- code: "not_found",- message: "Commission not found.",- });- }-- if (commission.status === "paid") {- throw new Error("You cannot mark a paid commission as duplicate.");- }-- await prisma.$transaction(async (tx) => {- await tx.commission.update({- where: {- id: commission.id,- },- data: {- status: "duplicate",- payoutId: null,- },- });-- // if there is a payout associated with this commission- // we need to update the payout amount if the commission is being marked as duplicate- if (commission.payout) {- const earnings = commission.earnings;- const revisedAmount = commission.payout.amount - earnings;-- if (revisedAmount === 0) {- return tx.payout.delete({ where: { id: commission.payout.id } });- }- return tx.payout.update({- where: { id: commission.payout.id },- data: { amount: revisedAmount },- });- }- });-- waitUntil(- (async () => {- await Promise.allSettled([- syncTotalCommissions({- partnerId: commission.partnerId,- programId,- }),-- recordAuditLog({- workspaceId: workspace.id,- programId,- action: "commission.marked_duplicate",- description: `Commission ${commissionId} marked as duplicate`,- actor: user,- targets: [- {- type: "commission",- id: commissionId,- metadata: commission,- },- ],- }),- ]);- })(),- );-- // TODO: We might want to store the history of the sale status changes- // TODO: Send email to the partner informing them about the sale status change- });diff --git a/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.ts b/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.tsdeleted file mode 100644index eacc1872ee..0000000000--- a/apps/web/lib/actions/partners/mark-commission-fraud-or-canceled.ts+++ /dev/null@@ -1,143 +0,0 @@-"use server";--import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";-import { syncTotalCommissions } from "@/lib/api/partners/sync-total-commissions";-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";-import { prisma } from "@dub/prisma";-import { waitUntil } from "@vercel/functions";-import * as z from "zod/v4";-import { authActionClient } from "../safe-action";-import { throwIfNoPermission } from "../throw-if-no-permission";--const markCommissionFraudOrCanceledSchema = z.object({- workspaceId: z.string(),- commissionId: z.string(),- status: z.enum(["fraud", "canceled"]),-});--// Mark a commission as fraud or canceled for a partner + customer for all historical commissions-export const markCommissionFraudOrCanceledAction = authActionClient- .inputSchema(markCommissionFraudOrCanceledSchema)- .action(async ({ parsedInput, ctx }) => {- const { workspace, user } = ctx;- const { commissionId, status } = parsedInput;-- throwIfNoPermission({- role: workspace.role,- requiredRoles: ["owner", "member"],- });-- const programId = getDefaultProgramIdOrThrow(workspace);-- const commission = await prisma.commission.findUniqueOrThrow({- where: {- id: commissionId,- },- });-- if (commission.programId !== programId) {- throw new Error("Commission not found.");- }-- const { partnerId, customerId } = commission;-- // for custom and click commissions, only update this commission- // for all other commission types, update all historical commissions for the customer and partner combination- const commissions = await prisma.commission.findMany({- where: {- ...(commission.type === "custom" || commission.type === "click"- ? { id: commissionId }- : {}),- partnerId,- customerId,- status: {- in: ["pending", "processed"],- },- },- include: {- payout: true,- },- });-- const commissionsWithPayout = commissions.filter(- (commission) => commission.payout,- );-- // Group commissions by payout ID to batch updates- const payoutUpdates = commissionsWithPayout.reduce(- (acc, commission) => {- const payoutId = commission.payout!.id;-- if (!acc[payoutId]) {- acc[payoutId] = {- payoutId,- currentAmount: commission.payout!.amount,- earningsToDeduct: 0,- };- }-- acc[payoutId].earningsToDeduct += commission.earnings;-- return acc;- },- {} as Record<- string,- {- payoutId: string;- currentAmount: number;- earningsToDeduct: number;- }- >,- );-- await prisma.$transaction([- ...Object.values(payoutUpdates).map(- ({ payoutId, currentAmount, earningsToDeduct }) => {- if (currentAmount - earningsToDeduct === 0) {- return prisma.payout.delete({ where: { id: payoutId } });- }- return prisma.payout.update({- where: { id: payoutId },- data: { amount: currentAmount - earningsToDeduct },- });- },- ),- prisma.commission.updateMany({- where: {- id: {- in: commissions.map((commission) => commission.id),- },- },- data: { status, payoutId: null },- }),- ]);-- waitUntil(- (async () => {- await Promise.allSettled([- syncTotalCommissions({- partnerId: commission.partnerId,- programId,- }),-- recordAuditLog({- workspaceId: workspace.id,- programId,- action:- status === "fraud"- ? "commission.marked_fraud"- : "commission.canceled",- description: `Commission ${commissionId} marked as ${status}`,- actor: user,- targets: [- {- type: "commission",- id: commissionId,- metadata: commission,- },- ],- }),- ]);- })(),- );- });diff --git a/apps/web/lib/actions/partners/unban-partner.ts b/apps/web/lib/actions/partners/unban-partner.tsindex 04bd6c6568..2d9c32bd20 100644--- a/apps/web/lib/actions/partners/unban-partner.ts+++ b/apps/web/lib/actions/partners/unban-partner.ts@@ -1,6 +1,7 @@"use server";import { recordAuditLog } from "@/lib/api/audit-logs/record-audit-log";+import { trackCommissionStatusUpdate } from "@/lib/api/commissions/track-commission-update-activity-log";import { getGroupOrThrow } from "@/lib/api/groups/get-group-or-throw";import { linkCache } from "@/lib/api/links/cache";import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";@@ -57,6 +58,20 @@ export const unbanPartnerAction = authActionClientprogramEnrollment.groupId || programEnrollment.program.defaultGroupId,});+ // Fetch canceled commissions before the transaction for activity logging+ const canceledCommissions = await prisma.commission.findMany({+ where: {+ ...where,+ status: "canceled",+ },+ select: {+ id: true,+ amount: true,+ earnings: true,+ status: true,+ },+ });+await prisma.$transaction([prisma.link.updateMany({where,@@ -129,6 +144,14 @@ export const unbanPartnerAction = authActionClient// Update Tinybird links metadatarecordLink(links),+ // Track commission activity logs for the unban+ trackCommissionStatusUpdate({+ workspaceId: workspace.id,+ programId,+ commissions: canceledCommissions,+ newStatus: "pending",+ }),+recordAuditLog({workspaceId: workspace.id,programId,diff --git a/apps/web/lib/api/commissions/bulk-update-partner-commissions.ts b/apps/web/lib/api/commissions/bulk-update-partner-commissions.tsnew file mode 100644index 0000000000..5c6282e739--- /dev/null+++ b/apps/web/lib/api/commissions/bulk-update-partner-commissions.ts@@ -0,0 +1,171 @@+import { MUTABLE_PAYOUT_STATUSES } from "@/lib/constants/payouts";+import { bulkUpdateCommissionsSchema } from "@/lib/zod/schemas/commissions";+import { prisma } from "@dub/prisma";+import { waitUntil } from "@vercel/functions";+import * as z from "zod/v4";+import { DubApiError } from "../errors";+import { syncTotalCommissions } from "../partners/sync-total-commissions";+import { reconcilePayoutAmounts } from "./reconcile-payout-amounts";+import { trackCommissionActivityLog } from "./track-commission-update-activity-log";++type BulkUpdatePartnerCommissionsProps = z.infer<+ typeof bulkUpdateCommissionsSchema+> & {+ workspaceId: string;+ programId: string;+ userId: string;+};++// TODO:+// Send email to partners about the commission update++export async function bulkUpdatePartnerCommissions({+ workspaceId,+ programId,+ commissionIds,+ status,+ userId,+}: BulkUpdatePartnerCommissionsProps) {+ const commissions = await prisma.commission.findMany({+ where: {+ programId,+ id: {+ in: commissionIds,+ },+ },+ include: {+ program: {+ select: {+ workspaceId: true,+ },+ },+ payout: {+ select: {+ id: true,+ status: true,+ },+ },+ },+ orderBy: {+ id: "asc",+ },+ });++ if (commissions.length !== commissionIds.length) {+ throw new DubApiError({+ code: "not_found",+ message:+ "One or more commissions were not found in this program or the IDs are invalid.",+ });+ }++ const paidIds = commissions+ .filter((c) => c.status === "paid")+ .map((c) => c.id);++ if (paidIds.length > 0) {+ throw new DubApiError({+ code: "bad_request",+ message: `Cannot update commissions: The following commission(s) have already been paid: ${paidIds.join(", ")}`,+ });+ }++ const blockedByPayout = commissions.filter(+ (c) => c.payout && !MUTABLE_PAYOUT_STATUSES.includes(c.payout.status),+ );++ if (blockedByPayout.length > 0) {+ throw new DubApiError({+ code: "bad_request",+ message: `Cannot update commissions: ${blockedByPayout.map((c) => `${c.id} (its payout is already ${c.payout!.status})`).join(", ")}`,+ });+ }++ const alreadyTargetIds = commissions+ .filter((c) => c.status === status)+ .map((c) => c.id);++ if (alreadyTargetIds.length > 0) {+ throw new DubApiError({+ code: "bad_request",+ message: `The following commission(s) are already in the ${status} status: ${alreadyTargetIds.join(", ")}`,+ });+ }++ // Update the commissions to the new status+ await prisma.commission.updateMany({+ where: {+ id: {+ in: commissions.map((c) => c.id),+ },+ status: {+ not: "paid",+ },+ OR: [+ {+ payoutId: null,+ },+ {+ payout: {+ status: {+ in: MUTABLE_PAYOUT_STATUSES,+ },+ },+ },+ ],+ },+ data: {+ status,+ payoutId: null,+ },+ });++ // Reconcile the payout amounts+ const payoutIds = commissions+ .filter((c) => c.payoutId)+ .map((c) => c.payoutId!);++ await reconcilePayoutAmounts(payoutIds);++ // Retrieve the updated commissions+ const updatedCommissions = await prisma.commission.findMany({+ where: {+ programId,+ id: {+ in: commissionIds,+ },+ },+ include: {+ customer: true,+ partner: true,+ programEnrollment: true,+ },+ orderBy: {+ id: "asc",+ },+ });++ // Find unique partner Ids+ const partnerIds = [...new Set(updatedCommissions.map((c) => c.partnerId))];++ waitUntil(+ Promise.allSettled([+ ...partnerIds.map((partnerId) =>+ syncTotalCommissions({+ partnerId,+ programId,+ }),+ ),++ trackCommissionActivityLog({+ workspaceId,+ programId,+ userId,+ old: commissions,+ new: updatedCommissions,+ }),+ ]),+ );++ return updatedCommissions;+}diff --git a/apps/web/lib/api/commissions/reconcile-payout-amounts.ts b/apps/web/lib/api/commissions/reconcile-payout-amounts.tsnew file mode 100644index 0000000000..d058bf6ef0--- /dev/null+++ b/apps/web/lib/api/commissions/reconcile-payout-amounts.ts@@ -0,0 +1,82 @@+import { MUTABLE_PAYOUT_STATUSES } from "@/lib/constants/payouts";+import { prisma } from "@dub/prisma";++export async function reconcilePayoutAmounts(payoutIds: string[]) {+ const uniquePayoutIds = [...new Set(payoutIds)];++ if (uniquePayoutIds.length === 0) {+ return;+ }++ await prisma.$transaction(async (tx) => {+ const aggregates = await tx.commission.groupBy({+ by: ["payoutId"],+ where: {+ payoutId: {+ in: uniquePayoutIds,+ },+ },+ _sum: {+ earnings: true,+ },+ });++ const sumByPayoutId = new Map(+ aggregates.map((a) => [a.payoutId!, a._sum.earnings ?? 0]),+ );++ const toDelete: string[] = [];+ const toUpdate: { id: string; amount: number }[] = [];++ for (const id of uniquePayoutIds) {+ const newPayoutAmount = sumByPayoutId.get(id) ?? 0;++ if (newPayoutAmount === 0) {+ toDelete.push(id);+ } else {+ toUpdate.push({ id, amount: newPayoutAmount });+ }+ }++ if (toDelete.length > 0) {+ await tx.payout.deleteMany({+ where: {+ id: {+ in: toDelete,+ },+ status: {+ in: MUTABLE_PAYOUT_STATUSES,+ },+ },+ });+ }++ await Promise.all(+ toUpdate.map(({ id, amount }) =>+ tx.payout.update({+ where: {+ id,+ status: {+ in: MUTABLE_PAYOUT_STATUSES,+ },+ },+ data: {+ amount,+ },+ }),+ ),+ );++ for (const id of toDelete) {+ console.log(+ `[reconcilePayoutAmount] Deleted payout ${id} because it has no commissions.`,+ );+ }++ for (const { id, amount } of toUpdate) {+ console.log(+ `[reconcilePayoutAmount] Updated payout amount for payout ${id} to ${amount}`,+ );+ }+ });+}diff --git a/apps/web/lib/api/commissions/track-commission-update-activity-log.ts b/apps/web/lib/api/commissions/track-commission-update-activity-log.tsnew file mode 100644index 0000000000..2960820e3d--- /dev/null+++ b/apps/web/lib/api/commissions/track-commission-update-activity-log.ts@@ -0,0 +1,142 @@+import {+ trackActivityLog,+ type TrackActivityLogInput,+} from "@/lib/api/activity-log/track-activity-log";+import { CommissionActivitySnapshot } from "@/lib/types";+import type { Commission, CommissionStatus } from "@dub/prisma/client";+import { groupBy } from "@dub/utils";+import { getResourceDiff } from "../activity-log/get-resource-diff";++interface TrackActivityLogParams+ extends Omit<+ TrackActivityLogInput,+ "action" | "changeSet" | "resourceType" | "batchId" | "resourceId"+ > {+ old: Pick<Commission, "id" | "amount" | "earnings" | "status">[] | null;+ new: Pick<Commission, "id" | "amount" | "earnings" | "status">[] | null;+}++const COMMISSION_ACTIVITY_FIELDS = ["amount", "earnings", "status"];++export function toCommissionActivitySnapshot(+ commission: Pick<Commission, "id" | "amount" | "earnings" | "status">,+): CommissionActivitySnapshot {+ return {+ amount: commission.amount,+ earnings: commission.earnings,+ status: commission.status,+ };+}++export async function trackCommissionActivityLog({+ old: oldCommissions,+ new: newCommissions,+ ...baseInput+}: TrackActivityLogParams) {+ const activityLogs: TrackActivityLogInput[] = [];++ const oldById = new Map((oldCommissions ?? []).map((c) => [c.id, c]));+ const newById = new Map((newCommissions ?? []).map((c) => [c.id, c]));++ const commissionIds = [+ ...new Set([...oldById.keys(), ...newById.keys()]),+ ].sort();++ for (const id of commissionIds) {+ const oldCommission = oldById.get(id);+ const newCommission = newById.get(id);++ if (oldCommission && newCommission) {+ const oldSnapshot = toCommissionActivitySnapshot(oldCommission);+ const newSnapshot = toCommissionActivitySnapshot(newCommission);++ const diff = getResourceDiff(oldSnapshot, newSnapshot, {+ fields: COMMISSION_ACTIVITY_FIELDS,+ });++ if (diff) {+ activityLogs.push({+ ...baseInput,+ resourceId: newCommission.id,+ resourceType: "commission",+ action: "commission.updated",+ changeSet: {+ commission: {+ old: oldSnapshot,+ new: newSnapshot,+ },+ },+ });+ }+ }+ }++ return await trackActivityLog(activityLogs);+}++// Track activity logs for commissions that are all being updated to the same new status.+// Useful for bulk operations like aggregate-due-commissions, ban/unban, payouts, etc.+export async function trackCommissionStatusUpdate({+ commissions,+ newStatus,+ ...baseInput+}: {+ commissions: Pick<Commission, "id" | "amount" | "earnings" | "status">[];+ newStatus: CommissionStatus;+} & Pick<TrackActivityLogInput, "workspaceId" | "programId" | "userId">) {+ if (commissions.length === 0) {+ return;+ }++ return trackCommissionActivityLog({+ ...baseInput,+ old: commissions,+ new: commissions.map((commission) => ({+ ...commission,+ status: newStatus,+ })),+ });+}++// For payouts that may span multiple programs: resolve workspace from payouts, then+// delegate to trackCommissionStatusUpdate once per program.+export async function trackCommissionStatusUpdatesByProgram({+ commissions,+ payouts,+ newStatus = "paid",+}: {+ commissions: Pick<+ Commission,+ "id" | "amount" | "earnings" | "status" | "programId"+ >[];+ payouts: Array<{ program: { id: string; workspaceId: string } }>;+ newStatus?: CommissionStatus;+}) {+ if (commissions.length === 0) {+ return;+ }++ const workspaceByProgram = new Map(+ payouts.map((p) => [p.program.id, p.program.workspaceId]),+ );++ const commissionsByProgram = groupBy(commissions, (c) => c.programId);++ for (const [programId, commissions] of Object.entries(commissionsByProgram)) {+ const workspaceId = workspaceByProgram.get(programId);++ if (!workspaceId) {+ console.error(+ `Workspace not found for program ${programId}. Skipping...`,+ );+ continue;+ }++ await trackCommissionStatusUpdate({+ workspaceId,+ programId,+ commissions,+ newStatus,+ });+ }+}diff --git a/apps/web/lib/api/commissions/update-partner-commission.ts b/apps/web/lib/api/commissions/update-partner-commission.tsnew file mode 100644index 0000000000..c9d5d36b77--- /dev/null+++ b/apps/web/lib/api/commissions/update-partner-commission.ts@@ -0,0 +1,325 @@+import { convertCurrency } from "@/lib/analytics/convert-currency";+import { MUTABLE_PAYOUT_STATUSES } from "@/lib/constants/payouts";+import { determinePartnerReward } from "@/lib/partners/determine-partner-reward";+import { updateCommissionSchemaExtended } from "@/lib/zod/schemas/commissions";+import { prisma } from "@dub/prisma";+import { Commission } from "@dub/prisma/client";+import { waitUntil } from "@vercel/functions";+import * as z from "zod/v4";+import { DubApiError } from "../errors";+import { syncTotalCommissions } from "../partners/sync-total-commissions";+import { getProgramEnrollmentOrThrow } from "../programs/get-program-enrollment-or-throw";+import { calculateSaleEarnings } from "../sales/calculate-sale-earnings";+import { reconcilePayoutAmounts } from "./reconcile-payout-amounts";+import {+ trackCommissionActivityLog,+ trackCommissionStatusUpdate,+} from "./track-commission-update-activity-log";++type UpdatePartnerCommissionProps = z.infer<+ typeof updateCommissionSchemaExtended+> & {+ workspaceId: string;+ programId: string;+ commissionId: string;+ userId?: string;+};++// TODO:+// Send email to partners about the commission update++export async function updatePartnerCommission({+ workspaceId,+ programId,+ commissionId,+ status,+ userId,+ // Sale commission fields+ saleAmount,+ modifySaleAmount,+ currency,+ // Custom commission fields+ earnings,+ updateHistoricalCommissions = false,+}: UpdatePartnerCommissionProps) {+ const commission = await prisma.commission.findUnique({+ where: {+ id: commissionId,+ },+ include: {+ payout: {+ select: {+ id: true,+ amount: true,+ status: true,+ },+ },+ partner: {+ select: {+ id: true,+ },+ },+ },+ });++ if (!commission || commission.programId !== programId) {+ throw new DubApiError({+ code: "not_found",+ message: `Commission ${commissionId} not found.`,+ });+ }++ if (commission.status === "paid") {+ throw new DubApiError({+ code: "bad_request",+ message: `Cannot update commission: Commission ${commissionId} has already been paid.`,+ });+ }++ if (+ commission.payout &&+ !MUTABLE_PAYOUT_STATUSES.includes(commission.payout.status)+ ) {+ throw new DubApiError({+ code: "bad_request",+ message: `Cannot update commission: Its payout is already ${commission.payout.status}.`,+ });+ }++ if (status && status === commission.status) {+ throw new DubApiError({+ code: "bad_request",+ message: `This commission is already in the ${status} status.`,+ });+ }++ const { partner, amount: originalSaleAmount } = commission;++ let finalSaleAmount: number | undefined;+ let finalEarnings: number | undefined;++ // Commission for sale events+ if (saleAmount !== undefined || modifySaleAmount !== undefined) {+ if (commission.type !== "sale") {+ throw new DubApiError({+ code: "bad_request",+ message: `Cannot update sale amount: Commission ${commissionId} is not a sale commission.`,+ });+ }++ // if currency is not USD, convert it to USD based on the current FX rate+ // TODO: allow custom "defaultCurrency" on workspace table in the future+ if (currency !== "usd") {+ const valueToConvert = modifySaleAmount ?? saleAmount;++ if (valueToConvert !== undefined) {+ const { currency: convertedCurrency, amount: convertedAmount } =+ await convertCurrency({+ currency,+ amount: valueToConvert,+ });++ if (modifySaleAmount !== undefined) {+ modifySaleAmount = convertedAmount;+ } else {+ saleAmount = convertedAmount;+ }++ currency = convertedCurrency;+ }+ }++ finalSaleAmount = Math.max(+ modifySaleAmount !== undefined+ ? originalSaleAmount + modifySaleAmount+ : saleAmount ?? originalSaleAmount,+ 0, // Ensure the amount is not negative+ );++ const programEnrollment = await getProgramEnrollmentOrThrow({+ partnerId: partner.id,+ programId,+ include: {+ partner: true,+ links: true,+ saleReward: true,+ },+ });++ const reward = determinePartnerReward({+ event: "sale",+ programEnrollment,+ });++ if (!reward) {+ throw new DubApiError({+ code: "not_found",+ message: `No reward found for partner ${partner.id} in program ${programId}.`,+ });+ }++ // Recalculate the earnings based on the new amount+ finalEarnings = calculateSaleEarnings({+ reward,+ sale: {+ amount: finalSaleAmount,+ quantity: commission.quantity,+ },+ });+ }++ // Commission for custom events+ if (earnings !== undefined) {+ if (commission.type !== "custom") {+ throw new DubApiError({+ code: "bad_request",+ message: `Cannot update earnings: Commission ${commissionId} is not a custom commission.`,+ });+ }++ finalEarnings = earnings;+ }++ const isRefunded = finalSaleAmount === 0 || finalEarnings === 0;+ const finalStatus = status ?? (isRefunded ? "refunded" : undefined);++ const updatedCommission = await prisma.commission.update({+ where: {+ id: commission.id,+ status: {+ not: "paid",+ },+ OR: [+ {+ payoutId: null,+ },+ {+ payout: {+ status: {+ in: MUTABLE_PAYOUT_STATUSES,+ },+ },+ },+ ],+ },+ data: {+ // if the sale/commission is fully refunded, we don't need to update the amount or earnings+ // we just update status to refunded and exclude it from the payout+ // same goes for updating status to refunded, duplicate, canceled, or fraudulent+ amount: isRefunded ? undefined : finalSaleAmount,+ earnings: isRefunded ? undefined : finalEarnings,+ status: finalStatus,+ ...(finalStatus ? { payoutId: null } : {}),+ },+ include: {+ customer: true,+ partner: true,+ },+ });++ // For fraud/canceled on sale/lead commissions, also update all related+ // historical commissions for the same customer + partner combination+ let relatedCommissions: Pick<+ Commission,+ "id" | "amount" | "earnings" | "status" | "payoutId"+ >[] = [];++ if (+ updateHistoricalCommissions &&+ (finalStatus === "fraud" || finalStatus === "canceled") &&+ (commission.type === "sale" || commission.type === "lead")+ ) {+ relatedCommissions = await prisma.commission.findMany({+ where: {+ programId: commission.programId,+ partnerId: commission.partnerId,+ customerId: commission.customerId,+ status: {+ in: ["pending", "processed"],+ },+ id: {+ not: commission.id,+ },+ },+ select: {+ id: true,+ amount: true,+ earnings: true,+ status: true,+ payoutId: true,+ },+ });++ if (relatedCommissions.length > 0) {+ await prisma.commission.updateMany({+ where: {+ id: {+ in: relatedCommissions.map(({ id }) => id),+ },+ status: {+ not: "paid",+ },+ OR: [+ {+ payoutId: null,+ },+ {+ payout: {+ status: {+ in: MUTABLE_PAYOUT_STATUSES,+ },+ },+ },+ ],+ },+ data: {+ status: finalStatus,+ payoutId: null,+ },+ });+ }+ }++ // Reconcile payout amounts for all affected payouts+ const affectedPayoutIds = [+ ...(commission.status === "processed" && commission.payoutId+ ? [commission.payoutId]+ : []),+ ...relatedCommissions+ .filter(({ payoutId }) => payoutId)+ .map(({ payoutId }) => payoutId!),+ ];++ if (affectedPayoutIds.length > 0) {+ await reconcilePayoutAmounts(affectedPayoutIds);+ }++ waitUntil(+ Promise.allSettled([+ syncTotalCommissions({+ partnerId: commission.partnerId,+ programId: commission.programId,+ }),++ trackCommissionActivityLog({+ workspaceId,+ programId,+ userId,+ old: [commission],+ new: [updatedCommission],+ }),++ relatedCommissions.length > 0+ ? trackCommissionStatusUpdate({+ workspaceId,+ programId,+ userId,+ commissions: relatedCommissions,+ newStatus: finalStatus!,+ })+ : Promise.resolve(),+ ]),+ );++ return updatedCommission;+}diff --git a/apps/web/lib/constants/payouts.ts b/apps/web/lib/constants/payouts.tsindex bf2a50fafe..e28bb1bfd7 100644--- a/apps/web/lib/constants/payouts.ts+++ b/apps/web/lib/constants/payouts.ts@@ -1,3 +1,4 @@+import { PayoutStatus } from "@dub/prisma/client";import Stripe from "stripe";import { PaymentMethodOption } from "../types";@@ -18,6 +19,8 @@ export const MIN_WITHDRAWAL_AMOUNT_CENTS = 1000; // $10export const BELOW_MIN_WITHDRAWAL_FEE_CENTS = 50; // $0.50export const MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS = 100; // $1 (doesn't make sense to force a withdrawal for less than $1)+export const MUTABLE_PAYOUT_STATUSES: PayoutStatus[] = ["pending", "canceled"];+// Direct debit payment types for Partner payoutexport const DIRECT_DEBIT_PAYMENT_TYPES_INFO: {type: Stripe.PaymentMethod.Type;diff --git a/apps/web/lib/openapi/commissions/bulk-update-commissions.ts b/apps/web/lib/openapi/commissions/bulk-update-commissions.tsnew file mode 100644index 0000000000..0de38705e8--- /dev/null+++ b/apps/web/lib/openapi/commissions/bulk-update-commissions.ts@@ -0,0 +1,39 @@+import {+ bulkUpdateCommissionsSchema,+ CommissionSchema,+} from "@/lib/zod/schemas/commissions";+import { ZodOpenApiOperationObject } from "zod-openapi";+import * as z from "zod/v4";+import { openApiErrorResponses } from "../responses";++export const bulkUpdateCommissions: ZodOpenApiOperationObject = {+ operationId: "bulkUpdateCommissions",+ "x-speakeasy-name-override": "updateMany",+ summary: "Bulk update commissions",+ description: "Bulk update up to 100 commissions with the same status.",+ requestBody: {+ content: {+ "application/json": {+ schema: bulkUpdateCommissionsSchema,+ },+ },+ },+ responses: {+ "200": {+ description: "The updated commissions.",+ content: {+ "application/json": {+ schema: z.array(+ CommissionSchema.pick({+ id: true,+ status: true,+ }),+ ),+ },+ },+ },+ ...openApiErrorResponses,+ },+ tags: ["Commissions"],+ security: [{ token: [] }],+};diff --git a/apps/web/lib/openapi/commissions/index.ts b/apps/web/lib/openapi/commissions/index.tsindex 34e0644164..ac45385631 100644--- a/apps/web/lib/openapi/commissions/index.ts+++ b/apps/web/lib/openapi/commissions/index.ts@@ -1,4 +1,5 @@import { ZodOpenApiPathsObject } from "zod-openapi";+import { bulkUpdateCommissions } from "./bulk-update-commissions";import { listCommissions } from "./list-commissions";import { updateCommission } from "./update-commission";@@ -9,4 +10,7 @@ export const commissionsPaths: ZodOpenApiPathsObject = {"/commissions/{id}": {patch: updateCommission,},+ "/commissions/bulk": {+ patch: bulkUpdateCommissions,+ },};diff --git a/apps/web/lib/partners/create-stablecoin-payout.ts b/apps/web/lib/partners/create-stablecoin-payout.tsindex ee15de46e2..96e575d91b 100644--- a/apps/web/lib/partners/create-stablecoin-payout.ts+++ b/apps/web/lib/partners/create-stablecoin-payout.ts@@ -1,9 +1,11 @@+import { trackCommissionStatusUpdatesByProgram } from "@/lib/api/commissions/track-commission-update-activity-log";import { sendEmail } from "@dub/email";import PartnerPayoutForceWithdrawal from "@dub/email/templates/partner-payout-force-withdrawal";import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processed";import { prisma } from "@dub/prisma";import { PartnerPayoutMethod, Prisma } from "@dub/prisma/client";import { currencyFormatter, prettyPrint } from "@dub/utils";+import { waitUntil } from "@vercel/functions";import {BELOW_MIN_WITHDRAWAL_FEE_CENTS,MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS,@@ -54,8 +56,10 @@ export const createStablecoinPayout = async ({const commonInclude: Prisma.PayoutInclude = {program: {select: {+ id: true,name: true,logo: true,+ workspaceId: true,},},};@@ -227,11 +231,28 @@ export const createStablecoinPayout = async ({return;}+ const payoutIds = allPayouts.map((p) => p.id);++ const commissions = await prisma.commission.findMany({+ where: {+ payoutId: {+ in: payoutIds,+ },+ },+ select: {+ id: true,+ amount: true,+ earnings: true,+ status: true,+ programId: true,+ },+ });+await prisma.$transaction([prisma.payout.updateMany({where: {id: {- in: allPayouts.map((p) => p.id),+ in: payoutIds,},},data: {@@ -245,7 +266,7 @@ export const createStablecoinPayout = async ({prisma.commission.updateMany({where: {payoutId: {- in: allPayouts.map((p) => p.id),+ in: payoutIds,},},data: {@@ -254,6 +275,14 @@ export const createStablecoinPayout = async ({}),]);+ waitUntil(+ trackCommissionStatusUpdatesByProgram({+ commissions,+ payouts: allPayouts,+ newStatus: "paid",+ }),+ );+if (!partner.email) {console.warn(`Partner ${partner.email} does not have an email address to send the payout email to.`,diff --git a/apps/web/lib/partners/create-stripe-transfer.ts b/apps/web/lib/partners/create-stripe-transfer.tsindex 1d8d7ecc5c..52e9452b24 100644--- a/apps/web/lib/partners/create-stripe-transfer.ts+++ b/apps/web/lib/partners/create-stripe-transfer.ts@@ -1,3 +1,4 @@+import { trackCommissionStatusUpdatesByProgram } from "@/lib/api/commissions/track-commission-update-activity-log";import {BELOW_MIN_WITHDRAWAL_FEE_CENTS,MIN_FORCE_WITHDRAWAL_AMOUNT_CENTS,@@ -10,6 +11,7 @@ import PartnerPayoutProcessed from "@dub/email/templates/partner-payout-processeimport { prisma } from "@dub/prisma";import { Prisma } from "@dub/prisma/client";import { currencyFormatter, pluralize } from "@dub/utils";+import { waitUntil } from "@vercel/functions";import { createPayoutsIdempotencyKey } from "../payouts/create-payouts-idempotency-key";import { markPayoutsAsProcessed } from "../payouts/mark-payouts-as-processed";@@ -46,8 +48,10 @@ export const createStripeTransfer = async ({const commonInclude: Prisma.PayoutInclude = {program: {select: {+ id: true,name: true,logo: true,+ workspaceId: true,},},};@@ -194,11 +198,28 @@ export const createStripeTransfer = async ({)} ${allPayouts.map((p) => p.id).join(", ")}`,);+ const payoutIds = allPayouts.map((p) => p.id);++ const commissions = await prisma.commission.findMany({+ where: {+ payoutId: {+ in: payoutIds,+ },+ },+ select: {+ id: true,+ amount: true,+ earnings: true,+ status: true,+ programId: true,+ },+ });+await Promise.allSettled([prisma.payout.updateMany({where: {id: {- in: allPayouts.map((p) => p.id),+ in: payoutIds,},},data: {@@ -212,7 +233,7 @@ export const createStripeTransfer = async ({prisma.commission.updateMany({where: {payoutId: {- in: allPayouts.map((p) => p.id),+ in: payoutIds,},},data: {@@ -221,6 +242,14 @@ export const createStripeTransfer = async ({}),]);+ waitUntil(+ trackCommissionStatusUpdatesByProgram({+ commissions,+ payouts: allPayouts,+ newStatus: "paid",+ }),+ );+if (partner.email) {const payout = currentInvoicePayouts[0];const emailRes = await sendEmail({diff --git a/apps/web/lib/types.ts b/apps/web/lib/types.tsindex 4009dbd879..8ae6ede660 100644--- a/apps/web/lib/types.ts+++ b/apps/web/lib/types.ts@@ -10,6 +10,7 @@ import {} from "@/lib/zod/schemas/partner-profile";import { DirectorySyncProviders } from "@boxyhq/saml-jackson";import {+ Commission,CommissionStatus,FolderUserRole,FraudEvent,@@ -892,3 +893,8 @@ export type NullableOptional<T> = {export type PartnerBountySubmission = z.infer<typeof partnerBountySubmissionSchema>;++export type CommissionActivitySnapshot = Pick<+ Commission,+ "amount" | "earnings" | "status"+>;diff --git a/apps/web/lib/zod/schemas/activity-log.ts b/apps/web/lib/zod/schemas/activity-log.tsindex aa775d7682..b9fae24532 100644--- a/apps/web/lib/zod/schemas/activity-log.ts+++ b/apps/web/lib/zod/schemas/activity-log.ts@@ -4,6 +4,7 @@ import { UserSchema } from "./users";export const activityLogResourceTypeSchema = z.enum(["referral","partner",+ "commission","clickReward","saleReward","leadReward",@@ -21,6 +22,8 @@ export const activityLogActionSchema = z.enum(["partner.groupChanged",+ "commission.updated",+"reward.created","reward.updated","reward.deleted",diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.tsindex 63543f3d18..d44cdbd63e 100644--- a/apps/web/lib/zod/schemas/commissions.ts+++ b/apps/web/lib/zod/schemas/commissions.ts@@ -193,33 +193,76 @@ export const createCommissionSchema = z.object({productId: z.string().nullish(),});+export const commissionPatchStatusSchema = z.enum([+ "pending",+ "refunded",+ "duplicate",+ "canceled",+ "fraud",+]);+export const updateCommissionSchema = z.object({- amount: z+ saleAmount: z.number().min(0)+ .optional().describe("The new absolute amount for the sale. Paid commissions cannot be updated.",- )- .optional(),- modifyAmount: z+ ),+ modifySaleAmount: z.number()+ .optional().describe(- "Modify the current sale amount: use positive values to increase the amount, negative values to decrease it. Takes precedence over `amount`. Paid commissions cannot be updated.",- )- .optional(),+ "Modify the current sale amount: use positive values to increase the amount, negative values to decrease it. Takes precedence over `saleAmount`. Paid commissions cannot be updated.",+ ),+ earnings: z+ .number()+ .min(0)+ .optional()+ .describe(+ "The new absolute earnings for the custom commission. Paid commissions cannot be updated.",+ ),currency: z.string()+ .optional().default("usd").transform((val) => val.toLowerCase()).describe("The currency of the sale amount to update. Accepts ISO 4217 currency codes.",),- status: z- .enum(["refunded", "duplicate", "canceled", "fraud"])+ status: commissionPatchStatusSchema.optional().describe(- "Useful for marking a commission as refunded, duplicate, canceled, or fraudulent. Takes precedence over `amount` and `modifyAmount`. When a commission is marked as refunded, duplicate, canceled, or fraudulent, it will be omitted from the payout, and the payout amount will be recalculated accordingly. Paid commissions cannot be updated.",+ "Useful for marking a commission as pending, refunded, duplicate, canceled, or fraudulent. Takes precedence over `saleAmount` and `modifySaleAmount`. When a commission is marked as pending, refunded, duplicate, canceled, or fraudulent, it will be omitted from the payout, and the payout amount will be recalculated accordingly. Paid commissions cannot be updated.",),+ amount: z+ .number()+ .min(0)+ .optional()+ .describe("Deprecated. Use `saleAmount` instead.")+ .meta({ deprecated: true }),+ modifyAmount: z+ .number()+ .optional()+ .describe("Deprecated. Use `modifySaleAmount` instead.")+ .meta({ deprecated: true }),+});++export const updateCommissionSchemaExtended = updateCommissionSchema.extend({+ updateHistoricalCommissions: z.boolean().optional(),+});++export const bulkUpdateCommissionsSchema = z.object({+ commissionIds: z+ .array(z.string())+ .min(1, "At least one commission ID is required.")+ .max(100, "You can only update up to 100 commissions at a time.")+ .refine((ids) => new Set(ids).size === ids.length, {+ message: "commissionIds must be unique.",+ }),+ status: commissionPatchStatusSchema.describe(+ "The status to apply to every commission in the batch.",+ ),});export const CLAWBACK_REASONS = [diff --git a/apps/web/scripts/migrations/backfill-commission-activity-log.ts b/apps/web/scripts/migrations/backfill-commission-activity-log.tsnew file mode 100644index 0000000000..4fed3d1020--- /dev/null+++ b/apps/web/scripts/migrations/backfill-commission-activity-log.ts@@ -0,0 +1,198 @@+import "dotenv-flow/config";++import { prisma } from "@dub/prisma";+import { Prisma } from "@dub/prisma/client";++const BATCH_SIZE = 500;+const TERMINAL_STATUSES = ["refunded", "duplicate", "fraud", "canceled"];++// REMOVE before running:+// - "server-only" from any imported files if needed++// Note: Activity log createdAt is not accurate, but it's the best we can do++async function main() {+ const programId = process.env.PROGRAM_ID;++ let cursor: string | undefined = undefined;+ let totalProcessed = 0;+ let totalLogsCreated = 0;++ console.log(+ `Starting commission activity log backfill${programId ? ` for program ${programId}` : ""}...`,+ );++ while (true) {+ const commissions = await prisma.commission.findMany({+ where: {+ ...(programId ? { programId } : {}),+ },+ include: {+ program: {+ select: {+ workspaceId: true,+ },+ },+ payout: {+ select: {+ paidAt: true,+ },+ },+ },+ orderBy: {+ id: "asc",+ },+ take: BATCH_SIZE,+ ...(cursor+ ? {+ skip: 1,+ cursor: {+ id: cursor,+ },+ }+ : {}),+ });++ if (commissions.length === 0) {+ break;+ }++ cursor = commissions[commissions.length - 1].id;++ // Reset every batch (avoid accidental accumulation / re-inserts)+ let commissionsToBackfill = [] as typeof commissions;+ commissionsToBackfill = commissions.filter((c) => c.id);++ if (commissionsToBackfill.length === 0) {+ totalProcessed += commissions.length;+ console.log(+ `Batch skipped (all have logs). Total processed: ${totalProcessed}`,+ );+ continue;+ }++ const activityLogs: Prisma.ActivityLogCreateManyInput[] = [];++ for (const commission of commissionsToBackfill) {+ const { amount, earnings, status, program } = commission;++ const base = {+ workspaceId: program.workspaceId,+ programId: commission.programId,+ resourceType: "commission",+ resourceId: commission.id,+ };++ if (status === "processed") {+ activityLogs.push({+ ...base,+ action: "commission.updated",+ createdAt: commission.updatedAt,+ changeSet: {+ commission: {+ old: {+ amount,+ earnings,+ status: "pending",+ },+ new: {+ amount,+ earnings,+ status: "processed",+ },+ },+ },+ });++ continue;+ }++ if (status === "paid") {+ // pending → processed+ activityLogs.push({+ ...base,+ action: "commission.updated",+ createdAt: commission.updatedAt,+ changeSet: {+ commission: {+ old: {+ amount,+ earnings,+ status: "pending",+ },+ new: {+ amount,+ earnings,+ status: "processed",+ },+ },+ },+ });++ // this should be there but just in case+ if (commission.payout?.paidAt) {+ // processed → paid+ activityLogs.push({+ ...base,+ action: "commission.updated",+ createdAt: commission.payout?.paidAt,+ changeSet: {+ commission: {+ old: {+ amount,+ earnings,+ status: "processed",+ },+ new: {+ amount,+ earnings,+ status: "paid",+ },+ },+ },+ });+ } else {+ console.warn(+ `No paidAt for commission ${commission.id} payout ${commission.payoutId}`,+ );+ }++ continue;+ }++ if (TERMINAL_STATUSES.includes(status)) {+ activityLogs.push({+ ...base,+ action: "commission.updated",+ createdAt: commission.updatedAt,+ changeSet: {+ commission: {+ old: { amount, earnings, status: "pending" },+ new: { amount, earnings, status },+ },+ },+ });+ }+ }++ if (activityLogs.length > 0) {+ await prisma.activityLog.createMany({+ data: activityLogs,+ skipDuplicates: true,+ });+ }++ totalProcessed += commissions.length;+ totalLogsCreated += activityLogs.length;++ console.log(+ `Batch done: ${commissionsToBackfill.length} commissions, ${activityLogs.length} logs created. Total processed: ${totalProcessed}, total logs: ${totalLogsCreated}`,+ );+ }++ console.log(+ `\nBackfill complete. Processed ${totalProcessed} commissions, created ${totalLogsCreated} activity logs.`,+ );+}++main();diff --git a/apps/web/tests/commissions/bulk-updates.test.ts b/apps/web/tests/commissions/bulk-updates.test.tsnew file mode 100644index 0000000000..521ec8c316--- /dev/null+++ b/apps/web/tests/commissions/bulk-updates.test.ts@@ -0,0 +1,107 @@+import { CommissionResponse } from "@/lib/types";+import { describe, expect, test } from "vitest";+import { IntegrationHarness } from "../utils/integration";++describe.sequential("/commissions/bulk - bulk updates", async () => {+ const h = new IntegrationHarness();+ const { http } = await h.init();++ const getCommissionsByStatus = async (status: string) => {+ const { status: responseStatus, data } = await http.get<CommissionResponse[]>({+ path: "/commissions",+ query: {+ status,+ pageSize: "100",+ sortBy: "createdAt",+ sortOrder: "desc",+ },+ });++ expect(responseStatus).toEqual(200);+ return data;+ };++ test("PATCH /commissions/bulk - validation error for duplicate commission IDs", async () => {+ const pendingCommissions = await getCommissionsByStatus("pending");+ expect(pendingCommissions.length).toBeGreaterThan(0);++ const duplicateId = pendingCommissions[0].id;++ const { status, data } = await http.patch<any>({+ path: "/commissions/bulk",+ body: {+ commissionIds: [duplicateId, duplicateId],+ status: "canceled",+ },+ });++ expect(status).toEqual(422);+ expect(data.error.message).toContain("commissionIds must be unique");+ });++ test("PATCH /commissions/bulk - returns not_found for invalid commission IDs", async () => {+ const { status, data } = await http.patch<any>({+ path: "/commissions/bulk",+ body: {+ commissionIds: ["cm_invalid_commission_id_12345"],+ status: "canceled",+ },+ });++ expect(status).toEqual(404);+ expect(data.error.message).toContain("One or more commissions were not found");+ });++ test("PATCH /commissions/bulk - returns bad_request for paid commissions", async () => {+ const paidCommissions = await getCommissionsByStatus("paid");+ expect(paidCommissions.length).toBeGreaterThan(0);++ const { status, data } = await http.patch<any>({+ path: "/commissions/bulk",+ body: {+ commissionIds: [paidCommissions[0].id],+ status: "canceled",+ },+ });++ expect(status).toEqual(400);+ expect(data.error.message).toContain("have already been paid");+ });++ test("PATCH /commissions/bulk - returns bad_request when already in target status", async () => {+ const pendingCommissions = await getCommissionsByStatus("pending");+ expect(pendingCommissions.length).toBeGreaterThan(0);++ const { status, data } = await http.patch<any>({+ path: "/commissions/bulk",+ body: {+ commissionIds: [pendingCommissions[0].id],+ status: "pending",+ },+ });++ expect(status).toEqual(400);+ expect(data.error.message).toContain("already in the pending status");+ });++ test("PATCH /commissions/bulk - updates multiple commissions", async () => {+ const pendingCommissions = await getCommissionsByStatus("pending");+ expect(pendingCommissions.length).toBeGreaterThanOrEqual(2);++ const commissionIds = pendingCommissions.slice(0, 2).map((c) => c.id);++ const { status, data } = await http.patch<Array<{ id: string; status: string }>>({+ path: "/commissions/bulk",+ body: {+ commissionIds,+ status: "duplicate",+ },+ });++ expect(status).toEqual(200);+ expect(Array.isArray(data)).toBe(true);+ expect(data).toHaveLength(2);+ expect(data.map((c) => c.id).sort()).toEqual([...commissionIds].sort());+ expect(data.every((c) => c.status === "duplicate")).toBe(true);+ });+});diff --git a/apps/web/tests/commissions/index.test.ts b/apps/web/tests/commissions/index.test.tsindex 69680ee346..8ac750e6da 100644--- a/apps/web/tests/commissions/index.test.ts+++ b/apps/web/tests/commissions/index.test.ts@@ -81,9 +81,9 @@ describe.sequential("/commissions/**", async () => {});});- test("PATCH /commissions/{id} - modify amount", async () => {+ test("PATCH /commissions/{id} - modify saleAmount", async () => {const toUpdate = {- modifyAmount: 1000, // Add $10.00 to existing amount+ modifySaleAmount: 1000, // Add $10.00 to existing amountcurrency: "usd",};@@ -98,7 +98,7 @@ describe.sequential("/commissions/**", async () => {test("PATCH /commissions/{id} - foreign currency conversion", async () => {const toUpdate = {- amount: 1580, // approximately 1000 USD cents+ saleAmount: 1580, // approximately 1000 USD centscurrency: "jpy",};@@ -115,7 +115,7 @@ describe.sequential("/commissions/**", async () => {test("PATCH /commissions/{id} - error on lead commission", async () => {const toUpdate = {- amount: 5000,+ saleAmount: 5000,};const response = await http.patch<CommissionResponse>({@@ -129,7 +129,7 @@ describe.sequential("/commissions/**", async () => {test("PATCH /commissions/{id} - error on paid commission", async () => {const toUpdate = {- amount: 5000,+ saleAmount: 5000,};const response = await http.patch<CommissionResponse>({diff --git a/apps/web/ui/activity-logs/activity-feed.tsx b/apps/web/ui/activity-logs/activity-feed.tsxindex 56412f846e..e74185d470 100644--- a/apps/web/ui/activity-logs/activity-feed.tsx+++ b/apps/web/ui/activity-logs/activity-feed.tsx@@ -5,7 +5,7 @@ import { RewardActivityItem } from "@/ui/activity-logs/reward-activity-item";import { ComponentType } from "react";const ACTIVITY_ITEM_MAP: Record<- ActivityLogResourceType,+ Exclude<ActivityLogResourceType, "commission">,ComponentType<{ log: ActivityLog; isLast?: boolean }>> = {partner: PartnerGroupActivityItem,diff --git a/apps/web/ui/activity-logs/commission-activity.tsx b/apps/web/ui/activity-logs/commission-activity.tsxnew file mode 100644index 0000000000..490405f1c8--- /dev/null+++ b/apps/web/ui/activity-logs/commission-activity.tsx@@ -0,0 +1,264 @@+"use client";++import { useActivityLogs } from "@/lib/swr/use-activity-logs";+import {+ ActivityLog,+ CommissionActivitySnapshot,+ CommissionDetail,+} from "@/lib/types";+import { ActivityEvent } from "@/ui/partners/activity-event";+import { CommissionStatusBadges } from "@/ui/partners/commission-status-badges";+import { CommentCardDisplay } from "@/ui/partners/partner-comments";+import { UserAvatar } from "@/ui/users/user-avatar";+import { InvoiceDollar, StatusBadge } from "@dub/ui";+import { currencyFormatter } from "@dub/utils";+import Link from "next/link";++type CommissionChangeSet = Record<+ string,+ {+ old: CommissionActivitySnapshot | null;+ new: CommissionActivitySnapshot;+ }+>;++function parseChangeSet(log: ActivityLog) {+ const changeSet = log.changeSet as CommissionChangeSet | null;+ const old = changeSet?.commission?.old ?? null;+ const cur = changeSet?.commission?.new ?? null;++ if (!cur) return null;++ const statusChanged =+ old?.status !== cur.status &&+ typeof cur.status === "string" &&+ cur.status in CommissionStatusBadges;++ const amountChanged =+ !statusChanged &&+ (old?.amount !== cur.amount || old?.earnings !== cur.earnings);++ return {+ old,+ cur,+ statusChanged,+ amountChanged,+ newStatus: statusChanged+ ? (cur.status as keyof typeof CommissionStatusBadges)+ : null,+ };+}++export function CommissionActivity({+ commission,+ slug,+}: {+ commission: CommissionDetail;+ slug: string;+}) {+ const { activityLogs, loading } = useActivityLogs({+ enabled: !!commission.id,+ query: {+ resourceType: "commission",+ resourceId: commission.id,+ },+ });++ const createdEvent = {+ key: "created",+ icon: CommissionStatusBadges["pending"].icon,+ timestamp: commission.createdAt,+ note: (() => {+ const text = commission.reward+ ? `Earn ${+ commission.reward.type === "percentage"+ ? `${commission.reward.amountInPercentage ?? 0}%`+ : currencyFormatter(commission.reward.amountInCents ?? 0, {+ trailingZeroDisplay: "stripIfInteger",+ })+ } per ${commission.reward.event}`+ : commission.description ?? null;++ if (!text) return undefined;++ return (+ <CommentCardDisplay timestamp={commission.createdAt} text={text} />+ );+ })(),++ children: (+ <>+ <span className="text-sm text-neutral-700">Commission</span>+ <StatusBadge+ icon={null}+ variant={CommissionStatusBadges["pending"].variant}+ >+ {CommissionStatusBadges["pending"].label}+ </StatusBadge>+ </>+ ),+ };++ if (loading) {+ return (+ <div className="mt-6">+ <h3 className="mb-4 text-base font-medium text-neutral-900">+ Activity+ </h3>+ <div className="flex flex-col gap-4">+ {Array.from({ length: 3 }).map((_, i) => (+ <div key={i} className="flex gap-3">+ <div className="size-6 shrink-0 animate-pulse rounded-full bg-neutral-200" />+ <div className="flex flex-1 flex-col gap-1">+ <div className="h-5 w-3/4 animate-pulse rounded bg-neutral-200" />+ <div className="h-4 w-24 animate-pulse rounded bg-neutral-200" />+ </div>+ </div>+ ))}+ </div>+ </div>+ );+ }++ const fmt = (v: number) =>+ currencyFormatter(v, { trailingZeroDisplay: "stripIfInteger" });++ const logEvents = (activityLogs ?? [])+ .map((log) => {+ const parsed = parseChangeSet(log);+ if (!parsed) return null;++ const { old, cur, statusChanged, amountChanged, newStatus } = parsed;++ const note = log.description ? (+ <CommentCardDisplay timestamp={log.createdAt} text={log.description} />+ ) : undefined;++ const userByline = log.user ? (+ <>+ <span className="text-sm text-neutral-500">by</span>+ <div className="flex h-6 items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1">+ <UserAvatar user={log.user} className="size-4" />+ <span className="text-[13px] text-neutral-700">+ {log.user.name}+ </span>+ </div>+ </>+ ) : null;++ if (statusChanged && newStatus) {+ const badge = CommissionStatusBadges[newStatus];++ return {+ key: log.id,+ icon: badge.icon,+ timestamp: log.createdAt,+ note,+ children: (+ <>+ <span className="text-sm text-neutral-700">+ Status updated to+ </span>+ <StatusBadge icon={null} variant={badge.variant}>+ {badge.label}+ </StatusBadge>+ {newStatus === "processed" && commission.holdingPeriodDays ? (+ <span className="text-sm text-neutral-700">+ after {commission.holdingPeriodDays}-day{" "}+ <a+ href="https://dub.co/help/article/partner-payouts#payout-holding-period"+ target="_blank"+ rel="noopener noreferrer"+ className="cursor-help underline decoration-dotted underline-offset-2"+ >+ holding period+ </a>+ </span>+ ) : null}+ {userByline}+ {newStatus === "paid" && commission.payout?.id ? (+ <Link+ href={`/${slug}/program/payouts/${commission.payout.id}`}+ className="flex h-6 cursor-pointer items-center gap-2 rounded-lg bg-neutral-100 px-2 py-1 transition-colors hover:bg-neutral-200"+ >+ <InvoiceDollar className="size-4 shrink-0 text-neutral-500" />+ <span className="font-mono text-[13px] text-neutral-700">+ {commission.payout.id}+ </span>+ </Link>+ ) : null}+ </>+ ),+ };+ }++ if (amountChanged) {+ const parts: React.ReactNode[] = [];++ if (old?.amount !== cur.amount) {+ parts.push(+ <span key="amount" className="text-sm text-neutral-700">+ Amount changed to+ </span>,+ <span+ key="amount-val"+ className="rounded-md bg-neutral-100 px-2 py-0.5 font-mono text-[13px] text-neutral-700"+ >+ {fmt(old?.amount ?? 0)} → {fmt(cur.amount)}+ </span>,+ );+ }++ if (old?.earnings !== cur.earnings) {+ parts.push(+ <span key="earnings" className="text-sm text-neutral-700">+ Earnings updated+ </span>,+ <span+ key="earnings-val"+ className="rounded-md bg-neutral-100 px-2 py-0.5 font-mono text-[13px] text-neutral-700"+ >+ {fmt(old?.earnings ?? 0)} → {fmt(cur.earnings)}+ </span>,+ );+ }++ return {+ key: log.id,+ icon: InvoiceDollar,+ timestamp: log.createdAt,+ note,+ children: (+ <>+ {parts}+ {userByline}+ </>+ ),+ };+ }++ return null;+ })+ .filter((event): event is NonNullable<typeof event> => event !== null);++ const allEvents = [...logEvents, createdEvent];++ return (+ <div className="mt-6">+ <h3 className="mb-4 text-base font-medium text-neutral-900">Activity</h3>+ <div className="flex flex-col">+ {allEvents.map((event, index) => (+ <ActivityEvent+ key={event.key}+ icon={event.icon}+ timestamp={event.timestamp}+ note={event.note}+ isLast={index === allEvents.length - 1}+ >+ {event.children}+ </ActivityEvent>+ ))}+ </div>+ </div>+ );+}diff --git a/apps/web/ui/partners/bulk-edit-commissions-modal.tsx b/apps/web/ui/partners/bulk-edit-commissions-modal.tsxnew file mode 100644index 0000000000..132329609f--- /dev/null+++ b/apps/web/ui/partners/bulk-edit-commissions-modal.tsx@@ -0,0 +1,200 @@+import { mutatePrefix } from "@/lib/swr/mutate";+import { useApiMutation } from "@/lib/swr/use-api-mutation";+import { CommissionResponse } from "@/lib/types";+import { commissionPatchStatusSchema } from "@/lib/zod/schemas/commissions";+import { Button, Modal } from "@dub/ui";+import { InvoiceDollar } from "@dub/ui/icons";+import { pluralize } from "@dub/utils";+import { useCallback, useEffect, useMemo, useState } from "react";+import { Controller, useForm } from "react-hook-form";+import { toast } from "sonner";+import { CommissionStatusBadges } from "./commission-status-badges";+import { PartnerAvatar } from "./partner-avatar";++type FormData = {+ status: string;+};++interface BulkEditCommissionsModalProps {+ showModal: boolean;+ setShowModal: (show: boolean) => void;+ commissions: CommissionResponse[];+}++function BulkEditCommissionsModal({+ showModal,+ setShowModal,+ commissions,+}: BulkEditCommissionsModalProps) {+ const { makeRequest, isSubmitting } = useApiMutation();++ // Check if all commissions are from the same partner+ const singlePartner = useMemo(() => {+ if (commissions.length === 0) return null;++ const firstPartnerId = commissions[0].partner.id;+ const allSamePartner = commissions.every(+ (c) => c.partner.id === firstPartnerId,+ );++ return allSamePartner ? commissions[0].partner : null;+ }, [commissions]);++ const {+ control,+ handleSubmit,+ reset,+ formState: { isDirty },+ } = useForm<FormData>({+ defaultValues: {+ status: commissions[0]?.status ?? "pending",+ },+ });++ useEffect(() => {+ if (showModal) {+ reset({+ status: commissions[0]?.status ?? "pending",+ });+ }+ }, [showModal, commissions, reset]);++ const onSubmit = async (data: FormData) => {+ await makeRequest("/api/commissions/bulk", {+ method: "PATCH",+ body: {+ commissionIds: commissions.map((c) => c.id),+ status: data.status,+ },+ onSuccess: async () => {+ setShowModal(false);+ await mutatePrefix(["/api/commissions", "/api/payouts"]);+ toast.success(+ `${commissions.length} ${pluralize("commission", commissions.length)} updated successfully!`,+ );+ },+ });+ };++ const statusOptions = commissionPatchStatusSchema.options;++ return (+ <Modal showModal={showModal} setShowModal={setShowModal}>+ <div className="space-y-2 border-b border-neutral-200 px-4 py-4 sm:px-6">+ <h3 className="text-lg font-medium">Edit commissions</h3>+ </div>++ <div className="bg-neutral-50">+ <form+ onSubmit={(e) => {+ e.stopPropagation();+ return handleSubmit(onSubmit)(e);+ }}+ >+ <div className="flex flex-col gap-4 px-4 py-6 text-left sm:px-6">+ <div className="bg rounded-xl border border-neutral-200 bg-white">+ <div className="divide-y divide-neutral-200">+ {singlePartner && (+ <div className="flex items-center gap-3 p-3">+ <PartnerAvatar partner={singlePartner} className="size-7" />+ <h4 className="truncate text-sm font-semibold text-neutral-900">+ {singlePartner.name}+ </h4>+ </div>+ )}+ <div className="flex items-center gap-3 p-3">+ <div className="flex size-7 items-center justify-center rounded-full border border-neutral-200 bg-neutral-100">+ <InvoiceDollar className="text-content-default size-4" />+ </div>+ <span className="text-sm font-semibold text-neutral-900">+ {commissions.length}{" "}+ {pluralize("commission", commissions.length)} selected+ </span>+ </div>+ </div>+ </div>++ <div>+ <label className="text-content-emphasis text-sm font-normal">+ Status+ </label>+ <Controller+ name="status"+ control={control}+ render={({ field }) => (+ <select+ className="mt-2 block w-full rounded-md border-neutral-300 text-neutral-900 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"+ value={field.value}+ onChange={field.onChange}+ >+ {statusOptions.map((status) => {+ const badge = CommissionStatusBadges[status];+ return (+ <option key={status} value={status}>+ {badge?.label ?? status}+ </option>+ );+ })}+ </select>+ )}+ />+ </div>+ </div>++ <div className="flex items-center justify-end border-t border-neutral-200 px-4 py-4 sm:px-6">+ <div className="flex gap-2">+ <Button+ type="button"+ variant="secondary"+ text="Cancel"+ className="h-8 w-fit rounded-lg"+ onClick={() => setShowModal(false)}+ disabled={isSubmitting}+ />+ <Button+ type="submit"+ text="Save"+ className="h-8 w-fit rounded-lg"+ loading={isSubmitting}+ disabled={!isDirty}+ />+ </div>+ </div>+ </form>+ </div>+ </Modal>+ );+}++export function useBulkEditCommissionsModal() {+ const [commissions, setCommissions] = useState<CommissionResponse[]>([]);+ const [showModal, setShowModal] = useState(false);++ const openBulkEditCommissionsModal = useCallback(+ (commissions: CommissionResponse[]) => {+ setCommissions(commissions);+ setShowModal(true);+ },+ [],+ );++ const BulkEditCommissionsModalCallback = useCallback(() => {+ if (!showModal || commissions.length === 0) return null;++ return (+ <BulkEditCommissionsModal+ commissions={commissions}+ showModal={showModal}+ setShowModal={setShowModal}+ />+ );+ }, [showModal, commissions]);++ return useMemo(+ () => ({+ openBulkEditCommissionsModal,+ BulkEditCommissionsModal: BulkEditCommissionsModalCallback,+ }),+ [openBulkEditCommissionsModal, BulkEditCommissionsModalCallback],+ );+}diff --git a/apps/web/ui/partners/commission-row-menu.tsx b/apps/web/ui/partners/commission-row-menu.tsxindex 5fa16c0923..ad877f56a3 100644--- a/apps/web/ui/partners/commission-row-menu.tsx+++ b/apps/web/ui/partners/commission-row-menu.tsx@@ -1,45 +1,22 @@import { CommissionResponse } from "@/lib/types";import { Button, Icon, Popover, useCopyToClipboard } from "@dub/ui";-import {- CircleCheck,- CircleXmark,- Dots,- Duplicate,- InvoiceDollar,- ShieldAlert,-} from "@dub/ui/icons";+import { CircleCheck, Dots, InvoiceDollar, Pen2 } from "@dub/ui/icons";import { cn } from "@dub/utils";import { Row } from "@tanstack/react-table";import { Command } from "cmdk";import { useState } from "react";import { toast } from "sonner";-import { useMarkCommissionDuplicateModal } from "./mark-commission-duplicate-modal";-import { useMarkCommissionFraudOrCanceledModal } from "./mark-commission-fraud-or-canceled-modal";+import { useEditCommissionModal } from "./edit-commission-modal";export function CommissionRowMenu({ row }: { row: Row<CommissionResponse> }) {const [isOpen, setIsOpen] = useState(false);- const {- setShowModal: setShowMarkCommissionDuplicateModal,- MarkCommissionDuplicateModal,- } = useMarkCommissionDuplicateModal({- commission: row.original,- });-- const [commissionStatus, setCommissionStatus] = useState<- "fraud" | "canceled"- >("fraud");-- const { setShowModal, MarkCommissionFraudOrCanceledModal } =- useMarkCommissionFraudOrCanceledModal({- commission: row.original,- status: commissionStatus,- });+ const { openEditCommissionModal, EditCommissionModal } =+ useEditCommissionModal();const [copiedInvoiceId, copyInvoiceIdToClipboard] = useCopyToClipboard();- const showUpdateActions =- row.original.status === "pending" || row.original.status === "processed";+ const showUpdateActions = row.original.status !== "paid";if (!showUpdateActions && !row.original.invoiceId) {return null;@@ -47,8 +24,7 @@ export function CommissionRowMenu({ row }: { row: Row<CommissionResponse> }) {return (<>- <MarkCommissionDuplicateModal />- <MarkCommissionFraudOrCanceledModal />+ <EditCommissionModal /><PopoveropenPopover={isOpen}setOpenPopover={setIsOpen}@@ -58,30 +34,10 @@ export function CommissionRowMenu({ row }: { row: Row<CommissionResponse> }) {{showUpdateActions && (<Command.Group className="p-1.5"><MenuItem- icon={Duplicate}- label="Mark as duplicate"- onSelect={() => {- setShowMarkCommissionDuplicateModal(true);- setIsOpen(false);- }}- />-- <MenuItem- icon={ShieldAlert}- label="Mark as fraud"- onSelect={() => {- setCommissionStatus("fraud");- setShowModal(true);- setIsOpen(false);- }}- />-- <MenuItem- icon={CircleXmark}- label="Mark as canceled"+ icon={Pen2}+ label="Edit commission"onSelect={() => {- setCommissionStatus("canceled");- setShowModal(true);+ openEditCommissionModal(row.original);setIsOpen(false);}}/>diff --git a/apps/web/ui/partners/edit-commission-modal.tsx b/apps/web/ui/partners/edit-commission-modal.tsxnew file mode 100644index 0000000000..e3b898dfd9--- /dev/null+++ b/apps/web/ui/partners/edit-commission-modal.tsx@@ -0,0 +1,333 @@+import { handleMoneyInputChange, handleMoneyKeyDown } from "@/lib/form-utils";+import { mutatePrefix } from "@/lib/swr/mutate";+import { useApiMutation } from "@/lib/swr/use-api-mutation";+import { CommissionResponse } from "@/lib/types";+import { commissionPatchStatusSchema } from "@/lib/zod/schemas/commissions";+import { Button, Combobox, Modal, StatusBadge, Switch } from "@dub/ui";+import { useCallback, useEffect, useMemo, useState } from "react";+import { Controller, useForm } from "react-hook-form";+import { toast } from "sonner";+import * as z from "zod/v4";+import { CommissionStatusBadges } from "./commission-status-badges";+import { PartnerAvatar } from "./partner-avatar";++type FormData = {+ earnings: number | null;+ status: z.infer<typeof commissionPatchStatusSchema>;+ updateHistoricalCommissions: boolean;+};++interface EditCommissionModalProps {+ showModal: boolean;+ setShowModal: (show: boolean) => void;+ commission: CommissionResponse;+}++function EditCommissionModal({+ showModal,+ setShowModal,+ commission,+}: EditCommissionModalProps) {+ const { makeRequest, isSubmitting } = useApiMutation();++ const isCustom = commission.type === "custom";++ const {+ control,+ handleSubmit,+ reset,+ watch,+ formState: { isDirty },+ } = useForm<FormData>({+ defaultValues: {+ earnings: isCustom ? commission.earnings / 100 : null,+ status: commission.status as FormData["status"],+ updateHistoricalCommissions: false,+ },+ });++ const selectedStatus = watch("status");+ const showUpdateHistoricalCommissionsCheckbox =+ (commission.type === "sale" || commission.type === "lead") &&+ (selectedStatus === "fraud" || selectedStatus === "canceled") &&+ selectedStatus !== commission.status;++ useEffect(() => {+ if (showModal) {+ reset({+ earnings: isCustom ? commission.earnings / 100 : null,+ status: commission.status as FormData["status"],+ updateHistoricalCommissions: false,+ });+ }+ }, [showModal, commission, reset, isCustom]);++ const onSubmit = async (data: FormData) => {+ const body: Record<string, any> = {};++ if (data.status !== commission.status) {+ body.status = data.status;+ }++ if (+ showUpdateHistoricalCommissionsCheckbox &&+ data.updateHistoricalCommissions+ ) {+ body.updateHistoricalCommissions = true;+ }++ if (isCustom && data.earnings !== null) {+ const earningsInCents = Math.round(data.earnings * 100);+ if (earningsInCents !== commission.earnings) {+ body.earnings = earningsInCents;+ }+ }++ if (Object.keys(body).length === 0) {+ setShowModal(false);+ return;+ }++ await makeRequest(`/api/commissions/${commission.id}`, {+ method: "PATCH",+ body,+ onSuccess: async () => {+ setShowModal(false);+ await mutatePrefix(["/api/commissions", "/api/payouts"]);+ toast.success("Commission updated successfully!");+ },+ });+ };++ const statusOptions = commissionPatchStatusSchema.options;+ const statusComboboxOptions = useMemo(+ () =>+ statusOptions.map((status) => {+ const badge = CommissionStatusBadges[status];+ const StatusIcon = badge?.icon;+ const statusTextClass = badge?.className+ ?.split(" ")+ .find((className) => className.startsWith("text-"));++ return {+ value: status,+ label: badge?.label ?? status,+ variant: badge?.variant ?? "neutral",+ icon: StatusIcon ? (+ <StatusIcon+ className={`size-4 ${statusTextClass ?? "text-neutral-500"}`}+ />+ ) : undefined,+ };+ }),+ [statusOptions, commission.status],+ );++ const selectedStatusOption = useMemo(+ () =>+ statusComboboxOptions.find((option) => option.value === selectedStatus),+ [statusComboboxOptions, selectedStatus],+ );++ return (+ <Modal showModal={showModal} setShowModal={setShowModal}>+ <div className="space-y-2 border-b border-neutral-200 px-4 py-4 sm:px-6">+ <h3 className="text-lg font-medium">Edit commission</h3>+ </div>++ <div className="bg-neutral-50">+ <form+ onSubmit={(e) => {+ e.stopPropagation();+ return handleSubmit(onSubmit)(e);+ }}+ >+ <div className="flex flex-col gap-4 px-4 py-6 text-left sm:px-6">+ <div className="bg rounded-xl border border-neutral-200 bg-white p-3">+ <div className="flex items-center gap-3">+ <PartnerAvatar+ partner={commission.partner}+ className="size-7"+ />+ <h4 className="truncate text-sm font-semibold text-neutral-900">+ {commission.partner.name}+ </h4>+ </div>+ </div>++ {isCustom && (+ <div>+ <label className="text-content-emphasis text-sm font-normal">+ Earnings+ </label>+ <div className="relative mt-2 rounded-md shadow-sm">+ <span className="absolute inset-y-0 left-0 flex items-center pl-3 text-sm text-neutral-400">+ $+ </span>+ <Controller+ name="earnings"+ control={control}+ rules={{ required: true, min: 0 }}+ render={({ field }) => (+ <input+ type="text"+ inputMode="decimal"+ className="block w-full rounded-md border-neutral-300 pl-6 text-neutral-900 placeholder-neutral-400 focus:border-neutral-500 focus:outline-none focus:ring-neutral-500 sm:text-sm"+ value={field.value ?? ""}+ onChange={(e) => {+ handleMoneyInputChange(e);+ const val = e.target.value;+ field.onChange(val === "" ? null : parseFloat(val));+ }}+ onKeyDown={handleMoneyKeyDown}+ placeholder="0.00"+ />+ )}+ />+ </div>+ </div>+ )}++ <div>+ <label className="text-content-emphasis text-sm font-normal">+ New status+ </label>+ <Controller+ name="status"+ control={control}+ render={({ field }) => (+ <div className="mt-2">+ <Combobox+ options={statusComboboxOptions}+ selected={selectedStatusOption ?? null}+ setSelected={(option) => {+ if (!option) return;+ field.onChange(option.value);+ }}+ placeholder="Select status"+ searchPlaceholder="Search status..."+ matchTriggerWidth+ buttonProps={{+ className:+ "w-full justify-start border-neutral-300 px-3 data-[state=open]:ring-1 data-[state=open]:ring-neutral-500 data-[state=open]:border-neutral-500 focus:ring-1 focus:ring-neutral-500 focus:border-neutral-500 transition-none",+ }}+ >+ {selectedStatusOption ? (+ <span className="flex items-center gap-2">+ {selectedStatusOption.icon}+ <span>{selectedStatusOption.label}</span>+ </span>+ ) : (+ "Select status"+ )}+ </Combobox>+ </div>+ )}+ />+ </div>++ {showUpdateHistoricalCommissionsCheckbox && (+ <Controller+ name="updateHistoricalCommissions"+ control={control}+ render={({ field }) => (+ <div className="rounded-lg border border-neutral-200 bg-white p-3">+ <div className="flex items-start gap-3">+ <div className="mt-1.5">+ <Switch+ fn={(checked) => field.onChange(checked)}+ checked={field.value}+ trackDimensions="w-8 h-4"+ thumbDimensions="w-3 h-3"+ thumbTranslate="translate-x-4"+ />+ </div>+ <div className="flex flex-col gap-1.5">+ <h3 className="text-sm font-medium text-neutral-700">+ Mark all previous commissions for this+ customer-partner pair as{" "}+ <StatusBadge+ className="inline-flex translate-y-px gap-1 px-1 py-0.5 text-xs"+ variant={selectedStatusOption?.variant}+ >+ {selectedStatusOption?.label}+ </StatusBadge>+ </h3>+ <p className="mt-1 text-xs text-neutral-500">+ This will also prevent this partner from receiving+ commissions from this customer in the future.+ </p>+ </div>+ </div>+ </div>+ )}+ />+ )}+ </div>++ <div className="flex items-center justify-end border-t border-neutral-200 px-4 py-4 sm:px-6">+ <div className="flex gap-2">+ <Button+ type="button"+ variant="secondary"+ text="Cancel"+ className="h-8 w-fit rounded-lg"+ onClick={() => setShowModal(false)}+ disabled={isSubmitting}+ />+ <Button+ type="submit"+ text="Save"+ className="h-8 w-fit rounded-lg"+ loading={isSubmitting}+ disabled={!isDirty}+ />+ </div>+ </div>+ </form>+ </div>+ </Modal>+ );+}++export function useEditCommissionModal() {+ const [commission, setCommission] = useState<CommissionResponse | null>(null);++ const openEditCommissionModal = useCallback(+ (commission: CommissionResponse) => {+ setCommission(commission);+ },+ [],+ );++ const closeEditCommissionModal = useCallback(() => {+ setCommission(null);+ }, []);++ const EditCommissionModalCallback = useCallback(() => {+ if (!commission) return null;++ return (+ <EditCommissionModal+ commission={commission}+ showModal+ setShowModal={(show) => {+ if (!show) closeEditCommissionModal();+ }}+ />+ );+ }, [commission, closeEditCommissionModal]);++ return useMemo(+ () => ({+ openEditCommissionModal,+ closeEditCommissionModal,+ EditCommissionModal: EditCommissionModalCallback,+ }),+ [+ openEditCommissionModal,+ closeEditCommissionModal,+ EditCommissionModalCallback,+ ],+ );+}diff --git a/apps/web/ui/partners/mark-commission-duplicate-modal.tsx b/apps/web/ui/partners/mark-commission-duplicate-modal.tsxdeleted file mode 100644index 9346cdd809..0000000000--- a/apps/web/ui/partners/mark-commission-duplicate-modal.tsx+++ /dev/null@@ -1,183 +0,0 @@-import { markCommissionDuplicateAction } from "@/lib/actions/partners/mark-commission-duplicate";-import { mutatePrefix } from "@/lib/swr/mutate";-import useWorkspace from "@/lib/swr/use-workspace";-import { CommissionResponse } from "@/lib/types";-import { Button, Modal, StatusBadge } from "@dub/ui";-import { currencyFormatter, nFormatter } from "@dub/utils";-import { useAction } from "next-safe-action/hooks";-import React, { useCallback, useMemo, useState } from "react";-import { toast } from "sonner";-import { CustomerRowItem } from "../customers/customer-row-item";-import { CommissionStatusBadges } from "./commission-status-badges";-import { CommissionTypeBadge } from "./commission-type-badge";-import { PartnerRowItem } from "./partner-row-item";--interface ModalProps {- showModal: boolean;- setShowModal: (show: boolean) => void;- commission: CommissionResponse;-}--function MarkCommissionDuplicateModal({- showModal,- setShowModal,- commission,-}: ModalProps) {- return (- <Modal showModal={showModal} setShowModal={setShowModal}>- <ModalInner setShowModal={setShowModal} commission={commission} />- </Modal>- );-}--function ModalInner({- setShowModal,- commission,-}: Omit<ModalProps, "showModal">) {- const { id: workspaceId } = useWorkspace();-- const { executeAsync, isExecuting, hasSucceeded } = useAction(- markCommissionDuplicateAction,- {- onSuccess: async () => {- toast.success("Successfully marked commission as duplicate.");- await mutatePrefix(["/api/commissions", "/api/payouts"]);- setShowModal(false);- },- onError: () => {- toast.error("Failed to update commission status.");- },- },- );-- const commissionItem = useMemo(() => {- const badge = CommissionStatusBadges[commission.status];-- return {- Date: new Date(commission.createdAt).toLocaleString(undefined, {- month: "short",- day: "numeric",- hour: "2-digit",- minute: "2-digit",- }),-- ...(commission.customer- ? {- Customer: (- <CustomerRowItem- customer={commission.customer!}- avatarClassName="size-5"- />- ),- }- : {}),-- Partner: (- <PartnerRowItem partner={commission.partner!} showPermalink={false} />- ),-- Type: <CommissionTypeBadge type={commission.type!} />,-- Amount:- commission.type === "sale"- ? currencyFormatter(commission.amount)- : nFormatter(commission.quantity),-- Commission: currencyFormatter(commission.earnings),-- Status: (- <StatusBadge icon={null} variant={badge.variant}>- {badge.label}- </StatusBadge>- ),- };- }, [commission]);-- return (- <>- <div className="space-y-2 border-b border-neutral-200 p-4 sm:p-6">- <h3 className="text-lg font-medium leading-none">- Mark commission as duplicate- </h3>- </div>-- <div className="flex flex-col space-y-6 bg-neutral-50 p-6">- <div className="rounded-lg border border-red-200 bg-red-50 p-4">- <div className="text-sm text-red-900">- <span className="font-bold">Warning:</span> This will mark the- commission as duplicate and remove it from any upcoming payouts.- This action cannot be undone.- </div>- </div>-- <div className="rounded-lg border border-neutral-200 bg-white p-4 sm:p-6">- <div className="grid grid-cols-3 gap-y-4">- {Object.entries(commissionItem).map(([key, value]) => (- <React.Fragment key={key}>- <div className="text-sm font-medium text-neutral-500">- {key}- </div>- <div className="col-span-2 text-sm font-medium text-neutral-800">- {value}- </div>- </React.Fragment>- ))}- </div>- </div>- </div>-- <div className="flex items-center justify-between border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">- <Button- onClick={() => setShowModal(false)}- variant="secondary"- text="Cancel"- className="h-8 w-fit px-3"- disabled={isExecuting}- />- <Button- onClick={async () => {- if (!workspaceId) {- return;- }-- await executeAsync({- workspaceId,- commissionId: commission.id,- });- }}- autoFocus- variant="danger"- loading={isExecuting || hasSucceeded}- text="Mark as duplicate"- className="h-8 w-fit px-3"- />- </div>- </>- );-}--export function useMarkCommissionDuplicateModal({- commission,-}: {- commission: CommissionResponse;-}) {- const [showModal, setShowModal] = useState(false);-- const ModalCallback = useCallback(() => {- return (- <MarkCommissionDuplicateModal- showModal={showModal}- setShowModal={setShowModal}- commission={commission}- />- );- }, [showModal, setShowModal, commission]);-- return useMemo(- () => ({- setShowModal,- MarkCommissionDuplicateModal: ModalCallback,- }),- [setShowModal, ModalCallback],- );-}diff --git a/apps/web/ui/partners/mark-commission-fraud-or-canceled-modal.tsx b/apps/web/ui/partners/mark-commission-fraud-or-canceled-modal.tsxdeleted file mode 100644index beb2cdfd73..0000000000--- a/apps/web/ui/partners/mark-commission-fraud-or-canceled-modal.tsx+++ /dev/null@@ -1,197 +0,0 @@-import { markCommissionFraudOrCanceledAction } from "@/lib/actions/partners/mark-commission-fraud-or-canceled";-import { mutatePrefix } from "@/lib/swr/mutate";-import useWorkspace from "@/lib/swr/use-workspace";-import { CommissionResponse } from "@/lib/types";-import { Button, Modal, StatusBadge } from "@dub/ui";-import { currencyFormatter, nFormatter } from "@dub/utils";-import { useAction } from "next-safe-action/hooks";-import React, { useCallback, useMemo, useState } from "react";-import { toast } from "sonner";-import { CustomerRowItem } from "../customers/customer-row-item";-import { CommissionStatusBadges } from "./commission-status-badges";-import { CommissionTypeBadge } from "./commission-type-badge";-import { PartnerRowItem } from "./partner-row-item";--interface ModalProps {- showModal: boolean;- setShowModal: (show: boolean) => void;- commission: CommissionResponse;- status: "fraud" | "canceled";-}--function MarkCommissionFraudOrCanceledModal({- showModal,- setShowModal,- commission,- status,-}: ModalProps) {- return (- <Modal showModal={showModal} setShowModal={setShowModal}>- <ModalInner- setShowModal={setShowModal}- commission={commission}- status={status}- />- </Modal>- );-}--function ModalInner({- setShowModal,- commission,- status,-}: Omit<ModalProps, "showModal">) {- const { id: workspaceId } = useWorkspace();-- const { executeAsync, isExecuting, hasSucceeded } = useAction(- markCommissionFraudOrCanceledAction,- {- onSuccess: async () => {- toast.success(`Commission marked as ${status} successfully!`);- await mutatePrefix(["/api/commissions", "/api/payouts"]);- setShowModal(false);- },- onError: () => {- toast.error("Failed to update commission status.");- },- },- );-- const commissionItem = useMemo(() => {- const badge = CommissionStatusBadges[commission.status];-- return {- Date: new Date(commission.createdAt).toLocaleString(undefined, {- month: "short",- day: "numeric",- hour: "2-digit",- minute: "2-digit",- }),-- ...(commission.customer- ? {- Customer: (- <CustomerRowItem- customer={commission.customer}- avatarClassName="size-5"- />- ),- }- : {}),-- Partner: (- <PartnerRowItem partner={commission.partner!} showPermalink={false} />- ),-- Type: <CommissionTypeBadge type={commission.type!} />,-- Amount:- commission.type === "sale"- ? currencyFormatter(commission.amount)- : nFormatter(commission.quantity),-- Commission: currencyFormatter(commission.earnings),-- Status: (- <StatusBadge icon={null} variant={badge.variant}>- {badge.label}- </StatusBadge>- ),- };- }, [commission]);-- return (- <>- <div className="space-y-2 border-b border-neutral-200 p-4 sm:p-6">- <h3 className="text-lg font-medium leading-none">- Mark commission as {status}- </h3>- </div>-- <div className="flex flex-col space-y-6 bg-neutral-50 p-6">- <div className="rounded-lg border border-red-200 bg-red-50 p-4">- <div className="text-sm text-red-900">- <span className="font-bold">Warning:</span> This will mark{" "}- {commission.type === "custom" || commission.type === "click"- ? "this commission"- : "all future and past commissions for this customer and partner combination"}{" "}- as {status}. This action cannot be undone – please proceed with- caution.- </div>- </div>-- <div className="rounded-lg border border-neutral-200 bg-white p-4 sm:p-6">- <div className="grid grid-cols-3 gap-y-4">- {Object.entries(commissionItem).map(([key, value]) => (- <React.Fragment key={key}>- <div className="text-sm font-medium text-neutral-500">- {key}- </div>- <div className="col-span-2 text-sm font-medium text-neutral-800">- {value}- </div>- </React.Fragment>- ))}- </div>- </div>- </div>-- <div className="flex items-center justify-between border-t border-neutral-200 bg-neutral-50 px-4 py-5 sm:px-6">- <Button- onClick={() => setShowModal(false)}- variant="secondary"- text="Cancel"- className="h-8 w-fit px-3"- disabled={isExecuting}- />- <Button- onClick={async () => {- if (!workspaceId) {- return;- }-- await executeAsync({- workspaceId,- commissionId: commission.id,- status,- });- }}- autoFocus- variant="danger"- loading={isExecuting || hasSucceeded}- text={`Mark as ${status}`}- className="h-8 w-fit px-3"- />- </div>- </>- );-}--export function useMarkCommissionFraudOrCanceledModal({- commission,- status,-}: {- commission: CommissionResponse;- status: "fraud" | "canceled";-}) {- const [showModal, setShowModal] = useState(false);-- const ModalCallback = useCallback(() => {- return (- <MarkCommissionFraudOrCanceledModal- showModal={showModal}- setShowModal={setShowModal}- commission={commission}- status={status}- />- );- }, [showModal, setShowModal, commission, status]);-- return useMemo(- () => ({- setShowModal,- MarkCommissionFraudOrCanceledModal: ModalCallback,- }),- [setShowModal, ModalCallback],- );-}diff --git a/apps/web/ui/partners/partner-comments.tsx b/apps/web/ui/partners/partner-comments.tsxindex 34d89a408f..1c3e9c82a0 100644--- a/apps/web/ui/partners/partner-comments.tsx+++ b/apps/web/ui/partners/partner-comments.tsx@@ -410,7 +410,7 @@ export function CommentCardDisplay({return (<divclassName={cn(- "border-border-subtle rounded-xl border pl-4 pr-3.5 shadow-sm",+ "border-border-subtle rounded-lg border pl-4 pr-3.5",user ? "pb-4 pt-2.5" : "px-3 py-2",className,)}