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 list

Steven Teyac68b27b5248
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/invoices/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/invoices/route.ts
index f5272bddd0..198b0f2f87 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/invoices/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/invoices/route.ts
@@ -4,7 +4,6 @@ import { stripe } from "@/lib/stripe";
import { InvoiceSchema } from "@/lib/zod/schemas/invoices";
import { APP_DOMAIN } from "@dub/utils";
import { NextResponse } from "next/server";
-import Stripe from "stripe";
import * as z from "zod/v4";
const querySchema = z.object({
@@ -52,22 +51,20 @@ const getSubscriptionInvoices = async (
...(status && { status }),
});
- return invoices.data.map((invoice) => mapSubscriptionInvoice(invoice));
+ return invoices.data.map((invoice) => ({
+ id: invoice.id,
+ total: invoice.total ?? invoice.amount_due,
+ stripeStatus: invoice.status,
+ createdAt: new Date(invoice.created * 1000),
+ description: "Dub subscription",
+ pdfUrl: invoice.invoice_pdf,
+ }));
} catch (error) {
console.log(error);
return [];
}
};
-const mapSubscriptionInvoice = (invoice: Stripe.Invoice) => ({
- id: invoice.id,
- total: invoice.total ?? invoice.amount_due,
- stripeStatus: invoice.status,
- createdAt: new Date(invoice.created * 1000),
- description: "Dub subscription",
- pdfUrl: invoice.invoice_pdf,
-});
-
const getOtherInvoices = async ({
workspaceId,
type,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page.tsx
index 0736575ed6..afb14998bb 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/page.tsx
@@ -15,7 +15,7 @@ import {
TabSelect,
useRouterStuff,
} from "@dub/ui";
-import { cn, currencyFormatter, fetcher } from "@dub/utils";
+import { cn, currencyFormatter, fetcher, formatDateTime } from "@dub/utils";
import { StripeInvoiceStatusBadges } from "app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/invoices/stripe-invoice-status-badges";
import { AlertCircle } from "lucide-react";
import Link from "next/link";
@@ -178,11 +178,7 @@ const InvoiceCard = ({
<div className="text-sm">
<div className="font-medium">{invoice.description}</div>
<div className="text-neutral-500">
- {new Date(invoice.createdAt).toLocaleDateString("en-US", {
- month: "short",
- year: "numeric",
- day: "numeric",
- })}
+ {formatDateTime(invoice.createdAt)}
</div>
</div>
<div className="flex items-center">
@@ -241,11 +237,7 @@ const InvoiceCard = ({
<div className="text-sm xl:col-span-1">
<div className="font-medium">{invoice.description}</div>
<div className="text-neutral-500">
- {new Date(invoice.createdAt).toLocaleDateString("en-US", {
- month: "short",
- year: "numeric",
- day: "numeric",
- })}
+ {formatDateTime(invoice.createdAt)}
</div>
</div>