From 79d29f52a1216f32ba54072ea700ceb71df44647 Mon Sep 17 00:00:00 2001
From: padreug <padreug@aiolabs.dev>
Date: Sun, 22 Jun 2025 16:52:20 +0200
Subject: [PATCH] Enhance transaction history display: Update SQL query and
 model to include transaction time

---
 crud.py                               | 3 ++-
 models.py                             | 1 +
 templates/satmachineclient/index.html | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crud.py b/crud.py
index f20baf7..d54d2a6 100644
--- a/crud.py
+++ b/crud.py
@@ -169,7 +169,7 @@ async def get_client_transactions(
     transactions = await db.fetchall(
         f"""
         SELECT id, amount_sats, amount_fiat, exchange_rate, transaction_type, 
-               status, created_at, lamassu_transaction_id
+               status, created_at, transaction_time, lamassu_transaction_id
         FROM satmachineadmin.dca_payments 
         WHERE {where_clause}
         ORDER BY created_at DESC
@@ -187,6 +187,7 @@ async def get_client_transactions(
             transaction_type=tx["transaction_type"],
             status=tx["status"],
             created_at=tx["created_at"],
+            transaction_time=tx["transaction_time"],
             lamassu_transaction_id=tx["lamassu_transaction_id"]
         )
         for tx in transactions
diff --git a/models.py b/models.py
index 543c5b4..bfc0e1f 100644
--- a/models.py
+++ b/models.py
@@ -32,6 +32,7 @@ class ClientTransaction(BaseModel):
     transaction_type: str  # 'flow', 'fixed', 'manual'
     status: str
     created_at: datetime
+    transaction_time: Optional[datetime] = None  # Original ATM transaction time
     lamassu_transaction_id: Optional[str] = None
 
 
diff --git a/templates/satmachineclient/index.html b/templates/satmachineclient/index.html
index b0272f8..b265358 100644
--- a/templates/satmachineclient/index.html
+++ b/templates/satmachineclient/index.html
@@ -154,7 +154,7 @@
             <q-item v-for="tx in transactions" :key="tx.id">
               <q-item-section>
                 <q-item-label>${formatSats(tx.amount_sats)}</q-item-label>
-                <q-item-label caption>${formatCurrency(tx.amount_fiat)} • ${formatDate(tx.created_at)}</q-item-label>
+                <q-item-label caption>${formatCurrency(tx.amount_fiat)} • ${formatDate(tx.transaction_time || tx.created_at)}</q-item-label>
               </q-item-section>
               <q-item-section side>
                 <q-chip