src/lib/entities.ts

@@ -37,8 +37,6 @@ export interface Expense {
   value: number;
   comment: string;
   date: string;
-  card: Card;
-  show_value: string;
 }
 
 export interface Income {

src/routes/expense/+page.svelte

@@ -20,7 +20,7 @@
 
   onMount(async () => {
     await fetchCategories();
-    await fetchCards(true);
+    await fetchCards();
     await fetchTypes();
   });
 
@@ -33,12 +33,8 @@
       types = await result.json();
     }
   }
-  async function fetchCards(preloadCurrencies = false) {
+  async function fetchCards() {
-    const queryParams = new URLSearchParams({
+    const result = await fetch("/api/card/all");
-      preload_currencies: preloadCurrencies.toString(),
-    });
-
-    const result = await fetch(`/api/card/all?${queryParams}`);
     if (!result.ok) {
       const obj = await result.json();
       error = obj.message;
@@ -173,7 +169,7 @@
           class="mt-1 block w-full px-4 py-2 border border-gray-300 rounded-md focus:ring focus:ring-indigo-200 focus:border-indigo-500"
         >
           {#each cards as card}
-            <option value={card.id}>{card.display_name}</option>
+            <option value={card.id}>{card.name}</option>
           {/each}
         </select>
       </label>
@@ -259,10 +255,13 @@
         class="bg-white p-4 rounded-lg shadow-md flex justify-between items-center"
       >
         <div>
-          <strong class="block text-lg">{expense.show_value}</strong>
+          <strong class="block text-lg">{NumberToFPA(expense.value)}</strong>
           <div class="text-sm text-gray-600">
             <span class="font-bold">Card:</span>
-            {expense.card.display_name}
+            {getCardName(expense.card_id)}
+            <span class="text-sm"
+              >{`•${cards.find((card) => card.id == expense.card_id)?.last_digits}`}</span
+            >
             <span class="font-bold">Type:</span>
             <span style="color: {getTypeColor(expense.type_id)};"
               >{getTypeName(expense.type_id)}</span

src/routes/transfer/+page.svelte

@@ -162,7 +162,7 @@
         >
           {#each cards as card}
             {#if card.id != currentTransfer.to_card_id}
-              <option value={card.id}>{card.display_name}</option>
+              <option value={card.id}>{card.name}</option>
             {/if}
           {/each}
         </select>
@@ -176,7 +176,7 @@
         >
           {#each cards as card}
             {#if card.id != currentTransfer.from_card_id}
-              <option value={card.id}>{card.display_name}</option>
+              <option value={card.id}>{card.name}</option>
             {/if}
           {/each}
         </select>