Merge pull request #2677 from CAFECA-IO/feature/voucherUpdate

voucherUpdate
CAFECA-IO · Sep 26, 2024 · f8ab69d · f8ab69d
2 parents 6abec72 + a8a53a5
commit f8ab69d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iSunFA",
-  "version": "0.8.2+16",
+  "version": "0.8.2+17",
   "private": false,
   "scripts": {
     "dev": "next dev",

diff --git a/src/lib/utils/formatter/journal.formatter.ts b/src/lib/utils/formatter/journal.formatter.ts
@@ -23,7 +23,7 @@ export function formatSingleIJournalListItem(
   assertIsJournalEvent(journalFromPrisma.event);
   return {
     id: journalFromPrisma.id,
-    date: journalFromPrisma.createdAt,
+    date: journalFromPrisma.invoice?.date || journalFromPrisma.createdAt,
     type: journalFromPrisma.invoice?.eventType,
     particulars: journalFromPrisma.invoice?.description,
     fromTo: journalFromPrisma.invoice?.vendorOrSupplier,