Jan/RFP_Finanzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rechnungsdatum und Belegupload ueberarbeiten
All checks were successful
CI / Build (push) Successful in 1m59s
Details
CI / Deploy (push) Successful in 2m2s
Details

Browse Source
This commit is contained in:
jan
2026-05-01 16:51:27 +02:00
parent 549c8f16c6
commit 796e134ea2
14 changed files with 165 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
prisma/migrations/202605011330_invoice_date/migration.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "expenses" ADD COLUMN "invoice_date" TIMESTAMP(3);

1
prisma/schema.prisma
View File

@@ -133,6 +133,7 @@ model Expense {
recurrenceStartAt DateTime? @map("recurrence_start_at")
paidAt DateTime? @map("paid_at")
documentedAt DateTime? @map("documented_at")
invoiceDate DateTime? @map("invoice_date")
proofUrl String? @map("proof_url")
createdAt DateTime @default(now()) @map("created_at")
updatedAt DateTime @updatedAt @map("updated_at")

2
src/app/api/audit-logs/[id]/restore/route.ts
View File

@@ -516,6 +516,7 @@ export async function POST(_: Request, { params }: Context) {
approvalStatus: asString(deleted.approvalStatus, "Freigabestatus") as "PENDING" | "APPROVED",
recurrence: asString(deleted.recurrence, "Wiederholung") as "NONE" | "MONTHLY",
recurrenceStartAt: asDate(deleted.recurrenceStartAt, "Abo-Startdatum"),
invoiceDate: asDate(deleted.invoiceDate, "Rechnungsdatum"),
proofUrl: asNullableString(deleted.proofUrl),
createdAt: asDate(deleted.createdAt, "Ausgabe erstellt am") ?? new Date(),
paidAt: asDate(deleted.paidAt, "Bezahlt am"),
@@ -574,6 +575,7 @@ export async function POST(_: Request, { params }: Context) {
},
data: {
proofUrl: asNullableString(rollback.previousProofUrl),
invoiceDate: asDate(rollback.previousInvoiceDate, "Vorheriges Rechnungsdatum"),
documentedAt: asDate(rollback.previousDocumentedAt, "Vorheriger Dokumentationszeitpunkt")
}
});

4
src/app/api/expenses/[id]/paid/route.ts
View File

@@ -35,6 +35,10 @@ export async function POST(_: Request, { params }: Context) {
return NextResponse.json({ error: "Bezahlt ist erst nach Freigabe moeglich." }, { status: 400 });
}
if (!expense.proofUrl || !expense.invoiceDate || !expense.documentedAt) {
return NextResponse.json({ error: "Bitte zuerst Rechnung mit Rechnungsdatum abgeben." }, { status: 400 });
}
const updatedExpense = await prisma.expense.update({
where: { id },
data: {

47
src/app/api/expenses/[id]/proof/route.ts
View File

@@ -1,5 +1,6 @@
import { NextResponse } from "next/server";
import { createAuditLog } from "@/lib/audit-log";
import { canDocumentExpense } from "@/lib/domain";
import { uploadExpenseProofToDrive } from "@/lib/google-drive";
import prisma from "@/lib/prisma";
@@ -8,6 +9,15 @@ import { getCurrentViewer } from "@/lib/session";
const ACCEPTED_MIME_TYPES = new Set(["application/pdf", "image/jpeg", "image/png", "image/webp", "image/heic", "image/heif"]);
const MAX_FILE_SIZE = 12 * 1024 * 1024;
function parseInvoiceDate(value: FormDataEntryValue | null) {
if (typeof value !== "string" || !/^\d{4}-\d{2}-\d{2}$/.test(value)) {
return null;
}
const parsed = new Date(`${value}T12:00:00.000Z`);
return Number.isNaN(parsed.getTime()) ? null : parsed;
}
type Context = {
params: Promise<{
id: string;
@@ -34,8 +44,17 @@ export async function POST(request: Request, { params }: Context) {
return NextResponse.json({ error: "Du darfst fuer diese Ausgabe keinen Beleg hochladen." }, { status: 403 });
}
if (expense.approvalStatus !== "APPROVED") {
return NextResponse.json({ error: "Belegabgabe ist erst nach Freigabe moeglich." }, { status: 400 });
}
const formData = await request.formData().catch(() => null);
const file = formData?.get("file");
const invoiceDate = parseInvoiceDate(formData?.get("invoiceDate") ?? null);
if (!invoiceDate) {
return NextResponse.json({ error: "Bitte ein gueltiges Rechnungsdatum angeben." }, { status: 400 });
}
if (!(file instanceof File)) {
return NextResponse.json({ error: "Bitte einen Beleg als Bild oder PDF auswaehlen." }, { status: 400 });
@@ -51,6 +70,7 @@ export async function POST(request: Request, { params }: Context) {
const proofUrl = await uploadExpenseProofToDrive({
title: expense.title,
invoiceDate: invoiceDate.toISOString().slice(0, 10),
fileName: file.name,
mimeType: file.type,
buffer: Buffer.from(await file.arrayBuffer())
@@ -59,7 +79,32 @@ export async function POST(request: Request, { params }: Context) {
const updatedExpense = await prisma.expense.update({
where: { id: expense.id },
data: {
proofUrl
proofUrl,
invoiceDate,
documentedAt: expense.documentedAt ?? new Date()
}
});
await createAuditLog(prisma, {
actorId: viewer.id,
action: "expense.document",
entityType: "expense",
entityId: updatedExpense.id,
entityLabel: updatedExpense.title,
summary: `Rechnung fuer ${updatedExpense.title} wurde abgegeben.`,
metadata: {
proofUrl: updatedExpense.proofUrl,
invoiceDate: updatedExpense.invoiceDate?.toISOString() ?? null,
rollback: {
kind: "expense.document",
expenseId: updatedExpense.id,
previousProofUrl: expense.proofUrl,
previousInvoiceDate: expense.invoiceDate?.toISOString() ?? null,
previousDocumentedAt: expense.documentedAt?.toISOString() ?? null,
nextProofUrl: updatedExpense.proofUrl,
nextInvoiceDate: updatedExpense.invoiceDate?.toISOString() ?? null,
nextDocumentedAt: updatedExpense.documentedAt?.toISOString() ?? null
}
}
});

4
src/app/api/expenses/route.ts
View File

@@ -43,7 +43,8 @@ const expenseSchema = z
}),
proofUrl: z
.union([z.string().trim().url(), z.literal(""), z.null(), z.undefined()])
.transform((value) => (typeof value === "string" && value.length > 0 ? value : undefined))
.optional()
.transform(() => undefined)
})
.superRefine((value, ctx) => {
if (value.recurrence === "MONTHLY" && !value.recurrenceStartAt) {
@@ -111,7 +112,6 @@ export async function POST(request: Request) {
budgetId: parsed.data.budgetId,
periodId: budget.periodId,
creatorId: viewer.id,
proofUrl: parsed.data.proofUrl,
recurrence: parsed.data.recurrence,
recurrenceStartAt,
approvalStatus: needsManualApproval ? "PENDING" : "APPROVED"

18
src/app/api/export/csv/route.ts
View File

@@ -39,6 +39,7 @@ const CSV_HEADERS = [
"approvalType",
"recurrence",
"recurrenceStartAt",
"invoiceDate",
"proofUrl",
"createdAt",
"paidAt",
@@ -205,7 +206,8 @@ export async function GET() {
approvalType: "",
recurrence: "",
recurrenceStartAt: "",
proofUrl: "",
invoiceDate: "",
proofUrl: "",
createdAt: user.createdAt.toISOString(),
paidAt: "",
documentedAt: "",
@@ -258,7 +260,8 @@ export async function GET() {
approvalType: "",
recurrence: "",
recurrenceStartAt: "",
proofUrl: "",
invoiceDate: "",
proofUrl: "",
createdAt: period.createdAt.toISOString(),
paidAt: "",
documentedAt: "",
@@ -311,7 +314,8 @@ export async function GET() {
approvalType: "",
recurrence: "",
recurrenceStartAt: "",
proofUrl: "",
invoiceDate: "",
proofUrl: "",
createdAt: group.createdAt.toISOString(),
paidAt: "",
documentedAt: "",
@@ -363,7 +367,8 @@ export async function GET() {
approvalType: "",
recurrence: "",
recurrenceStartAt: "",
proofUrl: "",
invoiceDate: "",
proofUrl: "",
createdAt: budget.createdAt.toISOString(),
paidAt: "",
documentedAt: "",
@@ -415,6 +420,7 @@ export async function GET() {
approvalType: "",
recurrence: expense.recurrence,
recurrenceStartAt: expense.recurrenceStartAt?.toISOString() ?? "",
invoiceDate: expense.invoiceDate?.toISOString() ?? "",
proofUrl: expense.proofUrl ?? "",
createdAt: expense.createdAt.toISOString(),
paidAt: expense.paidAt?.toISOString() ?? "",
@@ -467,6 +473,7 @@ export async function GET() {
approvalType: approval.approvalType,
recurrence: expense.recurrence,
recurrenceStartAt: expense.recurrenceStartAt?.toISOString() ?? "",
invoiceDate: expense.invoiceDate?.toISOString() ?? "",
proofUrl: "",
createdAt: approval.timestamp.toISOString(),
paidAt: "",
@@ -523,7 +530,8 @@ export async function GET() {
approvalType: "",
recurrence: "",
recurrenceStartAt: "",
proofUrl: "",
invoiceDate: "",
proofUrl: "",
createdAt: auditLog.createdAt.toISOString(),
paidAt: "",
documentedAt: "",

1
src/app/api/import/csv/route.ts
View File

@@ -226,6 +226,7 @@ export async function POST(request: Request) {
approvalStatus: row.approvalStatus === "APPROVED" ? "APPROVED" : "PENDING",
recurrence: row.recurrence === "MONTHLY" ? "MONTHLY" : "NONE",
recurrenceStartAt: toDate(row.recurrenceStartAt),
invoiceDate: toDate(row.invoiceDate),
proofUrl: toNullable(row.proofUrl),
createdAt: toDate(row.createdAt) ?? new Date(),
paidAt: toDate(row.paidAt),

1
src/app/page.tsx
View File

@@ -185,6 +185,7 @@ export default async function DashboardPage() {
recurrenceStartAt,
paidAt: expense.paidAt?.toISOString() ?? null,
documentedAt: expense.documentedAt?.toISOString() ?? null,
invoiceDate: expense.invoiceDate?.toISOString() ?? null,
proofUrl: expense.proofUrl,
createdAt: expense.createdAt.toISOString(),
creator: {

72
src/components/dashboard/budget-column.tsx
View File

@@ -50,7 +50,7 @@ type BudgetColumnProps = {
onApprove: (expenseId: string, approvalType: "CHAIR_A" | "CHAIR_B" | "FINANCE") => Promise<void>;
onMarkPaid: (expenseId: string) => Promise<void>;
onDocument: (expenseId: string, proofUrl?: string) => Promise<void>;
onUploadProof: (expenseId: string, file: File) => Promise<string>;
onUploadProof: (expenseId: string, file: File, invoiceDate: string) => Promise<string>;
onSaveWorkingGroup: (groupId: string, name: string) => Promise<void>;
onDeleteWorkingGroup: (groupId: string, groupName: string) => Promise<void>;
onSaveBudget: (budgetId: string, name: string, totalBudget: string, colorCode: string) => Promise<void>;
@@ -155,8 +155,8 @@ export function BudgetColumn({
const [editingBudgetId, setEditingBudgetId] = useState<string | null>(null);
const [isEditingGroup, setIsEditingGroup] = useState(false);
const [groupDraftName, setGroupDraftName] = useState(group.name);
const [proofUrlDrafts, setProofUrlDrafts] = useState<Record<string, string>>({});
const [proofFileDrafts, setProofFileDrafts] = useState<Record<string, File | null>>({});
const [invoiceDateDrafts, setInvoiceDateDrafts] = useState<Record<string, string>>({});
const [expandedRecurringExpenses, setExpandedRecurringExpenses] = useState<Record<string, boolean>>({});
const budgetCardWidth = 352;
@@ -756,16 +756,23 @@ export function BudgetColumn({
) : null}
{expense.proofUrl ? (
<Link
href={expense.proofUrl}
target="_blank"
rel="noreferrer"
underline="hover"
variant="body2"
sx={{ overflowWrap: "anywhere" }}
>
{"Beleg \u00f6ffnen"}
</Link>
<Stack spacing={0.4}>
<Link
href={expense.proofUrl}
target="_blank"
rel="noreferrer"
underline="hover"
variant="body2"
sx={{ overflowWrap: "anywhere" }}
>
{"Rechnungsdokument \u00f6ffnen"}
</Link>
{expense.invoiceDate ? (
<Typography variant="caption" color="text.secondary">
Rechnung vom {dateFormatter.format(new Date(expense.invoiceDate))}
</Typography>
) : null}
</Stack>
) : null}
<Stack direction="row" gap={1} useFlexGap flexWrap="wrap">
@@ -791,7 +798,12 @@ export function BudgetColumn({
</Button>
))}
{!expense.paidAt && expense.approvalStatus === "APPROVED" && canMarkPaid(viewer.role) ? (
{!expense.paidAt &&
expense.approvalStatus === "APPROVED" &&
expense.proofUrl &&
expense.invoiceDate &&
expense.documentedAt &&
canMarkPaid(viewer.role) ? (
<Button
size="small"
variant="outlined"
@@ -829,8 +841,25 @@ export function BudgetColumn({
) : null}
</Stack>
{expense.paidAt && !expense.documentedAt && canDocumentExpense(viewer.role) ? (
<Stack direction={{ xs: "column", sm: "row" }} gap={1}>
{!expense.paidAt &&
expense.approvalStatus === "APPROVED" &&
!expense.proofUrl &&
canDocumentExpense(viewer.role) ? (
<Stack direction={{ xs: "column", sm: "row" }} gap={1} alignItems={{ sm: "center" }}>
<TextField
label="Rechnungsdatum"
type="date"
value={invoiceDateDrafts[expense.id] ?? ""}
onChange={(event) =>
setInvoiceDateDrafts((current) => ({
...current,
[expense.id]: event.target.value
}))
}
InputLabelProps={{ shrink: true }}
size="small"
required
/>
<TextField
label="Beleg"
value={proofFileDrafts[expense.id]?.name ?? expense.proofUrl ?? ""}
@@ -874,14 +903,17 @@ export function BudgetColumn({
disabled={busy}
onClick={async () => {
const proofFile = proofFileDrafts[expense.id];
const proofUrl = proofFile
? await onUploadProof(expense.id, proofFile)
: proofUrlDrafts[expense.id] ?? expense.proofUrl ?? undefined;
const invoiceDate = invoiceDateDrafts[expense.id] ?? "";
await onDocument(expense.id, proofUrl);
if (!proofFile || !invoiceDate) {
return;
}
await onUploadProof(expense.id, proofFile, invoiceDate);
await onMarkPaid(expense.id);
}}
>
Dokumentieren
Rechnung abgeben und bezahlt setzen
</Button>
</Stack>
) : null}

102
src/components/dashboard/dashboard-shell.tsx
View File

@@ -325,7 +325,6 @@ export function DashboardShell({
const [approvalThresholdDraft, setApprovalThresholdDraft] = useState(approvalThreshold.toFixed(2));
const [periodForm, setPeriodForm] = useState<PeriodFormState>(getSuggestedPeriodDraft(currentPeriod));
const [periodEditForm, setPeriodEditForm] = useState<PeriodEditFormState>(getPeriodEditDraft(currentPeriod));
const [expenseProofFile, setExpenseProofFile] = useState<File | null>(null);
const [pushStatus, setPushStatus] = useState<"idle" | "enabled" | "blocked" | "unsupported">("idle");
useEffect(() => {
if (visibleGroups.length === 0) {
@@ -626,7 +625,7 @@ export function DashboardShell({
}
await runAction(async () => {
const result = (await parseResponse(
await parseResponse(
await fetch("/api/expenses", {
method: "POST",
headers: {
@@ -642,19 +641,7 @@ export function DashboardShell({
recurrenceStartAt: expenseForm.recurrence === "MONTHLY" ? expenseForm.recurrenceStartAt : ""
})
})
)) as { expense?: { id: string } };
if (expenseProofFile && result.expense?.id) {
const formData = new FormData();
formData.set("file", expenseProofFile);
await parseResponse(
await fetch(`/api/expenses/${result.expense.id}/proof`, {
method: "POST",
body: formData
})
);
}
);
const resetGroup = defaultEditableGroup?.id ?? "";
const resetBudget = defaultEditableGroup?.budgets[0]?.id ?? "";
@@ -668,7 +655,6 @@ export function DashboardShell({
recurrence: "NONE",
recurrenceStartAt: toDateInputValue(currentPeriod?.startsAt ?? new Date().toISOString())
});
setExpenseProofFile(null);
}, "Ausgabe wurde gespeichert.");
}
@@ -767,18 +753,30 @@ export function DashboardShell({
}, "Ausgabe wurde dokumentiert.");
}
async function handleUploadProof(expenseId: string, file: File) {
const formData = new FormData();
formData.set("file", file);
async function handleUploadProof(expenseId: string, file: File, invoiceDate: string) {
setBusy(true);
setMessage(null);
const result = (await parseResponse(
await fetch(`/api/expenses/${expenseId}/proof`, {
method: "POST",
body: formData
})
)) as { proofUrl: string };
try {
const formData = new FormData();
formData.set("file", file);
formData.set("invoiceDate", invoiceDate);
return result.proofUrl;
const result = (await parseResponse(
await fetch(`/api/expenses/${expenseId}/proof`, {
method: "POST",
body: formData
})
)) as { proofUrl: string };
return result.proofUrl;
} catch (error) {
const text = error instanceof Error ? error.message : "Beleg konnte nicht hochgeladen werden.";
setMessage({ type: "error", text });
throw error;
} finally {
setBusy(false);
}
}
async function handleSaveBudget(budgetId: string, name: string, totalBudget: string, colorCode: string) {
@@ -1485,17 +1483,6 @@ export function DashboardShell({
Neue Ausgabe
</Typography>
</Box>
{viewer.approvalPermissions.length > 0 ? (
<Button
type="button"
variant={pushStatus === "enabled" ? "contained" : "outlined"}
startIcon={<NotificationsActiveRoundedIcon />}
disabled={busy || pushStatus === "unsupported"}
onClick={handleEnablePushNotifications}
>
{pushStatus === "enabled" ? "Web Push aktiv" : "Freigabe-Push aktivieren"}
</Button>
) : null}
<Box component="form" onSubmit={handleCreateExpense}>
<Stack spacing={2}>
@@ -1594,34 +1581,6 @@ export function DashboardShell({
</MenuItem>
))}
</TextField>
<TextField
label="Beleg"
value={expenseProofFile?.name ?? ""}
fullWidth
InputProps={{ readOnly: true }}
helperText="Optional: Bild oder PDF auswählen. Auf Mobilgeräten kann die Kamera angeboten werden."
/>
<Stack direction={{ xs: "column", sm: "row" }} gap={1} useFlexGap flexWrap="wrap">
<Button component="label" variant="outlined" startIcon={<UploadFileRoundedIcon />} disabled={busy}>
Beleg auswählen
<input
hidden
type="file"
accept="image/*,application/pdf"
onChange={(event) => setExpenseProofFile(event.target.files?.[0] ?? null)}
/>
</Button>
<Button component="label" variant="outlined" disabled={busy}>
Kamera öffnen
<input
hidden
type="file"
accept="image/*"
capture="environment"
onChange={(event) => setExpenseProofFile(event.target.files?.[0] ?? null)}
/>
</Button>
</Stack>
<Button
type="submit"
variant="contained"
@@ -2534,6 +2493,19 @@ export function DashboardShell({
</Typography>
</Box>
<Stack direction={{ xs: "column", sm: "row" }} gap={1.2} alignItems={{ sm: "center" }}>
{viewer.approvalPermissions.length > 0 ? (
<Button
type="button"
size="small"
variant={pushStatus === "enabled" ? "contained" : "outlined"}
startIcon={<NotificationsActiveRoundedIcon />}
disabled={busy || pushStatus === "unsupported"}
sx={{ borderColor: alpha("#FFFFFF", 0.28), color: "white" }}
onClick={handleEnablePushNotifications}
>
{pushStatus === "enabled" ? "Web Push aktiv" : "Freigabe-Push"}
</Button>
) : null}
<Chip
label={`${viewer.username} - ${roleLabel(viewer.role)}`}
sx={{ bgcolor: alpha("#FFFFFF", 0.14), color: "white", fontWeight: 700, maxWidth: "100%" }}

2
src/lib/audit-snapshots.ts
View File

@@ -56,6 +56,7 @@ export function snapshotExpense(
| "approvalStatus"
| "recurrence"
| "recurrenceStartAt"
| "invoiceDate"
| "proofUrl"
| "createdAt"
| "paidAt"
@@ -74,6 +75,7 @@ export function snapshotExpense(
approvalStatus: expense.approvalStatus,
recurrence: expense.recurrence,
recurrenceStartAt: expense.recurrenceStartAt?.toISOString() ?? null,
invoiceDate: expense.invoiceDate?.toISOString() ?? null,
proofUrl: expense.proofUrl,
createdAt: expense.createdAt.toISOString(),
paidAt: expense.paidAt?.toISOString() ?? null,

1
src/lib/dashboard-types.ts
View File

@@ -49,6 +49,7 @@ export type DashboardExpense = {
recurrenceStartAt: string | null;
paidAt: string | null;
documentedAt: string | null;
invoiceDate: string | null;
proofUrl: string | null;
createdAt: string;
creator: {

4
src/lib/google-drive.ts
View File

@@ -33,6 +33,7 @@ export function sanitizeDriveFileName(title: string, fallback = "beleg") {
export async function uploadExpenseProofToDrive(input: {
title: string;
invoiceDate: string;
fileName: string;
mimeType: string;
buffer: Buffer;
@@ -41,8 +42,7 @@ export async function uploadExpenseProofToDrive(input: {
const folderId = process.env.GOOGLE_DRIVE_FOLDER_ID || DEFAULT_DRIVE_FOLDER_ID;
const extension = input.fileName.includes(".") ? `.${input.fileName.split(".").pop()}` : "";
const baseName = sanitizeDriveFileName(input.title);
const uniqueSuffix = new Date().toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
const name = `${baseName}-${uniqueSuffix}${extension}`;
const name = `${input.invoiceDate}-${baseName}${extension}`;
const response = await drive.files.create({
requestBody: {