Final Fixes II

mamt4real · Oct 8, 2023 · 977a7a7 · 977a7a7
1 parent f25c476
commit 977a7a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/components/ZakatYearInfo.jsx b/src/components/ZakatYearInfo.jsx
@@ -97,7 +97,11 @@ function ZakatYearInfo({ zakatYear }) {
             >
               <AccountBalanceWalletOutlinedIcon /> Closing Balance
             </Typography>
-            <Typography>{formatMoney(zakatYear?.closingBalance)}</Typography>
+            <Typography>
+              {zakatYear?.closingBalance
+                ? formatMoney(zakatYear?.closingBalance)
+                : 'N/A'}
+            </Typography>
           </Box>
           <Box display={'flex'} gap={1}>
             <Typography
@@ -109,7 +113,11 @@ function ZakatYearInfo({ zakatYear }) {
             >
               <MonetizationOnOutlinedIcon /> Closin Nisaab
             </Typography>
-            <Typography>{formatMoney(zakatYear?.closingNisab)}</Typography>
+            <Typography>
+              {zakatYear?.closingNisab
+                ? formatMoney(zakatYear?.closingNisab)
+                : 'N/A'}
+            </Typography>
           </Box>
           <Box display={'flex'} gap={1}>
             <Typography

diff --git a/src/devdata/data.js b/src/devdata/data.js
@@ -12,7 +12,14 @@ export const users = Array(4)
   }))
 
 // Dummy Products
-const temp = ['TIGER ELEMAX', 'YAMAHA', 'TECH', 'TECH', 'BIBUT']
+const temp = [
+  'TIGER ELEMAX',
+  'YAMAHA',
+  'TECH',
+  'TECH',
+  'BIBUT',
+  '4ft X 4ft Window',
+]
 export const products = temp.map((name) => {
   const costPrice = Math.round(Math.random() * 10000000) / 100
   const profit = Math.round(Math.random() * 20 * costPrice) / 100
@@ -22,6 +29,7 @@ export const products = temp.map((name) => {
     costPrice,
     quantity: Math.ceil(Math.random() * 100),
     basePrice: costPrice + profit,
+    lastOrderDate: new Date(),
   }
 })
 

diff --git a/src/utils/dateFunctions.js b/src/utils/dateFunctions.js
@@ -30,7 +30,6 @@ export const toDdMmmYy = (dateObj) => {
  */
 
 export const cleanDate = (date) => {
-  if (typeof date === Date) return date
   if (!(date instanceof Date)) {
     if (date?.hasOwnProperty('seconds'))
       date = new Date(date?.seconds * 1000 + date?.nanoseconds / 1000000)