Skip to content

armgit / dub

Public Imported from GitHub
0

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

add back excluded commissions in confirm payouts sheet

Steven Tey79c70fb7c833
diff --git a/apps/web/lib/swr/use-commissions-count.ts b/apps/web/lib/swr/use-commissions-count.ts
index eb02c87f09..62eb9aa4d6 100644
--- a/apps/web/lib/swr/use-commissions-count.ts
+++ b/apps/web/lib/swr/use-commissions-count.ts
@@ -13,10 +13,11 @@ export default function useCommissionsCount(opts?: Record<string, any>) {
{
workspaceId,
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+ ...opts,
},
{
- ...opts,
- exclude: opts?.exclude || [],
+ ...(opts?.include ? { include: opts.include } : {}),
+ ...(opts?.exclude ? { exclude: opts.exclude } : {}),
},
)}`,
fetcher,
diff --git a/apps/web/ui/partners/confirm-payouts-sheet.tsx b/apps/web/ui/partners/confirm-payouts-sheet.tsx
index 82a1499dec..44cd24c3d1 100644
--- a/apps/web/ui/partners/confirm-payouts-sheet.tsx
+++ b/apps/web/ui/partners/confirm-payouts-sheet.tsx
@@ -19,6 +19,7 @@ import {
calculatePayoutFeeForMethod,
STRIPE_PAYMENT_METHODS,
} from "@/lib/stripe/payment-methods";
+import useCommissionsCount from "@/lib/swr/use-commissions-count";
import usePaymentMethods from "@/lib/swr/use-payment-methods";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
@@ -49,6 +50,7 @@ import {
fetcher,
formatDate,
nFormatter,
+ pluralize,
truncate,
} from "@dub/utils";
import { useAction } from "next-safe-action/hooks";
@@ -239,6 +241,15 @@ function ConfirmPayoutsSheetContent() {
[isExplicitSelectionMode, resolvedSelectedPayoutIds.length],
);
+ const { commissionsCount } = useCommissionsCount({
+ include: [],
+ // for explicitly selected payouts, filter by the payouts for those partners
+ ...(isExplicitSelectionMode &&
+ payoutsIncludedInInvoice && {
+ partnerId: payoutsIncludedInInvoice.map((p) => p.partner.id).join(","),
+ }),
+ });
+
const { executeAsync: confirmPayouts } = useAction(confirmPayoutsAction, {
onError: ({ error }) => {
const PAYOUT_ERROR_MAP = {
@@ -923,6 +934,34 @@ function ConfirmPayoutsSheetContent() {
)
}
/>
+ {commissionsCount && commissionsCount.hold.count > 0 && (
+ <div className="flex items-center justify-center gap-2 text-sm text-neutral-600">
+ <span>
+ Excluding{" "}
+ <span className="font-medium text-neutral-800">
+ {nFormatter(commissionsCount.hold.count, { full: true })}
+ </span>
+ {` on hold ${pluralize("commission", commissionsCount.hold.count)} `}
+ <span className="font-medium text-neutral-800">
+ (
+ {currencyFormatter(commissionsCount.hold.earnings, {
+ trailingZeroDisplay: "stripIfInteger",
+ })}
+ )
+ </span>
+ </span>
+ <a
+ href={`/${slug}/program/commissions?status=hold`}
+ target="_blank"
+ >
+ <Button
+ variant="secondary"
+ text="Review"
+ className="h-7 w-fit cursor-alias rounded-md border border-neutral-200 px-2 text-sm"
+ />
+ </a>
+ </div>
+ )}
</div>
</div>
);