From 6b95656c4db92d9d209c210df8b8cc942ad433c7 Mon Sep 17 00:00:00 2001 From: zadit <75159257+insvrgent@users.noreply.github.com> Date: Sat, 18 Jan 2025 07:42:39 +0700 Subject: [PATCH] ok --- src/App.js | 52 +-- src/components/ButtonWithReplica.css | 7 +- src/components/ButtonWithReplica.js | 2 +- src/components/Header.js | 2 +- src/components/TablesPage.js | 474 +++++++++++++++++++++++++++ src/helpers/cafeHelpers.js | 22 ++ src/pages/CafePage.js | 7 +- src/pages/Cart.js | 6 +- src/pages/Invoice.js | 6 +- src/pages/Transaction_confirmed.js | 6 +- src/pages/Transactions.js | 6 +- src/pages/Transactions.module.css | 2 + 12 files changed, 548 insertions(+), 44 deletions(-) diff --git a/src/App.js b/src/App.js index 57cf6a6..1904384 100644 --- a/src/App.js +++ b/src/App.js @@ -53,6 +53,7 @@ function App() { const [guestSideOfClerk, setGuestSideOfClerk] = useState(null); const [guestSides, setGuestSides] = useState([]); const [shopId, setShopId] = useState(""); + const [shopIdentifier, setShopIdentifier] = useState(""); const [table, setTable] = useState([]); const [totalItemsCount, setTotalItemsCount] = useState(0); const [deviceType, setDeviceType] = useState(""); @@ -94,12 +95,12 @@ function App() { }; }, [shopId]); - const handleSetParam = async ({ shopId, tableCode }) => { - setShopId(shopId); + const handleSetParam = async ({ shopIdentifier, tableCode }) => { + setShopIdentifier(shopIdentifier); if (tableCode) if (table.length == 0) { - const gettable = await getTableByCode(shopId, tableCode); + const gettable = await getTableByCode(shopIdentifier, tableCode); if (gettable) setTable(gettable); } }; @@ -108,8 +109,9 @@ function App() { const fetchData = async () => { console.log("gettingItems"); try { - const { response, cafe, data } = await getItemTypesWithItems(shopId); + const { response, cafe, data } = await getItemTypesWithItems(shopIdentifier); if (response.status === 200) { + setShopId(cafe.cafeId) setShop(cafe); setShopItems(data); console.log(data) @@ -124,11 +126,11 @@ function App() { // Update local storage by removing unavailable items const updatedLocalStorage = JSON.parse(localStorage.getItem("cart")) || []; - const newLocalStorage = updatedLocalStorage.map((cafe) => { - if (cafe.cafeId === shopId) { + const newLocalStorage = updatedLocalStorage.map((cafee) => { + if (cafee.cafeId === cafe.cafeId) { return { - ...cafe, - items: cafe.items.filter((item) => + ...cafee, + items: cafee.items.filter((item) => filteredData.some((filtered) => filtered.itemList.some( (i) => i.itemId === item.itemId && i.availability @@ -137,7 +139,7 @@ function App() { ), }; } - return cafe; + return cafee; }); localStorage.setItem("cart", JSON.stringify(newLocalStorage)); @@ -150,8 +152,8 @@ function App() { } }; - if (shopId !== "") fetchData(); - }, [shopId]); + if (shopIdentifier !== "") fetchData(); + }, [shopIdentifier]); const rmConnectedGuestSides = async (gueseSideSessionId) => { const sessionLeft = await removeConnectedGuestSides(gueseSideSessionId); @@ -265,7 +267,7 @@ function App() { navigate("/guest-side"); }); - socket.on("updateQueue", ({queue}) => { + socket.on("updateQueue", ({ queue }) => { setQueue(queue); // Only set the queue if it's a valid non-empty array console.log("Updated Queue:", queue); // Log the valid queue @@ -533,10 +535,11 @@ function App() { } />