@@ -172,19 +190,84 @@ export function PayoutStats() { const topRowStats = payoutStats.slice(0, 3); const bottomRowStats = payoutStats.slice(3); + const { executeAsync: executeForceWithdrawal } = useAction( + forceWithdrawalAction, + { + onSuccess: () => { + toast.success("Withdrawal initiated successfully"); + }, + onError: ({ error }) => { + toast.error(error.serverError || "Failed to initiate withdrawal"); + }, + }, + ); + + const processedPayoutAmountInUsd = currencyFormatter( + payoutStatusMap?.processed?.amount / 100, + { + trailingZeroDisplay: "stripIfInteger", + }, + ); + + const { + confirmModal: forceWithdrawalModal, + setShowConfirmModal: setShowForceWithdrawalModal, + } = useConfirmModal({ + title: "Pay out funds instantly", + description: ( + <> + Since your total processed earnings ( + {processedPayoutAmountInUsd}) + are below the minimum requirement of{" "} + + {currencyFormatter(MIN_WITHDRAWAL_AMOUNT_CENTS / 100, { + trailingZeroDisplay: "stripIfInteger", + })} + + , you will be charged a fee of{" "} + + {currencyFormatter(BELOW_MIN_WITHDRAWAL_FEE_CENTS / 100)} + {" "} + for this payout, which means you will receive{" "} + + {currencyFormatter( + (payoutStatusMap?.processed?.amount - + BELOW_MIN_WITHDRAWAL_FEE_CENTS) / + 100, + { trailingZeroDisplay: "stripIfInteger" }, + )} + + . + + ), + onConfirm: async () => { + await executeForceWithdrawal(); + }, + confirmText: `Pay out ${processedPayoutAmountInUsd}`, + }); + return ( <> + {forceWithdrawalModal} {/* Mobile: 3 on top, 2 on bottom */}

{topRowStats.map((stat) => ( - + ))}

{bottomRowStats.length > 0 && (

{bottomRowStats.map((stat) => ( - + ))}

)} @@ -198,7 +281,11 @@ export function PayoutStats() { )} > {payoutStats.map((stat) => ( - + ))}

diff --git a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx index 93301e6a6d4..0aa5cd58b74 100644 --- a/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx +++ b/apps/web/app/(ee)/partners.dub.co/(dashboard)/payouts/payout-table.tsx @@ -38,6 +38,7 @@ export function PayoutTable() { const { payouts, error, loading } = usePartnerPayouts(); const { payoutsCount } = usePartnerPayoutsCount(); + const { filters, activeFilters, onSelect, onRemove, onRemoveAll } = usePayoutFilters(); @@ -185,13 +186,15 @@ export function PayoutTable() { )}

- +

+ +

{activeFilters.length > 0 && ( diff --git a/apps/web/lib/actions/partners/force-withdrawal.ts b/apps/web/lib/actions/partners/force-withdrawal.ts new file mode 100644 index 00000000000..53ec61c7768 --- /dev/null +++ b/apps/web/lib/actions/partners/force-withdrawal.ts @@ -0,0 +1,62 @@ +"use server"; + +import { throwIfNoPermission } from "@/lib/auth/partner-user-permissions"; +import { createStripeTransfer } from "@/lib/partners/create-stripe-transfer"; +import { ratelimit } from "@/lib/upstash"; +import { prisma } from "@dub/prisma"; +import { authPartnerActionClient } from "../safe-action"; + +// Force a withdrawal for a partner (even if the total amount is below the minimum withdrawal amount) +export const forceWithdrawalAction = authPartnerActionClient.action( + async ({ ctx }) => { + const { partner, partnerUser } = ctx; + + throwIfNoPermission({ + role: partnerUser.role, + permission: "payout_settings.update", + }); + + if (!partner.payoutsEnabledAt || !partner.stripeConnectId) { + throw new Error( + "You haven't enabled payouts yet. Please enable payouts in your payout settings.", + ); + } + + const { success } = await ratelimit(5, "24 h").limit( + `force-withdrawal:${partner.id}`, + ); + + if (!success) { + throw new Error( + "You've reached the maximum number of retry attempts for the past 24 hours. Please wait and try again later.", + ); + } + + const previouslyProcessedPayouts = await prisma.payout.findMany({ + where: { + partnerId: partner.id, + status: "processed", + stripeTransferId: null, + }, + include: { + program: { + select: { + name: true, + }, + }, + }, + }); + + try { + await createStripeTransfer({ + partner, + previouslyProcessedPayouts, + forceWithdrawal: true, + }); + } catch (error) { + throw new Error( + "Failed to force withdrawal. Please try again or contact support.", + ); + } + }, +); diff --git a/apps/web/lib/actions/partners/update-partner-payout-settings.ts b/apps/web/lib/actions/partners/update-partner-payout-settings.ts index e15ad868adc..a0946723e43 100644 --- a/apps/web/lib/actions/partners/update-partner-payout-settings.ts +++ b/apps/web/lib/actions/partners/update-partner-payout-settings.ts @@ -1,10 +1,8 @@ "use server"; import { throwIfNoPermission } from "@/lib/auth/partner-user-permissions"; -import { createStripeTransfer } from "@/lib/partners/create-stripe-transfer"; import { prisma } from "@dub/prisma"; import { Prisma } from "@prisma/client"; -import { waitUntil } from "@vercel/functions"; import { partnerPayoutSettingsSchema } from "../../zod/schemas/partners"; import { authPartnerActionClient } from "../safe-action"; @@ -13,7 +11,7 @@ export const updatePartnerPayoutSettingsAction = authPartnerActionClient .schema(partnerPayoutSettingsSchema) .action(async ({ ctx, parsedInput }) => { const { partner, partnerUser } = ctx; - const { companyName, address, taxId, minWithdrawalAmount } = parsedInput; + const { companyName, address, taxId } = parsedInput; throwIfNoPermission({ role: partnerUser.role, @@ -25,48 +23,13 @@ export const updatePartnerPayoutSettingsAction = authPartnerActionClient taxId: taxId || undefined, } as Prisma.JsonObject; - const updatedPartner = await prisma.partner.update({ + await prisma.partner.update({ where: { id: partner.id, }, data: { companyName, invoiceSettings, - minWithdrawalAmount, }, }); - - waitUntil( - (async () => { - // if the partner has verified Stripe payouts set up and the minimum withdrawal amount has changed, - // we need to create a Stripe transfer for the previously processed payouts (if any are present) - if ( - updatedPartner.stripeConnectId && - updatedPartner.payoutsEnabledAt && - updatedPartner.minWithdrawalAmount !== partner.minWithdrawalAmount - ) { - const previouslyProcessedPayouts = await prisma.payout.findMany({ - where: { - partnerId: updatedPartner.id, - status: "processed", - stripeTransferId: null, - }, - include: { - program: { - select: { - name: true, - }, - }, - }, - }); - - if (previouslyProcessedPayouts.length > 0) { - await createStripeTransfer({ - partner: updatedPartner, - previouslyProcessedPayouts, - }); - } - } - })(), - ); }); diff --git a/apps/web/lib/partners/constants.ts b/apps/web/lib/partners/constants.ts index e27fd714648..a7e160c57fc 100644 --- a/apps/web/lib/partners/constants.ts +++ b/apps/web/lib/partners/constants.ts @@ -8,8 +8,8 @@ export const REFERRALS_EMBED_EARNINGS_LIMIT = 8; export const CUSTOMER_PAGE_EVENTS_LIMIT = 8; export const PAYOUT_FAILURE_FEE_CENTS = 1000; // 10 USD export const FOREX_MARKUP_RATE = 0.005; // 0.5% -export const MIN_WITHDRAWAL_AMOUNT_CENTS = 10000; // $100 -export const BELOW_MIN_WITHDRAWAL_FEE_CENTS = 200; // $2 +export const MIN_WITHDRAWAL_AMOUNT_CENTS = 1000; // $10 +export const BELOW_MIN_WITHDRAWAL_FEE_CENTS = 50; // $0.50 export const FAST_ACH_FEE_CENTS = 2500; // $25 export const ALLOWED_MIN_WITHDRAWAL_AMOUNTS = [1000, 2500, 5000, 7500, 10000]; diff --git a/apps/web/lib/partners/create-stripe-transfer.ts b/apps/web/lib/partners/create-stripe-transfer.ts index 7c7c734d5b6..c9bbf2c03b5 100644 --- a/apps/web/lib/partners/create-stripe-transfer.ts +++ b/apps/web/lib/partners/create-stripe-transfer.ts @@ -18,11 +18,13 @@ export const createStripeTransfer = async ({ previouslyProcessedPayouts, currentInvoicePayouts, chargeId, + forceWithdrawal = false, }: { - partner: Pick; + partner: Pick; previouslyProcessedPayouts: PayoutWithProgramName[]; currentInvoicePayouts?: PayoutWithProgramName[]; chargeId?: string; + forceWithdrawal?: boolean; }) => { // this should never happen since we guard for it outside, but just in case if (!partner.stripeConnectId) { @@ -52,31 +54,33 @@ export const createStripeTransfer = async ({ 0, ); - // If the total transferable amount is less than the partner's minimum withdrawal amount - // we only update status for all the partner payouts for the current invoice (if any) to "processed" – no need to create a transfer for now - if (totalTransferableAmount < partner.minWithdrawalAmount) { - if (currentInvoicePayouts) { - await prisma.payout.updateMany({ - where: { - id: { - in: currentInvoicePayouts.map((p) => p.id), + // If the total transferable amount is less than the minimum withdrawal amount + if (totalTransferableAmount < MIN_WITHDRAWAL_AMOUNT_CENTS) { + // if we're not forcing a withdrawal + if (!forceWithdrawal) { + // we need to update current invoice payouts to "processed" status + if (currentInvoicePayouts) { + await prisma.payout.updateMany({ + where: { + id: { + in: currentInvoicePayouts.map((p) => p.id), + }, }, - }, - data: { - status: "processed", - }, - }); - } + data: { + status: "processed", + }, + }); + } - console.log( - `Total processed payouts (${currencyFormatter(totalTransferableAmount / 100)}) for partner ${partner.id} are below the minWithdrawalAmount (${currencyFormatter(partner.minWithdrawalAmount / 100)}), skipping...`, - ); + console.log( + `Total processed payouts (${currencyFormatter(totalTransferableAmount / 100)}) for partner ${partner.id} are below ${currencyFormatter(MIN_WITHDRAWAL_AMOUNT_CENTS / 100)}, skipping...`, + ); - return; - } + // skip creating a transfer + return; + } - // Decide if we need to charge a withdrawal fee for the partner - if (partner.minWithdrawalAmount < MIN_WITHDRAWAL_AMOUNT_CENTS) { + // else, if we're forcing a withdrawal, we need to charge a withdrawal fee withdrawalFee = BELOW_MIN_WITHDRAWAL_FEE_CENTS; } diff --git a/apps/web/lib/zod/schemas/partners.ts b/apps/web/lib/zod/schemas/partners.ts index 1978556b67c..6df863c9d41 100644 --- a/apps/web/lib/zod/schemas/partners.ts +++ b/apps/web/lib/zod/schemas/partners.ts @@ -1,4 +1,3 @@ -import { ALLOWED_MIN_WITHDRAWAL_AMOUNTS } from "@/lib/partners/constants"; import { IndustryInterest, MonthlyTraffic, @@ -9,11 +8,7 @@ import { ProgramEnrollmentStatus, SalesChannel, } from "@dub/prisma/client"; -import { - COUNTRY_CODES, - currencyFormatter, - GOOGLE_FAVICON_URL, -} from "@dub/utils"; +import { COUNTRY_CODES, GOOGLE_FAVICON_URL } from "@dub/utils"; import { z } from "zod"; import { analyticsQuerySchema } from "./analytics"; import { analyticsResponse } from "./analytics-response"; @@ -320,9 +315,6 @@ export const PartnerSchema = z }) .nullable() .describe("The partner's invoice settings."), - minWithdrawalAmount: z - .number() - .describe("The minimum withdrawal amount in cents."), createdAt: z .date() .describe("The date when the partner was created on Dub."), @@ -764,11 +756,4 @@ export const partnerPayoutSettingsSchema = z.object({ companyName: z.string().max(190).trim().nullish(), address: z.string().max(500).trim().nullish(), taxId: z.string().max(100).trim().nullish(), - minWithdrawalAmount: z.coerce - .number() - .min(1000, "Minimum withdrawal amount must be greater than $10.") - .default(10000) - .refine((val) => ALLOWED_MIN_WITHDRAWAL_AMOUNTS.includes(val), { - message: `Minimum withdrawal amount must be one of ${ALLOWED_MIN_WITHDRAWAL_AMOUNTS.map((amount) => currencyFormatter(amount / 100)).join(", ")}`, - }), }); diff --git a/apps/web/ui/partners/payout-row-menu.tsx b/apps/web/ui/partners/payout-row-menu.tsx index 0ca22a803ba..9b52f4ba9ce 100644 --- a/apps/web/ui/partners/payout-row-menu.tsx +++ b/apps/web/ui/partners/payout-row-menu.tsx @@ -1,5 +1,6 @@ import { retryFailedPaypalPayoutsAction } from "@/lib/actions/partners/retry-failed-paypal-payouts"; import { PartnerPayoutResponse } from "@/lib/types"; +import { useConfirmModal } from "@/ui/modals/confirm-modal"; import { Button, Icon, Popover } from "@dub/ui"; import { Dots, Refresh2 } from "@dub/ui/icons"; import { cn } from "@dub/utils"; @@ -12,9 +13,8 @@ import { toast } from "sonner"; export function PayoutRowMenu({ row }: { row: Row }) { const [isOpen, setIsOpen] = useState(false); - const { executeAsync, isPending } = useAction( - retryFailedPaypalPayoutsAction, - { + const { executeAsync: executeRetryPayout, isPending: isRetryPayoutPending } = + useAction(retryFailedPaypalPayoutsAction, { onSuccess: () => { toast.success("Payout retry initiated successfully"); setIsOpen(false); @@ -22,8 +22,22 @@ export function PayoutRowMenu({ row }: { row: Row }) { onError: (error) => { toast.error(error.error.serverError || "Failed to retry payout"); }, + }); + + const { + confirmModal: retryPayoutModal, + setShowConfirmModal: setShowRetryPayoutModal, + } = useConfirmModal({ + title: "Retry payout", + description: + "You're limited to 5 retry attempts per day. Please ensure your PayPal account is configured correctly before trying again.", + onConfirm: async () => { + await executeRetryPayout({ + payoutId: row.original.id, + }); }, - ); + confirmText: "Retry payout", + }); const canRetry = row.original.status === "failed"; @@ -31,47 +45,39 @@ export function PayoutRowMenu({ row }: { row: Row }) { return null; } - const retryPayout = async () => { - if ( - window.confirm( - "You're limited to 5 retry attempts per day. Please ensure your PayPal account is configured correctly before trying again.", - ) - ) { - await executeAsync({ - payoutId: row.original.id, - }); - } - }; - return ( - - - {canRetry && ( + <> + + { + setShowRetryPayoutModal(true); + setIsOpen(false); + }} + disabled={isRetryPayoutPending} /> - )} - - - } - align="end" - > -

- Minimum withdrawal amount -