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.

improve invoice status program owner

Steven Teyab457d516bc6
diff --git a/apps/web/app/(ee)/app.dub.co/invoices/[invoiceId]/route.tsx b/apps/web/app/(ee)/app.dub.co/invoices/[invoiceId]/route.tsx
index 32d632a34c..710c02063a 100644
--- a/apps/web/app/(ee)/app.dub.co/invoices/[invoiceId]/route.tsx
+++ b/apps/web/app/(ee)/app.dub.co/invoices/[invoiceId]/route.tsx
@@ -1,6 +1,5 @@
import { DubApiError } from "@/lib/api/errors";
import { withSession } from "@/lib/auth";
-import { INVOICE_AVAILABLE_PAYOUT_STATUSES } from "@/lib/constants/payouts";
import { prisma } from "@dub/prisma";
import { DomainRenewalInvoice } from "./domain-renewal-invoice";
import { PartnerPayoutInvoice } from "./partner-payout-invoice";
@@ -26,10 +25,11 @@ export const GET = withSession(async ({ session, params }) => {
},
});
- if (!INVOICE_AVAILABLE_PAYOUT_STATUSES.includes(invoice.status)) {
+ if (invoice.status === "failed") {
throw new DubApiError({
code: "bad_request",
- message: "This invoice is not available for download.",
+ message:
+ "This invoice is not available for download since the payment failed.",
});
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-details-sheet.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-details-sheet.tsx
index 04ebfbd061..97acf64625 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-details-sheet.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/payouts/payout-details-sheet.tsx
@@ -1,8 +1,5 @@
-import {
- INVOICE_AVAILABLE_PAYOUT_STATUSES,
- PAYOUTS_SHEET_ITEMS_LIMIT,
-} from "@/lib/constants/payouts";
import { clientAccessCheck } from "@/lib/client-access-check";
+import { PAYOUTS_SHEET_ITEMS_LIMIT } from "@/lib/constants/payouts";
import useWorkspace from "@/lib/swr/use-workspace";
import { CommissionResponse, PayoutResponse } from "@/lib/types";
import { CommissionTypeIcon } from "@/ui/partners/comission-type-icon";
@@ -143,21 +140,20 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
</Tooltip>
)}
- {payout.mode === "internal" &&
- INVOICE_AVAILABLE_PAYOUT_STATUSES.includes(payout.status) && (
- <Tooltip content="View invoice">
- <div className="flex h-5 w-5 items-center justify-center rounded-md transition-colors duration-150 hover:border hover:border-neutral-200 hover:bg-neutral-100">
- <Link
- href={`${APP_DOMAIN}/invoices/${payout.invoiceId || payout.id}`}
- className="text-neutral-700"
- target="_blank"
- rel="noopener noreferrer"
- >
- <InvoiceDollar className="size-4" />
- </Link>
- </div>
- </Tooltip>
- )}
+ {payout.mode === "internal" && payout.status !== "failed" && (
+ <Tooltip content="View invoice">
+ <div className="flex h-5 w-5 items-center justify-center rounded-md transition-colors duration-150 hover:border hover:border-neutral-200 hover:bg-neutral-100">
+ <Link
+ href={`${APP_DOMAIN}/invoices/${payout.invoiceId || payout.id}`}
+ className="text-neutral-700"
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ <InvoiceDollar className="size-4" />
+ </Link>
+ </div>
+ </Tooltip>
+ )}
</div>
),
@@ -333,9 +329,7 @@ function PayoutDetailsSheetContent({ payout }: PayoutDetailsSheetProps) {
disabledTooltip={
!payout.partner.payoutsEnabledAt
? "This partner has not [connected a bank account](https://dub.co/help/article/receiving-payouts) to receive payouts yet, which means they won't be able to receive payouts from your program."
- : (
- permissionsError || undefined
- )
+ : permissionsError || undefined
}
onClick={() => {
queryParams({
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx
index 829886f1ce..cbc0316026 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page-client.tsx
@@ -1,22 +1,20 @@
"use client";
-import {
- INVOICE_AVAILABLE_PAYOUT_STATUSES,
- INVOICE_PAYMENT_METHODS,
-} from "@/lib/constants/payouts";
+import { INVOICE_PAYMENT_METHODS } from "@/lib/constants/payouts";
import useWorkspace from "@/lib/swr/use-workspace";
import { InvoiceProps } from "@/lib/types";
import { PayoutStatusBadges } from "@/ui/partners/payout-status-badges";
import { AnimatedEmptyState } from "@/ui/shared/animated-empty-state";
import {
- Button,
buttonVariants,
+ DynamicTooltipWrapper,
Receipt2,
StatusBadge,
TabSelect,
useRouterStuff,
} from "@dub/ui";
import { cn, currencyFormatter, fetcher } from "@dub/utils";
+import { AlertCircle } from "lucide-react";
import { useMemo } from "react";
import useSWR from "swr";
@@ -130,9 +128,7 @@ const InvoiceCard = ({
</div>
</div>
<div className="flex items-center">
- {invoice.pdfUrl &&
- (!invoice.status ||
- INVOICE_AVAILABLE_PAYOUT_STATUSES.includes(invoice.status)) ? (
+ {invoice.pdfUrl && invoice.status !== "failed" ? (
<a
href={invoice.pdfUrl}
target="_blank"
@@ -144,16 +140,7 @@ const InvoiceCard = ({
<span>View invoice</span>
</a>
) : (
- <Button
- className="h-9 w-fit px-3"
- variant="secondary"
- text="View invoice"
- disabled
- disabledTooltip={
- invoice.failedReason ||
- "Invoice not available. Contact support if you need assistance."
- }
- />
+ <div />
)}
</div>
</div>
@@ -169,13 +156,19 @@ const InvoiceCard = ({
(() => {
const badge = PayoutStatusBadges[invoice.status];
return (
- <StatusBadge
- icon={null}
- variant={badge.variant}
- className="rounded-md py-0.5"
+ <DynamicTooltipWrapper
+ {...(invoice.failedReason
+ ? { tooltipProps: { content: invoice.failedReason } }
+ : null)}
>
- {badge.label}
- </StatusBadge>
+ <StatusBadge
+ icon={invoice.status === "failed" ? AlertCircle : null}
+ variant={badge.variant}
+ className="rounded-md py-0.5"
+ >
+ {badge.label}
+ </StatusBadge>
+ </DynamicTooltipWrapper>
);
})()}
</div>
@@ -228,13 +221,19 @@ const InvoiceCard = ({
(() => {
const badge = PayoutStatusBadges[invoice.status];
return (
- <StatusBadge
- icon={null}
- variant={badge.variant}
- className="rounded-md py-0.5"
+ <DynamicTooltipWrapper
+ {...(invoice.failedReason
+ ? { tooltipProps: { content: invoice.failedReason } }
+ : null)}
>
- {badge.label}
- </StatusBadge>
+ <StatusBadge
+ icon={invoice.status === "failed" ? AlertCircle : null}
+ variant={badge.variant}
+ className="rounded-md py-0.5"
+ >
+ {badge.label}
+ </StatusBadge>
+ </DynamicTooltipWrapper>
);
})()}
</div>
@@ -263,9 +262,7 @@ const InvoiceCard = ({
)}
<div className="flex items-center justify-end sm:col-span-1 sm:justify-end">
- {invoice.pdfUrl &&
- (!invoice.status ||
- INVOICE_AVAILABLE_PAYOUT_STATUSES.includes(invoice.status)) ? (
+ {invoice.pdfUrl && invoice.status !== "failed" ? (
<a
href={invoice.pdfUrl}
target="_blank"
@@ -277,16 +274,7 @@ const InvoiceCard = ({
<span>View invoice</span>
</a>
) : (
- <Button
- className="h-9 w-fit px-3"
- variant="secondary"
- text="View invoice"
- disabled
- disabledTooltip={
- invoice.failedReason ||
- "Invoice not available. Contact support if you need assistance."
- }
- />
+ <div />
)}
</div>
</div>