From cac8318815d82cb68ff666ec6471e596b184d070 Mon Sep 17 00:00:00 2001
From: Wim Brand <wim@fornaxian.tech>
Date: Thu, 24 Apr 2025 14:25:37 +0200
Subject: [PATCH] Normalize invoice statuses

---
 svelte/src/admin_panel/InvoiceVAT.svelte  | 57 ++++++++++++-----------
 svelte/src/user_home/DepositCredit.svelte | 15 ++----
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/svelte/src/admin_panel/InvoiceVAT.svelte b/svelte/src/admin_panel/InvoiceVAT.svelte
index 0a2601d..49e6d9d 100644
--- a/svelte/src/admin_panel/InvoiceVAT.svelte
+++ b/svelte/src/admin_panel/InvoiceVAT.svelte
@@ -125,36 +125,37 @@ onMount(() => {
 		Amount:<Euro amount={tot.amount}/><br/>
 		VAT: <Euro amount={tot.vat}/><br/>
 	{/each}
-
-	<div class="table_scroll">
-		<table>
-			<thead>
-				<tr>
-					<td>Time</td>
-					<td>Amount</td>
-					<td>VAT</td>
-					<td>Country</td>
-					<td>Method</td>
-					<td>Status</td>
-				</tr>
-			</thead>
-			<tbody>
-				{#each invoices as row (row.id)}
-					<tr>
-						<td>{formatDate(row.time)}</td>
-						<td><Euro amount={row.amount}/></td>
-						<td><Euro amount={row.vat}/></td>
-						<td>{row.country}</td>
-						<td>{row.payment_method}</td>
-						<td>{row.status}</td>
-					</tr>
-				{/each}
-
-			</tbody>
-		</table>
-	</div>
 </section>
 
+<div class="table_scroll" style="text-align: initial;">
+	<table>
+		<thead>
+			<tr>
+				<td>Time</td>
+				<td>ID</td>
+				<td>Amount</td>
+				<td>VAT</td>
+				<td>Country</td>
+				<td>Method</td>
+				<td>Status</td>
+			</tr>
+		</thead>
+		<tbody>
+			{#each invoices as row (row.id)}
+				<tr>
+					<td>{formatDate(row.time)}</td>
+					<td>{row.id}</td>
+					<td><Euro amount={row.amount}/></td>
+					<td><Euro amount={row.vat}/></td>
+					<td>{row.country}</td>
+					<td>{row.payment_method}</td>
+					<td>{row.status}</td>
+				</tr>
+			{/each}
+		</tbody>
+	</table>
+</div>
+
 <style>
 .toolbar {
 	display: flex;
diff --git a/svelte/src/user_home/DepositCredit.svelte b/svelte/src/user_home/DepositCredit.svelte
index 469855c..f96321f 100644
--- a/svelte/src/user_home/DepositCredit.svelte
+++ b/svelte/src/user_home/DepositCredit.svelte
@@ -130,13 +130,13 @@ onMount(() => {
 						<td>{row.country}</td>
 						<td>{row.payment_method}</td>
 						<td>
-							{#if row.status === "InvoiceCreated" || row.status === "open" || row.status === "CREATED" || row.status === "PAYER_ACTION_REQUIRED"}
+							{#if row.status === "open"}
 								Waiting for payment
-							{:else if row.status === "InvoiceProcessing"}
+							{:else if row.status === "processing"}
 								Payment received, waiting for confirmations
-							{:else if row.status === "InvoiceSettled" || row.status === "paid"}
+							{:else if row.status === "paid"}
 								Paid
-							{:else if row.status === "InvoiceExpired"}
+							{:else if row.status === "expired"}
 								Expired
 							{:else if row.status === "canceled"}
 								Canceled
@@ -145,12 +145,7 @@ onMount(() => {
 							{/if}
 						</td>
 						<td>
-							{#if row.status === "New" ||
-								row.status === "InvoiceCreated" ||
-								row.status === "open" ||
-								row.status === "CREATED" ||
-								row.status === "PAYER_ACTION_REQUIRED"
-							}
+							{#if row.status === "open"}
 								<a href="/api/user/pay_invoice/{row.id}" class="button button_highlight">
 									<i class="icon">paid</i> Pay
 								</a>