Merge pull request #142 from simplitrac/fixed-submit

fixed submitted user object
simplitrac · Sep 9, 2024 · 4ab7213 · 4ab7213
2 parents d6f4344 + 5464822
commit 4ab7213
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/src/components/ExpensesTable.jsx b/client/src/components/ExpensesTable.jsx
@@ -70,9 +70,9 @@ const ExpensesForm = () => {
 
         const transaction = new Transaction(ocrData);
         transaction.createdAt = data.date;
-        transaction.vendor = data.vendor;
+        transaction.vendor = data.vendor.value;
         transaction.amount = data.amount;
-        transaction.category_name = data.category;
+        transaction.category_name = data.category.value;
 
         const updatedUser = new User(user);
         updatedUser.transactions.push(transaction);

diff --git a/client/src/models/Transaction.js b/client/src/models/Transaction.js
@@ -19,8 +19,8 @@ class Transaction {
         } else {
             this.transactionId = data.transaction_id || this.#generateUUID();
             this.createdAt = data.created_at || null;
-            this.amount = data.amount || null;
-            this.vendor = data.vendor || null;
+            this.amount = (data instanceof Object ? data?.value : data.amount) || null;
+            this.vendor = (data instanceof Object ? data?.value : data.vendor) || null;
             this.category_id = data.category_id || null;
             this.category_name = data.category_name || null;
             this.pictureId = data.pictureId || null;