From cc6dfe5ced23371e36ea77b707fa71cd7c9cf9a7 Mon Sep 17 00:00:00 2001
From: mbjelobrk1 <148221673+mbjelobrk1@users.noreply.github.com>
Date: Sat, 24 May 2025 16:50:01 +0200
Subject: [PATCH 1/3] Tax/revenue prikaz

---
 src/api/api.js               | 11 +++++++++++
 src/components/StoreCard.jsx | 38 +++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/api/api.js b/src/api/api.js
index d89aafb..5149cee 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -515,6 +515,17 @@ export const apiGetAllStoresAsync = async () => {
   }
 };
 
+export const apiGetMonthlyStoreRevenueAsync = async (id) => {
+ apiSetAuthHeader();
+    const formData = {
+    id: id,
+    from: firstDayOfMonth.toISOString(), // Convert to ISO string and remove the time part
+    to: lastDayOfMonth.toISOString()  // Convert to ISO string and remove the time part
+    }
+    const rev = await axios.get(`${baseApiUrl}/api/Admin/store/${id}/income`);
+    return rev;
+
+};
 // DELETE product category
 export const apiDeleteProductCategoryAsync = async (categoryId) => {
   if (API_ENV_DEV === API_FLAG) {
diff --git a/src/components/StoreCard.jsx b/src/components/StoreCard.jsx
index 87061fe..0c1effe 100644
--- a/src/components/StoreCard.jsx
+++ b/src/components/StoreCard.jsx
@@ -19,6 +19,7 @@ import {
   apiExportProductsToCSVAsync,
   apiExportProductsToExcelAsync,
   apiCreateProductAsync,
+  apiGetMonthlyStoreRevenueAsync
 } from '@api/api';
 import AddProductModal from '@components/NewProductModal';
 import LocationOnIcon from '@mui/icons-material/LocationOn';
@@ -38,12 +39,14 @@ const StoreCard = ({ store }) => {
   const [updating, setUpdating] = useState(false);
   const fileInputRef = useRef();
   const [parsedProducts, setParsedProducts] = useState([]);
-
+  const [revenue, setRevenue] = useState(0);
   const openStatus = Boolean(anchorEl);
   const openMenu = Boolean(menuAnchor);
 
   useEffect(() => {
     apiGetStoreCategoriesAsync().then(setCategories);
+    const rez = apiGetMonthlyStoreRevenueAsync(store.id);
+    setRevenue(rez);
   }, []);
 
   const handleStatusClick = (e) => setAnchorEl(e.currentTarget);
@@ -257,6 +260,39 @@ const StoreCard = ({ store }) => {
         >
           {store.description}
         </Typography>
+        
+        <Typography
+         variant="body2"
+         color="text.secondary"
+         sx={{
+          mt: 1,
+          fontSize: '0.85rem',
+          }}
+        >
+        Tax: {store.tax}
+        </Typography>
+
+        <Typography
+         variant="body2"
+         color="text.secondary"
+         sx={{
+          mt: 1,
+          fontSize: '0.85rem',
+          }}
+        >
+        Total monthly income: {revenue.totalIncome}
+        </Typography>
+
+        <Typography
+         variant="body2"
+         color="text.secondary"
+         sx={{
+          mt: 1,
+          fontSize: '0.85rem',
+          }}
+        >
+        Taxed monthly income: {revenue.taxedIncome}
+        </Typography>
 
         {/* Buttons */}
         <Box sx={{ mt: 'auto', display: 'flex', alignItems: 'center' }}>

From 1bb5843b19fc66fdcef543c410ab42ef4dc06a03 Mon Sep 17 00:00:00 2001
From: PC <PC@DESKTOP-EDFSFPM>
Date: Sat, 24 May 2025 18:53:11 +0200
Subject: [PATCH 2/3] EditStoreModal-dodavanje editabilnog polja

---
 src/components/EditStoreModal.jsx | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/components/EditStoreModal.jsx b/src/components/EditStoreModal.jsx
index a8f5e94..18415d2 100644
--- a/src/components/EditStoreModal.jsx
+++ b/src/components/EditStoreModal.jsx
@@ -19,6 +19,7 @@ const StoreEditModal = ({ open, onClose, store, onStoreUpdated }) => {
   const [categoryId, setCategoryId] = useState('');
   const [description, setDescription] = useState('');
   const [address, setAddress] = useState('');
+  const [tax, setTax] = useState(''); 
   const [categories, setCategories] = useState([]);
   const [loading, setLoading] = useState(false);
 
@@ -34,6 +35,7 @@ const StoreEditModal = ({ open, onClose, store, onStoreUpdated }) => {
       setCategoryId(store.categoryId || '');
       setDescription(store.description || '');
       setAddress(store.address || '');
+      setTax(store.tax?.toString() || ''); 
     }
   }, [store]);
 
@@ -47,6 +49,7 @@ const StoreEditModal = ({ open, onClose, store, onStoreUpdated }) => {
       address,
       categoryId,
       description,
+      tax: parseFloat(tax), 
       isActive: store.isOnline ?? true,
     };
 
@@ -142,7 +145,23 @@ const StoreEditModal = ({ open, onClose, store, onStoreUpdated }) => {
             margin='normal'
             required
           />
-
+          <TextField
+            label='Tax (%)'
+            type='number'
+            fullWidth
+            value={tax}
+            onChange={(e) => setTax(e.target.value)}
+            margin='normal'
+            required
+            inputProps={{
+              min: 0,
+              step: 0.01,
+              style: {
+                 backgroundColor: 'white',
+                 color: 'black',
+                },
+               }}
+          />
           <Button
             type='submit'
             fullWidth

From f1ef2e5b408fa217252ad79b4fec0d0aa9ebc425 Mon Sep 17 00:00:00 2001
From: mbjelobrk1 <148221673+mbjelobrk1@users.noreply.github.com>
Date: Sun, 25 May 2025 01:42:25 +0200
Subject: [PATCH 3/3] Uvezan porez i dobit

---
 package-lock.json            |  1 +
 src/api/api.js               | 20 +++++++++++---------
 src/components/StoreCard.jsx | 13 +++++++++++--
 src/pages/StoresPage.jsx     |  1 -
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da7e347..960a3b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2836,6 +2836,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
       "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
diff --git a/src/api/api.js b/src/api/api.js
index 5149cee..12b1baa 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -11,6 +11,7 @@ import axios from 'axios';
 import * as XLSX from 'xlsx';
 import ads from '../data/ads.js';
 import sha256 from 'crypto-js/sha256';
+import { format } from 'date-fns';
 //import { GET } from 'superagent';
 const baseApiUrl = import.meta.env.VITE_API_BASE_URL;
 const API_FLAG = import.meta.env.VITE_API_FLAG;
@@ -497,6 +498,7 @@ export const apiUpdateStoreAsync = async (store) => {
       categoryId: store.categoryId,
       description: store.description,
       isActive: store.isActive,
+      tax: store.tax
     });
   }
 };
@@ -510,20 +512,21 @@ export const apiGetAllStoresAsync = async () => {
   } else {
     apiSetAuthHeader();
     const stores = await axios.get(`${baseApiUrl}/api/Admin/stores`);
-    console.log(stores);
     return stores.data;
   }
 };
 
 export const apiGetMonthlyStoreRevenueAsync = async (id) => {
  apiSetAuthHeader();
-    const formData = {
-    id: id,
-    from: firstDayOfMonth.toISOString(), // Convert to ISO string and remove the time part
-    to: lastDayOfMonth.toISOString()  // Convert to ISO string and remove the time part
-    }
-    const rev = await axios.get(`${baseApiUrl}/api/Admin/store/${id}/income`);
-    return rev;
+ const now = new Date();
+ const firstDayOfMonth = new Date(now.getFullYear(), now.getMonth(), 1); // ✅ define it here
+ const lastDayOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0); // ✅ and here
+ const from = format(firstDayOfMonth, 'yyyy-MM-dd');
+ const to = format(lastDayOfMonth, 'yyyy-MM-dd');
+
+    const rev = await axios.get(`${baseApiUrl}/api/Admin/store/${id}/income?from=${from}&to=${to}`);
+    console.log(rev);
+    return rev.data;
 
 };
 // DELETE product category
@@ -1686,6 +1689,5 @@ export const apiFetchDeliveryAddressByIdAsync = async (addressId) => {
   const res = await axios.get(
     `${baseApiUrl}/api/user-profile/address/${addressId}`
   );
-  console.log('RESPONSE Adrese: ', res);
   return res.data; // Vraća objekat adrese
 };
diff --git a/src/components/StoreCard.jsx b/src/components/StoreCard.jsx
index 0c1effe..e7d19bc 100644
--- a/src/components/StoreCard.jsx
+++ b/src/components/StoreCard.jsx
@@ -45,8 +45,17 @@ const StoreCard = ({ store }) => {
 
   useEffect(() => {
     apiGetStoreCategoriesAsync().then(setCategories);
-    const rez = apiGetMonthlyStoreRevenueAsync(store.id);
-    setRevenue(rez);
+    const fetchRevenue = async () => {
+    try {
+      const rez = await apiGetMonthlyStoreRevenueAsync(store.id);
+      console.log(rez.taxedIncome); // ✅ This will now work
+      setRevenue(rez);
+    } catch (error) {
+      console.error("Failed to fetch revenue:", error);
+    }
+  };
+
+  fetchRevenue();
   }, []);
 
   const handleStatusClick = (e) => setAnchorEl(e.currentTarget);
diff --git a/src/pages/StoresPage.jsx b/src/pages/StoresPage.jsx
index 46d739e..a0ac162 100644
--- a/src/pages/StoresPage.jsx
+++ b/src/pages/StoresPage.jsx
@@ -17,7 +17,6 @@ const StoresPage = () => {
   useEffect(() => {
     const fetchStores = async () => {
       const data = await apiGetAllStoresAsync();
-      console.log(data);
       const mapped = data.map((store) => ({
         ...store,
         categoryId: store.categoryId || store.category?.id || 0,