Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions app/api/invoices/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,19 @@ export async function POST(req: Request) {
status: 'DRAFT',
};

const invoice = await prisma.invoice.create({
data: invoiceData,
include: { client: true },
const invoice = await prisma.$transaction(async (tx) => {
const seq = await tx.invoiceSequence.upsert({
where: { userId: user.id },
update: { lastNumber: { increment: 1 } },
create: { userId: user.id, lastNumber: 1 },
});

const invoiceNumber = `INV-${String(seq.lastNumber).padStart(3, '0')}`;

return tx.invoice.create({
data: { ...invoiceData, invoiceNumber },
include: { client: true },
});
});

return Response.json({ invoice });
Expand Down
16 changes: 12 additions & 4 deletions app/invoices/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ interface Client {

interface Invoice {
id: string;
invoiceNumber?: string | null;
totalHours: number;
totalAmount: number;
createdAt: string;
Expand Down Expand Up @@ -42,17 +43,20 @@ interface InvoiceDetailsResponse {
const buildInvoicePdf = (invoice: Invoice, entries: InvoiceEntry[]) => {
const doc = new jsPDF();
const createdAt = new Date(invoice.createdAt).toLocaleDateString();
const invoiceNumber = invoice.invoiceNumber || invoice.id;
const periodStart = invoice.periodStart
? new Date(invoice.periodStart).toLocaleDateString()
: 'N/A';
const periodEnd = invoice.periodEnd ? new Date(invoice.periodEnd).toLocaleDateString() : 'N/A';
const dueDate = invoice.dueDate ? new Date(invoice.dueDate).toLocaleDateString() : 'N/A';

doc.setFontSize(18);
doc.text('Worklog Invoice', 14, 20);
doc.text('Worklog Invoice', 14, 16);
doc.setFontSize(14);
doc.text(invoiceNumber, 14, 26);

doc.setFontSize(12);
doc.text(`Client: ${invoice.client.name}`, 14, 32);
doc.text(`Client: ${invoice.client.name}`, 14, 36);
doc.text(`Period: ${periodStart} - ${periodEnd}`, 14, 40);
doc.text(`Due: ${dueDate}`, 14, 48);
doc.text(`Created: ${createdAt}`, 14, 56);
Expand Down Expand Up @@ -164,7 +168,8 @@ export default function InvoicesPage() {
const details = await fetchInvoiceDetails(invoiceId);
if (!details) return;
const doc = buildInvoicePdf(details.invoice, details.entries);
doc.save(`invoice-${details.invoice.id}.pdf`);
const fileName = `invoice-${details.invoice.invoiceNumber || details.invoice.id}.pdf`;
doc.save(fileName);
};

const handleView = async (invoiceId: string) => {
Expand Down Expand Up @@ -310,7 +315,10 @@ export default function InvoicesPage() {
{invoicesData?.invoices?.length > 0 ? (
invoicesData?.invoices?.map((invoice: Invoice) => (
<tr key={invoice.id} className="hover:bg-slate-50">
<td className="px-6 py-4 text-slate-900">{invoice.client.name}</td>
<td className="px-6 py-4 text-slate-900">
<div className="font-semibold">{invoice.invoiceNumber || invoice.id}</div>
<div className="text-sm text-slate-600">{invoice.client.name}</div>
</td>
<td className="px-6 py-4 text-slate-600">
{new Date(invoice.createdAt).toLocaleDateString()}
</td>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
Warnings:

- A unique constraint covering the columns `[userId,invoiceNumber]` on the table `Invoice` will be added. If there are existing duplicate values, this will fail.

*/
-- AlterTable
ALTER TABLE "Invoice" ADD COLUMN "invoiceNumber" TEXT;

-- CreateTable
CREATE TABLE "InvoiceSequence" (
"id" TEXT NOT NULL,
"userId" TEXT NOT NULL,
"lastNumber" INTEGER NOT NULL DEFAULT 0,

CONSTRAINT "InvoiceSequence_pkey" PRIMARY KEY ("id")
);

-- CreateIndex
CREATE UNIQUE INDEX "InvoiceSequence_userId_key" ON "InvoiceSequence"("userId");

-- CreateIndex
CREATE UNIQUE INDEX "Invoice_userId_invoiceNumber_key" ON "Invoice"("userId", "invoiceNumber");

-- AddForeignKey
ALTER TABLE "InvoiceSequence" ADD CONSTRAINT "InvoiceSequence_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
15 changes: 15 additions & 0 deletions prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ model User {
clients Client[]
timeEntries TimeEntry[]
invoices Invoice[]
invoiceSequence InvoiceSequence?
}

model Client {
Expand Down Expand Up @@ -52,6 +53,8 @@ model TimeEntry {

model Invoice {
id String @id @default(cuid())
// Human-readable invoice number, e.g. INV-001 (scoped per user)
invoiceNumber String?
totalHours Float
totalAmount Float
// Hourly rate used when the invoice was generated (persisted for historical accuracy)
Expand All @@ -70,6 +73,18 @@ model Invoice {
isPaid Boolean @default(false)
// Optional due date for the invoice; if not provided, default applied in server logic
dueDate DateTime?

@@unique([userId, invoiceNumber])
}

// Tracks the last invoice sequence number for each user so invoice numbers
// can auto-increment per user in a concurrency-safe manner.
model InvoiceSequence {
id String @id @default(cuid())
userId String @unique
lastNumber Int @default(0)

user User @relation(fields: [userId], references: [id], onDelete: Cascade)
}

enum InvoiceStatus {
Expand Down
Loading