kediritechnopark/groovee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kediritechnopark:ba896106d4b31144c69f9278ea2e0c50090ab7e3
Branches Tags
kediritechnopark:main
...
compare: kediritechnopark:dcf04557729059562a81f855ad62896cde600d65
Branches Tags
kediritechnopark:main

3 Commits
ba896106d4 ... dcf0455772

Author SHA1 Message Date
Vassshhh
dcf0455772 ok 2025-08-27 21:27:08 +07:00
Vassshhh
4fa272875f ok 2025-08-27 10:11:42 +07:00
Vassshhh
40830ee48c ok 2025-08-27 03:14:51 +07:00
24 changed files with 1898 additions and 807 deletions
Expand all files Collapse all files

68
package-lock.json generated
View File

@@ -18,7 +18,6 @@
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
"html-to-image": "^1.11.11",
"html2canvas": "^1.4.1",
"jsqr": "^1.4.0",
"qr-scanner": "^1.4.2",
"qrcode.react": "^3.1.0",
@@ -32,6 +31,7 @@
"react-router-dom": "^6.24.0",
"react-scripts": "5.0.1",
"react-switch": "^7.0.0",
"react-to-print": "^3.1.1",
"react-youtube": "^10.1.0",
"smooth-scroll-into-view-if-needed": "^2.0.2",
"socket.io-client": "^4.7.5",
@@ -6951,15 +6951,6 @@
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"license": "MIT"
},
"node_modules/base64-arraybuffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
"license": "MIT",
"engines": {
"node": ">= 0.6.0"
}
},
"node_modules/batch": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -7874,15 +7865,6 @@
"postcss": "^8.4"
}
},
"node_modules/css-line-break": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
"integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
"license": "MIT",
"dependencies": {
"utrie": "^1.0.2"
}
},
"node_modules/css-loader": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
@@ -11155,19 +11137,6 @@
}
}
},
"node_modules/html2canvas": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
"integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
"license": "MIT",
"dependencies": {
"css-line-break": "^2.1.0",
"text-segmentation": "^1.0.3"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/htmlparser2": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -18206,6 +18175,15 @@
"react-dom": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
}
},
"node_modules/react-to-print": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/react-to-print/-/react-to-print-3.1.1.tgz",
"integrity": "sha512-N0MUMhpl8nkGri13BjP7zusj3B/j+1eMOTt8N8PYuhBYGzA4PqTXqcihJ9cZw996dvhV6mBdwafIQCg3Ap5bKg==",
"license": "MIT",
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ~19"
}
},
"node_modules/react-transition-group": {
"version": "4.4.5",
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -20504,15 +20482,6 @@
"node": ">=8"
}
},
"node_modules/text-segmentation": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
"integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
"license": "MIT",
"dependencies": {
"utrie": "^1.0.2"
}
},
"node_modules/text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -20826,9 +20795,9 @@
}
},
"node_modules/typescript": {
"version": "5.9.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
"integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
"version": "4.9.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
"integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
"license": "Apache-2.0",
"peer": true,
"bin": {
@@ -20836,7 +20805,7 @@
"tsserver": "bin/tsserver"
},
"engines": {
"node": ">=14.17"
"node": ">=4.2.0"
}
},
"node_modules/unbox-primitive": {
@@ -21055,15 +21024,6 @@
"node": ">= 0.4.0"
}
},
"node_modules/utrie": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
"integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
"license": "MIT",
"dependencies": {
"base64-arraybuffer": "^1.0.2"
}
},
"node_modules/uuid": {
"version": "8.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",

2
package.json
View File

@@ -14,7 +14,6 @@
"crypto-js": "^4.2.0",
"dayjs": "^1.11.13",
"html-to-image": "^1.11.11",
"html2canvas": "^1.4.1",
"jsqr": "^1.4.0",
"qr-scanner": "^1.4.2",
"qrcode.react": "^3.1.0",
@@ -28,6 +27,7 @@
"react-router-dom": "^6.24.0",
"react-scripts": "5.0.1",
"react-switch": "^7.0.0",
"react-to-print": "^3.1.1",
"react-youtube": "^10.1.0",
"smooth-scroll-into-view-if-needed": "^2.0.2",
"socket.io-client": "^4.7.5",

194
src/App.js
View File

@@ -10,7 +10,6 @@ import {
} from "react-router-dom";
import socket from "./services/socketService";
import Dashboard from "./pages/Dashboard";
import ScanMeja from "./pages/ScanMeja";
import CafePage from "./pages/CafePage";
@@ -27,7 +26,7 @@ import { getTableByCode } from "./helpers/tableHelper.js";
import {
getTransactionsFromCafe,
checkIsMyTransaction
checkIsMyTransaction,
} from "./helpers/transactionHelpers";
import {
getConnectedGuestSides,
@@ -45,7 +44,7 @@ import {
} from "./helpers/subscribeHelpers.js";
import Modal from "./components/Modal"; // Import your modal component
import { requestNotificationPermission } from './services/notificationService'; // Import the notification service
import { requestNotificationPermission } from "./services/notificationService"; // Import the notification service
function App() {
const location = useLocation();
@@ -73,35 +72,32 @@ function App() {
const [newTransaction, setNewTransaction] = useState({});
const queryParams = new URLSearchParams(location.search);
const tokenParams = queryParams.get("token");
if(tokenParams) localStorage.setItem('auth', tokenParams)
if (tokenParams) localStorage.setItem("auth", tokenParams);
const validTransactionStates = [
'new_transaction',
'transaction_canceled',
'transaction_pending',
'transaction_confirmed',
'payment_claimed',
'transaction_success',
'transaction_end',
'transaction_failed',
"new_transaction",
"transaction_canceled",
"transaction_pending",
"transaction_confirmed",
"payment_claimed",
"transaction_success",
"transaction_end",
"transaction_failed",
];
const calculateTotalsFromLocalStorage = () => {
const { totalCount, totalPrice } = calculateTotals(shopId);
setTotalItemsCount(totalCount);
setTotalPrice(totalPrice);
// If 'lastTransaction' exists, proceed
const lastTransaction = JSON.parse(localStorage.getItem("lastTransaction"));
console.log(lastTransaction);
if (lastTransaction != null) {
console.log(lastTransaction)
console.log(lastTransaction);
setLastTransaction(lastTransaction);
}
};
@@ -145,9 +141,13 @@ function App() {
return;
}
setModal('transaction_confirmed', { transactionId: lastTransaction.transactionId })
const myLastTransaction = await checkIsMyTransaction(lastTransaction.transactionId);
console.log(myLastTransaction)
setModal("transaction_confirmed", {
transactionId: lastTransaction.transactionId,
});
const myLastTransaction = await checkIsMyTransaction(
lastTransaction.transactionId
);
console.log(myLastTransaction);
if (myLastTransaction.isMyTransaction) {
setLastTransaction(lastTransaction);
} else {
@@ -155,7 +155,6 @@ function App() {
}
};
const handleSetParam = async ({ shopIdentifier, tableCode }) => {
setShopIdentifier(shopIdentifier);
@@ -170,12 +169,14 @@ function App() {
const fetchData = async () => {
console.log("gettingItems");
try {
const { response, cafe, data } = await getItemTypesWithItems(shopIdentifier);
const { response, cafe, data } = await getItemTypesWithItems(
shopIdentifier
);
if (response.status === 200) {
setShopId(cafe.cafeId)
setShopId(cafe.cafeId);
setShop(cafe);
setShopItems(data);
console.log(data)
console.log(data);
// Filter out unavailable items
const filteredData = data
.map((itemType) => ({
@@ -241,7 +242,7 @@ function App() {
// Call `setModal` with content and parameters
setModal("transaction_pending", data);
localStorage.setItem('cart', []);
localStorage.setItem("cart", []);
calculateTotalsFromLocalStorage();
});
@@ -250,7 +251,7 @@ function App() {
console.log(JSON.stringify(data));
setModal("transaction_confirmed", data);
localStorage.setItem('cart', []);
localStorage.setItem("cart", []);
// const startTime = Date.now(); // Capture the start time
// const timeout = 10000; // 10 seconds timeout in milliseconds
@@ -266,7 +267,9 @@ function App() {
// }
// If 'lastTransaction' exists, proceed
const lastTransaction = JSON.parse(localStorage.getItem("lastTransaction"));
const lastTransaction = JSON.parse(
localStorage.getItem("lastTransaction")
);
console.log(lastTransaction);
if (lastTransaction != null) {
@@ -274,7 +277,6 @@ function App() {
}
});
socket.on("transaction_success", async (data) => {
console.log("transaction notification");
setModal("transaction_success", data);
@@ -316,7 +318,6 @@ function App() {
}
});
const handleNotificationClick = async () => {
const permission = await requestNotificationPermission();
@@ -325,7 +326,7 @@ function App() {
// Set up notifications or show a success modal
} else {
console.error("Notification permission denied.");
setModal('blocked_notification'); // Show modal for blocked notifications
setModal("blocked_notification"); // Show modal for blocked notifications
}
};
@@ -334,10 +335,21 @@ function App() {
// Check current permission
const searchParams = new URLSearchParams(location.search);
let searchModal = searchParams.get("modal") || ''; // Get transactionId or set it to empty string
let searchModal = searchParams.get("modal") || ""; // Get transactionId or set it to empty string
if (permission !== "granted" && searchModal == '') {
setModal("message", { captMessage: 'Notifikasi tidak aktif', descMessage: 'Aktifkan notifikasi supaya kamu tetap dapat info pesanan, meski sedang buka aplikasi lain.', yesText: 'Aktifkan', noText: 'Tutup' }, null, handleNotificationClick);
if (permission !== "granted" && searchModal == "") {
setModal(
"message",
{
captMessage: "Notifikasi tidak aktif",
descMessage:
"Aktifkan notifikasi supaya kamu tetap dapat info pesanan, meski sedang buka aplikasi lain.",
yesText: "Aktifkan",
noText: "Tutup",
},
null,
handleNotificationClick
);
}
};
@@ -346,10 +358,15 @@ function App() {
removeLocalStorage("auth");
setDeviceType("guestDevice");
} else {
console.log(data)
if (data.data.user.cafeId != null) navigate(`/${data.data.user.cafeIdentityName}`, { replace: true });
console.log(data);
if (data.data.user.cafeId != null)
navigate(`/${data.data.user.cafeIdentityName}`, { replace: true });
setUser(data.data.user);
if (data.data.latestOpenBillTransaction != null) localStorage.setItem('lastTransaction', JSON.stringify(data.data.latestOpenBillTransaction))
if (data.data.latestOpenBillTransaction != null)
localStorage.setItem(
"lastTransaction",
JSON.stringify(data.data.latestOpenBillTransaction)
);
if (
data.data.user.password == "unsetunsetunset" &&
localStorage.getItem("settings")
@@ -360,7 +377,7 @@ function App() {
setGuestSides(connectedGuestSides.sessionDatas);
console.log("getting guest side");
setDeviceType("clerk");
checkNotifications();
// checkNotifications();
} else {
setDeviceType("guestDevice");
}
@@ -393,7 +410,6 @@ function App() {
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
});
return () => {
@@ -402,7 +418,6 @@ function App() {
}, [socket, shopId]);
async function checkIfStillViewingOtherTransaction(data) {
console.log("transaction notification");
console.log(modalContent);
@@ -412,21 +427,21 @@ function App() {
// Get current URL's search parameters inside the socket event handler
const searchParams = new URLSearchParams(location.search);
let transaction_info = searchParams.get("transactionId") || ''; // Get transactionId or set it to empty string
let transaction_info = searchParams.get("transactionId") || ""; // Get transactionId or set it to empty string
if (response[0].transactionId != transaction_info)
transactionList.current = response;
if(response[0].transactionId != transaction_info) transactionList.current = response;
let depthh = transactionList.current.findIndex(
item => item.transactionId.toString() === transaction_info.toString()
(item) => item.transactionId.toString() === transaction_info.toString()
);
if (transaction_info != response[0].transactionId)
setDepth(depthh);
if (transaction_info != response[0].transactionId) setDepth(depthh);
else setModal("new_transaction", data);
console.log(transaction_info == response[0].transactionId)
console.log(transaction_info == response[0].transactionId);
// If transaction_info is an empty string, set the modal
if (transaction_info.toString() == '') return false;
if (transaction_info.toString() == "") return false;
else return true;
}
@@ -436,13 +451,14 @@ function App() {
console.log("transaction notification");
setNewTransaction(data);
if(!location.pathname.endsWith('/transactions')){
const isViewingOtherTransaction = await checkIfStillViewingOtherTransaction(data);
// If transaction_info is an empty string, set the modal
if (!isViewingOtherTransaction) {
setModal("new_transaction", data);
if (!location.pathname.endsWith("/transactions")) {
const isViewingOtherTransaction =
await checkIfStillViewingOtherTransaction(data);
// If transaction_info is an empty string, set the modal
if (!isViewingOtherTransaction) {
setModal("new_transaction", data);
}
}
}
// Show browser notification
let permission = Notification.permission;
if (permission !== "granted") return;
@@ -458,13 +474,14 @@ function App() {
console.log("transaction notification");
setNewTransaction(data);
if(location.pathname != '/transactions'){
const isViewingOtherTransaction = await checkIfStillViewingOtherTransaction(data);
// If transaction_info is an empty string, set the modal
if (!isViewingOtherTransaction) {
setModal("new_transaction", data);
navigate(`?transactionId=${data.transactionId}`, { replace: true });
}
if (location.pathname != "/transactions") {
const isViewingOtherTransaction =
await checkIfStillViewingOtherTransaction(data);
// If transaction_info is an empty string, set the modal
if (!isViewingOtherTransaction) {
setModal("new_transaction", data);
navigate(`?transactionId=${data.transactionId}`, { replace: true });
}
}
});
@@ -473,34 +490,36 @@ function App() {
socket.off("transaction_created");
socket.off("transaction_canceled");
};
}, [socket, shopId, location]); // Ensure location is in the dependencies to respond to changes in the URL
}, [socket, shopId, location]); // Ensure location is in the dependencies to respond to changes in the URL
function handleMoveToTransaction(direction, from) {
console.log(direction);
console.log(from);
// Find the current index based on the 'from' transactionId
const currentIndex = transactionList.current.findIndex(item => item.transactionId == from);
const currentIndex = transactionList.current.findIndex(
(item) => item.transactionId == from
);
// Determine the new transactionId based on the direction
let newTransactionId;
if (direction === 'next') {
if (direction === "next") {
// If we're not at the last transaction, get the next transactionId
newTransactionId = currentIndex < transactionList.current.length - 1
? transactionList.current[currentIndex + 1].transactionId
: from; // If already at the end, stay on the current transactionId
} else if (direction === 'previous') {
newTransactionId =
currentIndex < transactionList.current.length - 1
? transactionList.current[currentIndex + 1].transactionId
: from; // If already at the end, stay on the current transactionId
} else if (direction === "previous") {
setDepth(currentIndex - 1);
// If we're not at the first transaction, get the previous transactionId
newTransactionId = currentIndex > 0
? transactionList.current[currentIndex - 1].transactionId
: from; // If already at the beginning, stay on the current transactionId
newTransactionId =
currentIndex > 0
? transactionList.current[currentIndex - 1].transactionId
: from; // If already at the beginning, stay on the current transactionId
}
// Log the new transactionId
console.log('New Transaction ID:', newTransactionId);
console.log("New Transaction ID:", newTransactionId);
// Update the URL with the new transactionId using navigate
navigate(`?transactionId=${newTransactionId}`, { replace: true });
@@ -510,7 +529,6 @@ function App() {
// setModalContent({ cafeId: shopId, transactionId: newTransactionId });
}
const handleModalFromURL = () => {
const queryParams = new URLSearchParams(location.search);
const modal = queryParams.get("modal");
@@ -542,8 +560,8 @@ function App() {
document.body.style.overflow = "hidden";
setIsModalOpen(true);
setModalContent(content)
console.log(onCloseFunction)
setModalContent(content);
console.log(onCloseFunction);
if (onCloseFunction) {
setOnModalCloseFunction(() => onCloseFunction); // Store the close function
@@ -560,7 +578,8 @@ function App() {
const closeModal = (closeTheseContent = []) => {
if (
Array.isArray(closeTheseContent) &&
(closeTheseContent.length === 0 || closeTheseContent.includes(modalContent))
(closeTheseContent.length === 0 ||
closeTheseContent.includes(modalContent))
) {
setIsModalOpen(false);
setModalContent(null);
@@ -569,16 +588,16 @@ function App() {
const queryParams = new URLSearchParams(location.search);
// Clear all query parameters
queryParams.keys() && [...queryParams.keys()].forEach(key => {
queryParams.delete(key);
});
queryParams.keys() &&
[...queryParams.keys()].forEach((key) => {
queryParams.delete(key);
});
// Update the URL without any query parameters
navigate({ search: queryParams.toString() }, { replace: true });
}
};
// useEffect(() => {
// const askNotificationPermission = async () => {
// let permission = Notification.permission;
@@ -637,11 +656,15 @@ function App() {
useEffect(() => {
if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("/service-worker.js")
.then(registration => {
console.log("Service Worker registered with scope:", registration.scope);
navigator.serviceWorker
.register("/service-worker.js")
.then((registration) => {
console.log(
"Service Worker registered with scope:",
registration.scope
);
})
.catch(error => {
.catch((error) => {
console.error("Service Worker registration failed:", error);
});
}
@@ -702,6 +725,9 @@ function App() {
cartItemsLength={totalItemsCount}
totalPrice={totalPrice}
lastTransaction={lastTransaction}
shop={shop}
totalItemsCount={totalItemsCount}
deviceType={deviceType}
/>
</>
}

291
src/components/Header.js
View File

@@ -35,11 +35,16 @@ const Title = styled.h2`
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
font-size:${(props) => (props.HeaderSize)};
font-size: ${(props) => props.HeaderSize};
color: rgba(88, 55, 50, 1);
text-transform: uppercase;
@media (min-width: 768px) {
font-size: 2vw;
}
`;
const ProfileName = styled.h2`
position: absolute;
font-family: "Plus Jakarta Sans", sans-serif;
@@ -81,8 +86,8 @@ const gg = keyframes`
height: 60px;
}
100% {
top: 45px;
right: 51px;
top: 5px;
right: 20px;
width: 200px;
height: 40px;
}
@@ -90,8 +95,8 @@ const gg = keyframes`
const ss = keyframes`
0% {
top: 45px;
right: 51px;
top: 5px;
right: 20px;
width: 200px;
height: 40px;
}
@@ -127,8 +132,8 @@ const g = keyframes`
height: 60px;
}
100% {
top: 28px;
right: 242px;
top: 34px;
right: 229px;
width: 40px;
height: 40px;
}
@@ -137,7 +142,7 @@ const g = keyframes`
const s = keyframes`
0% {
top: 28px;
right: 242px;
right: 229px;
width: 40px;
height: 40px;
}
@@ -151,14 +156,15 @@ const s = keyframes`
const grow = keyframes`
0% {
right: 12px;
right: 0px;
top: 0px;
width: 60px;
height: 60px;
border-top-left-radius: 50%;
border-bottom-left-radius: 50%;
}
100% {
right: 28px;
right: -17px;
width: 300px;
border-top-left-radius: 15px;
border-bottom-left-radius: 15px;
@@ -167,13 +173,14 @@ const grow = keyframes`
const shrink = keyframes`
0% {
right: 12px;
right: -17px;
width: 300px;
height: auto;
border-radius: 20px;
}
100% {
right: 28px;
right: 0px;
top: 0px;
width: 60px;
height: 60px;
border-radius: 50%;
@@ -182,7 +189,7 @@ const shrink = keyframes`
const Rectangle = styled.div`
overflow-y: hidden;
position: absolute;
top: 39px;
top: 9px;
right: 12px;
width: 200px;
max-height: 87vh; /* or another appropriate value */
@@ -321,61 +328,107 @@ const Header = ({
// Otherwise, use the possessive function
return `${cafeName}'s menu`;
};
return (
return (
<HeaderBarbackground shopName={shopName}>
<HeaderBar HeaderMargin={HeaderMargin} shopName={shopName}>
<Title HeaderSize={HeaderSize}>
{shopName == null
? HeaderText == null
? "kedaimaster"
: HeaderText
: shopName}
</Title>
<div style={{ visibility: showProfile ? "visible" : "hidden" }}>
<ProfileImage
src={shopImage && !shopImage.includes('undefined') ? shopImage || 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-DjX_bGBax4NL14ULvkAdU4FP3FKoWXWu5w&s' : "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-DjX_bGBax4NL14ULvkAdU4FP3FKoWXWu5w&s"}
alt="Profile"
onClick={user.username !== undefined ? handleImageClick : null}
animate={showRectangle && animate}
/>
<ProfileName animate={showRectangle && animate}>
{showProfile && user.username !== undefined ? user.username : "guest"}
</ProfileName>
{showRectangle && (
<Rectangle ref={rectangleRef} animate={animate}>
<ChildContainer>
{guestSideOfClerk && guestSideOfClerk.clerkUsername && (
<Child hasChildren>
this is the guest side of {guestSideOfClerk.clerkUsername}
</Child>
)}
{user.username !== undefined && (
<Child onClick={() => setModal("edit_account")}>
Kelola akun
</Child>
)}
{user.roleId == 0 && (
<Child onClick={()=>setModal('create_coupon', {})}>Buat Voucher</Child>)}
{shopId && user.roleId == 1 && (
<Child onClick={goToAdminCafes}>Dashboard</Child>)}
{shopId &&
user.user_id == shopOwnerId &&
user.username !== undefined &&
user.roleId === 1 && (
<>
<Child hasChildren>
<Child>
{shopName}
<HeaderBar HeaderMargin={HeaderMargin} shopName={shopName}>
<Title HeaderSize={HeaderSize}>
{shopName == null
? HeaderText == null
? "kedaimaster"
: HeaderText
: shopName}
</Title>
<div style={{ visibility: showProfile ? "visible" : "hidden", position: 'relative' }}>
<ProfileImage
src={shopImage && !shopImage.includes('undefined') ? shopImage || 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-DjX_bGBax4NL14ULvkAdU4FP3FKoWXWu5w&s' : "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-DjX_bGBax4NL14ULvkAdU4FP3FKoWXWu5w&s"}
alt="Profile"
onClick={user.username !== undefined ? handleImageClick : null}
animate={showRectangle && animate}
/>
<ProfileName animate={showRectangle && animate}>
{showProfile && user.username !== undefined ? user.username : "guest"}
</ProfileName>
{showRectangle && (
<Rectangle ref={rectangleRef} animate={animate}>
<ChildContainer>
{guestSideOfClerk && guestSideOfClerk.clerkUsername && (
<Child hasChildren>
this is the guest side of {guestSideOfClerk.clerkUsername}
</Child>
)}
{user.username !== undefined && (
<Child onClick={() => setModal("edit_account")}>
Kelola akun
</Child>
)}
{user.roleId == 0 && (
<Child onClick={() => setModal('create_coupon', {})}>Buat Voucher</Child>)}
{shopId && user.roleId == 1 && (
<Child onClick={goToAdminCafes}>Dashboard</Child>)}
{shopId &&
user.user_id == shopOwnerId &&
user.username !== undefined &&
user.roleId === 1 && (
<>
<Child hasChildren>
<Child>
{shopName}
</Child>
<Child onClick={() => setModal("reports")}>Lihat laporan</Child>
<Child onClick={() => setModal("add_material")}>
Kelola stok
</Child>
<Child hasChildren>
<Child>Konfigurasi</Child>
<Child onClick={() => setModal("welcome_config")}>
Desain kafe
</Child>
<Child onClick={() => setModal("edit_tables")}>
Identifikasi kedai
</Child>
<Child onClick={() => setModal("payment_option")}>
Metode pembayaran
</Child>
</Child>
<Child hasChildren>
<Child>Kasir</Child>
<Child onClick={() => setModal("create_clerk")}>
+ Tambah
</Child>
{shopClerks &&
shopClerks.map((key, index) => (
<Child key={index}>
{shopClerks[index].username}
<button
onClick={() =>
removeConnectedGuestSides(
guestSides[index][3]
)
}
>
remove
</button>
</Child>
))}
</Child>
</Child>
</>
)}
{user.username !== undefined &&
user.cafeId == shopId &&
user.roleId === 2 && (
<Child hasChildren>
<Child>{shopName}</Child>
<Child>
Mode Edit &nbsp;
Mode Edit&nbsp;
<Switch
borderRadius={0}
checked={isEditMode}
onChange={() => setIsEditMode(!isEditMode)}
/>
</Child>
<Child onClick={() => setModal("reports")}>Lihat laporan</Child>
<Child onClick={() => setModal("add_material")}>
Kelola stok
</Child>
@@ -392,97 +445,43 @@ const Header = ({
Metode pembayaran
</Child>
</Child>
<Child hasChildren>
<Child>Kasir</Child>
<Child onClick={() => setModal("create_clerk")}>
+ Tambah
</Child>
{shopClerks &&
shopClerks.map((key, index) => (
<Child key={index}>
{shopClerks[index].username}
<button
onClick={() =>
removeConnectedGuestSides(
guestSides[index][3]
)
}
>
remove
</button>
{user.username !== undefined &&
user.roleId == 2 &&
user.cafeId == shopId && (
<Child hasChildren>
Tablet tamu
<Child onClick={goToGuestSideLogin}>
+ Tambah
</Child>
))}
</Child>
</Child>
</>
)}
{user.username !== undefined &&
user.cafeId == shopId &&
user.roleId === 2 && (
<Child hasChildren>
<Child>{shopName}</Child>
<Child>
Mode Edit&nbsp;
<Switch
borderRadius={0}
checked={isEditMode}
onChange={() => setIsEditMode(!isEditMode)}
/>
</Child>
<Child onClick={() => setModal("add_material")}>
Kelola stok
</Child>
<Child hasChildren>
<Child>Konfigurasi</Child>
<Child onClick={() => setModal("welcome_config")}>
Desain kafe
</Child>
<Child onClick={() => setModal("edit_tables")}>
Identifikasi kedai
</Child>
<Child onClick={() => setModal("payment_option")}>
Metode pembayaran
</Child>
</Child>
{user.username !== undefined &&
user.roleId == 2 &&
user.cafeId == shopId && (
<Child hasChildren>
Tablet tamu
<Child onClick={goToGuestSideLogin}>
+ Tambah
{guestSides &&
guestSides.map((key, index) => (
<Child key={index}>
guest side {index + 1}
<button
onClick={() =>
removeConnectedGuestSides(
guestSides[index][3]
)
}
>
remove
</button>
</Child>
))}
</Child>
{guestSides &&
guestSides.map((key, index) => (
<Child key={index}>
guest side {index + 1}
<button
onClick={() =>
removeConnectedGuestSides(
guestSides[index][3]
)
}
>
remove
</button>
</Child>
))}
</Child>
)}
)}
<Child onClick={() => setModal("reports")}>Laporan</Child>
</Child>
<Child onClick={() => setModal("reports")}>Laporan</Child>
</Child>
)}
{user.username !== undefined && (
<Child hasChildren ><Child onClick={isLogout}>Logout</Child></Child>
)}
{user.username !== undefined && (
<Child hasChildren ><Child onClick={isLogout}>Logout</Child></Child>
)}
</ChildContainer>
</Rectangle>
)}
</div>
</HeaderBar></HeaderBarbackground>
</ChildContainer>
</Rectangle>
)}
</div>
</HeaderBar></HeaderBarbackground>
);
};

56
src/components/Item.js
View File

@@ -29,6 +29,51 @@ const Item = ({
const [itemDescription, setItemDescription] = useState(initialDescription);
const fileInputRef = useRef(null);
const formatToRupiah = (value) => {
if (typeof value !== "number") return value;
return value.toLocaleString("id-ID");
// const stringValue = (value || '').toString();
// // Ambil hanya angka
// const cleaned = stringValue.replace(/[^0-9]/g, '');
// // Pastikan cleaned bukan kosong
// if (!cleaned) return 'Rp0';
// // Ubah ke number dan kalikan 1000
// const number = Number(cleaned) * 1000;
// // Kalau gagal parsing, fallback
// if (isNaN(number)) return 'Rp0';
// // Format rupiah tanpa desimal
// return number.toLocaleString('id-ID', {
// style: 'currency',
// currency: 'IDR',
// minimumFractionDigits: 0,
// maximumFractionDigits: 0
// });
};
const rupiahFormat = (angka, prefix = "Rp. ") => {
let number_string = angka.toString().replace(/[^,\d]/g, '');
let split = number_string.split(',');
let sisa = split[0].length % 3;
let rupiah = split[0].substr(0, sisa);
let ribuan = split[0].substr(sisa).match(/\d{3}/gi);
// tambahkan titik jika yang di input sudah menjadi angka ribuan
if(ribuan){
let separator = sisa ? '.' : '';
rupiah += separator + ribuan.join('.');
}
rupiah = split[1] != undefined ? rupiah + ',' + split[1] : rupiah;
return rupiah ? prefix + rupiah : "";
}
useEffect(() => {
console.log(imageUrl);
console.log(selectedImage);
@@ -156,7 +201,6 @@ const Item = ({
</h3>
{forInvoice && (
<>
<p className={styles.multiplySymbol}>x</p>
<p className={styles.qtyInvoice}>{itemQty}</p>
</>
)}
@@ -208,12 +252,12 @@ const Item = ({
marginLeft: '1rem',
marginRight: '0.5rem',
marginTop: '0.125rem'
}}>{promoPrice}</span>
}}>{formatToRupiah(promoPrice)}</span>
<span style={{
marginTop: '0.125rem',
color: 'rgb(114, 114, 114)',
textDecoration: 'line-through'
}}>{initialPrice}</span>
}}>{formatToRupiah(initialPrice)}</span>
</div>
</>
:
@@ -223,7 +267,7 @@ const Item = ({
<span style={{
marginRight: '0.5rem',
marginTop: '0.125rem'
}}>{initialPrice}</span>
}}>{formatToRupiah(initialPrice)}</span>
</div>
</>
}
@@ -302,7 +346,9 @@ const Item = ({
))}
{forInvoice && (
<p className={styles.itemPriceInvoice}>Rp {itemQty * (promoPrice > 0? promoPrice : itemPrice)}</p>
<p className={styles.itemPriceInvoice}>Rp {formatToRupiah(itemQty * (promoPrice > 0? promoPrice : itemPrice))}</p>
// <p className={styles.itemPriceInvoice}>{itemQty * (promoPrice > 0? rupiahFormat(promoPrice) : rupiahFormat(itemPrice))}</p>
)}
</div>
{forCart && (

312
src/components/Item.module.css
View File

@@ -13,9 +13,12 @@
margin-bottom: 5px;
color: rgba(88, 55, 50, 1);
font-size: 32px;
box-sizing: border-box; /* Include padding and border in the element's total width */
width: 100%; /* Ensure the item does not exceed the parent's width */
overflow: hidden; /* Prevent internal overflow */
box-sizing: border-box;
/* Include padding and border in the element's total width */
width: 100%;
/* Ensure the item does not exceed the parent's width */
overflow: hidden;
/* Prevent internal overflow */
padding-top: 10px;
margin-bottom: 5px;
}
@@ -24,7 +27,7 @@
/* border-top: 2px solid #00000017; */
}
.notLast{
.notLast {
padding-bottom: 10px;
border-bottom: 2px solid #00000017;
}
@@ -40,7 +43,8 @@
}
.itemInvoice:last-child {
margin-bottom: 0; /* Remove margin-bottom for the last child */
margin-bottom: 0;
/* Remove margin-bottom for the last child */
}
.itemImage {
@@ -102,7 +106,8 @@
.itemName {
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
width: calc(100% - 15px); /* Adjust the width to prevent overflow */
width: calc(100% - 15px);
/* Adjust the width to prevent overflow */
font-size: 5vw;
font-weight: 500;
margin-top: 0;
@@ -131,7 +136,8 @@
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
font-weight: 600;
width: calc(100% - 15px); /* Adjust the width to prevent overflow */
width: calc(100% - 15px);
/* Adjust the width to prevent overflow */
font-size: 3.3vw;
/* margin-bottom: 35px; */
margin-left: 5px;
@@ -175,7 +181,8 @@
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
font-weight: 600;
width: 30px; /* Adjust the width to prevent overflow */
width: 30px;
/* Adjust the width to prevent overflow */
font-size: 0.9rem;
margin-bottom: 10px;
text-align: center;
@@ -184,18 +191,19 @@
.addButton {
background-color: #ffffff;
border: 2px solid #a8c7a9;
/* border: none; */
display: inline-block;
font-size: 14px;
font-weight: 600;
cursor: pointer;
width: 87px;
height: 32px;
margin-left: 5px;
margin-top: 5px;
border-radius: 20px;
border: 2px solid #a8c7a9;
/* border: none; */
display: inline-block;
font-size: 14px;
font-weight: 600;
cursor: pointer;
width: 87px;
height: 32px;
margin-left: 5px;
margin-top: 5px;
border-radius: 20px;
}
.grayscale {
filter: grayscale(100%);
}
@@ -203,6 +211,7 @@
.disabled {
color: gray;
}
.plusNegative {
width: 35px;
height: 35px;
@@ -217,6 +226,7 @@
left: -33px;
top: 21px;
}
.remove {
width: 25px;
height: 25px;
@@ -249,3 +259,267 @@
left: 15px;
right: 15px;
}
@media (min-width: 768px) {
.itemContainer {
display: flex;
flex-direction: column;
/* gap: 10px; */
}
.item {
display: flex;
align-items: stretch;
justify-content: space-between;
padding-left: 5px;
margin-top: 5px;
margin-bottom: 5px;
color: rgba(88, 55, 50, 1);
font-size: 32px;
box-sizing: border-box;
/* Include padding and border in the element's total width */
width: 100%;
/* Ensure the item does not exceed the parent's width */
overflow: hidden;
/* Prevent internal overflow */
padding-top: 10px;
margin-bottom: 5px;
}
.item:not(.itemInvoice) {
/* border-top: 2px solid #00000017; */
}
.notLast {
padding-bottom: 10px;
border-bottom: 2px solid #00000017;
}
.itemInvoice {
flex-direction: row;
align-items: center;
justify-content: space-around;
font-size: 18px;
margin-top: 0px;
margin-bottom: 0px;
padding-top: 0px;
}
.itemInvoice:last-child {
margin-bottom: 0;
/* Remove margin-bottom for the last child */
}
.itemImage {
width: 100%;
height: 100%;
}
.imageContainer {
position: relative;
width: 20%;
height: 20%;
border-radius: 12px;
object-fit: cover;
}
.overlay {
position: absolute;
top: 15px;
left: 8px;
right: 8px;
bottom: 15px;
background-color: rgba(0, 0, 0, 0.5);
color: white;
display: flex;
justify-content: center;
align-items: center;
border-radius: 20px;
cursor: pointer;
transition: background-color 0.3s ease;
font-size: 3.3vw;
}
.overlay:hover {
background-color: rgba(0, 0, 0, 0.7);
}
.fileInput {
display: none;
}
.itemDetails {
display: flex;
flex-direction: column;
justify-content: space-between;
margin-left: 10px;
margin-right: 10px;
flex-grow: 1;
}
.itemInvoiceDetails {
display: flex;
flex-direction: column;
justify-content: space-between;
margin-left: 10px;
margin-top: -15px;
flex-grow: 1;
}
.itemName {
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
width: calc(100% - 15px);
/* Adjust the width to prevent overflow */
font-size: 5vw;
font-weight: 500;
margin-top: 0;
margin: 0 5px;
color: rgba(88, 55, 50, 1);
background-color: transparent;
text-transform: capitalize;
}
.itemInvoiceName {
width: calc(260% - 15px);
background-color: transparent;
font-size: 1.3rem;
font-weight: 500;
}
.multiplySymbol {
font-weight: 600;
}
.qtyInvoice {
font-weight: 500;
}
.itemPrice {
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
font-weight: 600;
width: calc(100% - 15px);
/* Adjust the width to prevent overflow */
font-size: 3.3vw;
/* margin-bottom: 35px; */
margin-left: 5px;
color: #3a3a3a;
background-color: transparent;
}
.itemPriceInvoice {
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
font-weight: 600;
font-size: 0.9rem;
margin-left: 5px;
color: #d9c61c;
text-align: right;
margin-top: 22px;
}
.itemQty {
display: flex;
align-items: center;
font-size: 0.9rem;
margin-left: 5px;
color: #a8c7a9;
fill: #a8c7a9;
height: 40px;
}
.itemQtyValue {
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
font-weight: 600;
margin-top: 19px;
margin-left: 1px;
margin-right: 1px;
width: 25px;
text-align: center;
}
.itemQtyInput {
font-family: "Plus Jakarta Sans", sans-serif;
font-style: normal;
font-weight: 600;
width: 30px;
/* Adjust the width to prevent overflow */
font-size: 0.9rem;
margin-bottom: 10px;
text-align: center;
background-color: transparent;
}
.addButton {
background-color: #ffffff;
border: 2px solid #a8c7a9;
/* border: none; */
display: inline-block;
font-size: 14px;
font-weight: 600;
cursor: pointer;
width: 87px;
height: 32px;
margin-left: 5px;
margin-top: 5px;
border-radius: 20px;
}
.grayscale {
filter: grayscale(100%);
}
.disabled {
color: gray;
}
.plusNegative {
width: 35px;
height: 35px;
margin: 2.5px 0 -0.5px 0px;
}
.plusNegative2 {
width: 84px;
height: 21px;
position: absolute;
transform: rotate(45deg);
left: -33px;
top: 21px;
}
.remove {
width: 25px;
height: 25px;
margin-top: -10px;
margin-right: 10px;
}
.itemInvoice .itemDetails {
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.itemInvoice .itemName,
.itemInvoice .itemPrice,
.itemInvoice .itemQty .qtyInvoice .multiplySymbol {
font-size: 0.9rem;
}
.blank {
border: 1px solid #000000;
}
.notblank {
border: 1px solid #ffffff00;
}
.createItem {
position: absolute;
left: 15px;
right: 15px;
}
}

2
src/components/ItemConfig.js
View File

@@ -243,7 +243,7 @@ const ItemConfig = ({
<ThreeDots height={20} width={20} />
) : (
isBeingEdit ? 'Simpan' : 'Buat Item'
isBeingEdit ? 'Simpan' : 'Simpan'
)}
</div>

2
src/components/ItemLister.module.css
View File

@@ -119,7 +119,7 @@
.TotalContainer {
display: flex;
justify-content: space-between;
width: 80vw;
/* width: 80vw; */
margin: 0 auto;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 600;

3
src/components/ItemType.js
View File

@@ -9,6 +9,7 @@ export default function ItemType({
imageUrl,
selected,
rectangular,
typeLength
}) {
const inputRef = useRef(null);
const [namee, setName] = useState(name);
@@ -68,7 +69,7 @@ export default function ItemType({
: "item-type-nomargin"
]
}
style={{ zIndex: blank ? 301 : "inherit" }}
style={{ zIndex: blank ? 301 : "inherit", width: `calc(${100 / (Math.min(typeLength, 3) + 1)}% - 10px)` }}
>
<div
onClick={

99
src/components/ItemType.module.css
View File

@@ -94,3 +94,102 @@
.noborder {
border: 1px solid #ffffff00;
}
@media (min-width: 768px){
.item-type {
width: calc(25% - 20px);
height: calc(30% - 20px);
margin: 1px 10px 0px;
overflow: visible;
text-align: center;
align-items: center;
display: flex;
flex-direction: column;
justify-content: center;
position: relative;
}
.item-type-rectangular {
width: calc(100% - 20px);
height: calc(100% - 20px);
overflow: visible;
text-align: center;
align-items: center;
display: flex;
flex-direction: column;
justify-content: start;
position: relative; /* Ensure absolute positioning inside works */
}
.item-type-nomargin {
width: calc(25% - 20px);
height: calc(39% - 20px);
overflow: visible;
text-align: center;
align-items: center;
display: flex;
flex-direction: column;
justify-content: center;
position: relative; /* Ensure absolute positioning inside works */
}
.item-type-rect {
position: relative;
height: 30%;
width: 30%;
object-fit: cover;
border-radius: 15px;
background-color: #fff;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
}
.item-type-name {
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
font-size: 14px;
color: #333;
width: calc(25vw - 30px);
text-align: center;
background-color: transparent;
position: relative; /* Needed for positioning the button */
}
.item-type-image {
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 15px;
}
.item-type-image-container {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.item-type-image-input {
opacity: 0;
position: absolute;
top: 0;
right: 0;
width: 100%;
height: 100%;
}
.item-type-create {
position: absolute;
top: 76%; /* Position below the input */
left: 50%;
transform: translateX(-50%);
margin-top: 10px; /* Space between input and button */
width: 20vw;
text-align: center; /* Center button text */
}
.border {
border: 1px solid #000000;
}
.noborder {
border: 1px solid #ffffff00;
}
}

2
src/components/ItemTypeLister.css
View File

@@ -1,5 +1,4 @@
.item-type-lister {
width: 100vw;
overflow-x: auto;
white-space: nowrap;
padding: 3px 0px;
@@ -11,6 +10,7 @@
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
overflow-y: hidden;
width: 100%;
}
.item-type {

3
src/components/ItemTypeLister.js
View File

@@ -141,13 +141,14 @@ const ItemTypeLister = ({
itemTypes.map(
(itemType) =>
(
itemType.itemList.length > 0 || (user && (user.user_id == shopOwnerId || user.cafeId == shopId))) && (
<ItemType
key={itemType.itemTypeId}
name={itemType.name}
imageUrl={getImageUrl(itemType.image)}
onClick={() => onFilterChange(itemType.itemTypeId)}
selected={filterId === itemType.itemTypeId}
typeLength={itemTypes.length}
/>
)
)}

6
src/components/MusicPlayer.js
View File

@@ -367,7 +367,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
const [text, setText] = useState("Menunggu musik favoritmu");
const textIndex = useRef(0);
const [messages, setMessages] = useState(["Menunggu musik favoritmu", "Klik untuk putar musik favoritmu"]);
const [messages, setMessages] = useState(["Menunggu musik favoritmu", "Upgrade to use"]);
useEffect(() => {
@@ -376,7 +376,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
currentSong != null && currentSong[0]?.trackId != 'kCGs5_oCtBE' && currentSong[0]?.trackId != 'O8eYd7oAZtA' && currentSong[0]?.name != undefined
? `${currentSong[0]?.name} - ${currentSong[0]?.artist}`
: "Menunggu musik favoritmu",
"Klik untuk putar musik favoritmu"
"Upgrade to use"
];
setMessages(newMessages);
@@ -421,7 +421,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
return (
<div className={`music-player`} style={{ marginBottom: `${viewing ? '-10px' : ''}` }}>
<div
onClick={toggleView}
// onClick={toggleView}
className="current-bgr"
style={{ backgroundImage: `url(${backgroundImage})` }}
// style={{ backgroundImage: `url(${videoSrc != "" ? '' : backgroundImage})` }}

4
src/helpers/transactionHelpers.js
View File

@@ -217,7 +217,8 @@ export const handlePaymentFromClerk = async (
user_email,
payment_type,
serving_type,
tableNo
tableNo,
notes
) => {
try {
const token = getLocalStorage("auth");
@@ -245,6 +246,7 @@ export const handlePaymentFromClerk = async (
serving_type,
tableNo,
transactions: structuredItems,
notes
}),
}
);

550
src/pages/CafePage.js
View File

@@ -10,9 +10,14 @@ import {
import "../App.css";
import API_BASE_URL from '../config';
import API_BASE_URL from "../config";
import Watermark from "../components/Watermark";
import { getImageUrl, createItem, updateItem, moveItemType } from "../helpers/itemHelper.js";
import {
getImageUrl,
createItem,
updateItem,
moveItemType,
} from "../helpers/itemHelper.js";
import SearchInput from "../components/SearchInput";
import ItemTypeLister from "../components/ItemTypeLister";
import { MusicPlayer } from "../components/MusicPlayer";
@@ -23,11 +28,17 @@ import Switch from "react-switch";
import { ThreeDots } from "react-loader-spinner";
import { getLocalStorage, updateLocalStorage, removeLocalStorage } from "../helpers/localStorageHelpers";
import {
getLocalStorage,
updateLocalStorage,
removeLocalStorage,
} from "../helpers/localStorageHelpers";
import { unsubscribeUser } from "../helpers/subscribeHelpers.js";
import WelcomePage from "./WelcomePage.js";
import { useNavigationHelpers } from "../helpers/navigationHelpers";
import Cart from "./Cart";
function CafePage({
shopId,
table,
@@ -48,21 +59,21 @@ function CafePage({
queue,
cartItemsLength,
totalPrice,
lastTransaction
lastTransaction,
shop,
totalItemsCount,
deviceType,
}) {
const location = useLocation();
const [searchParams] = useSearchParams();
const token = searchParams.get("token");
const { shopIdentifier, tableCode } = useParams();
sendParam({ shopIdentifier, tableCode });
const {
goToCart,
goToTransactions
} = useNavigationHelpers(shopIdentifier, table.tableCode);
const { goToCart, goToTransactions } = useNavigationHelpers(
shopIdentifier,
table.tableCode
);
const navigate = useNavigate();
@@ -90,10 +101,20 @@ function CafePage({
// }
// }
// };
const [isTablet, setIsTablet] = useState(window.innerWidth >= 768);
useEffect(() => {
const handleResize = () => {
setIsTablet(window.innerWidth >= 768);
};
window.addEventListener("resize", handleResize);
return () => window.removeEventListener("resize", handleResize);
}, []);
useEffect(() => {
if (window.gtag && shopIdentifier) {
window.gtag('event', 'page_view', {
window.gtag("event", "page_view", {
page_title: `Cafe - ${shopIdentifier}`,
page_location: window.location.href,
page_path: `/` + shopIdentifier,
@@ -116,22 +137,26 @@ function CafePage({
// checkWelcomePageConfig();
}, [welcomePageConfig]);
useEffect(() => {
function fetchData() {
console.log(user.user_id == shopOwnerId)
console.log(user.user_id == shopOwnerId);
setModal("create_item");
}
console.log(getLocalStorage('auth'))
console.log(getLocalStorage("auth"));
if (getLocalStorage("auth") != null) {
const executeFetch = async () => {
while (user.length == 0) {
await new Promise((resolve) => setTimeout(resolve, 100)); // Wait until the user is not null
}
console.log(user)
console.log('open')
if (user.length != 0 && user.user_id == shopOwnerId && shopItems.length == 0) fetchData();
console.log(user);
console.log("open");
if (
user.length != 0 &&
user.user_id == shopOwnerId &&
shopItems.length == 0
)
fetchData();
};
executeFetch();
}
@@ -154,13 +179,39 @@ function CafePage({
socket.on("joined-room", (response) => {
const { isSpotifyNeedLogin, isExceededDeadline } = response;
setNeedSpotifyLogin(isSpotifyNeedLogin);
if (isExceededDeadline) setModal("message", { captMessage: 'Kafe sedang tidak tersedia' });
if (isExceededDeadline)
setModal("message", { captMessage: "Kafe sedang tidak tersedia" });
setIsExceededDeadline(isExceededDeadline);
});
}
if (socket) fetchData();
}, [socket]);
useEffect(() => {
const isTablet = window.innerWidth >= 768;
const handleFirstClick = async () => {
if (
isTablet &&
document.fullscreenEnabled &&
!document.fullscreenElement
) {
try {
await document.documentElement.requestFullscreen();
document.removeEventListener("click", handleFirstClick);
} catch (err) {
console.warn("Gagal masuk fullscreen:", err);
}
}
};
// Tambahkan listener satu kali
document.addEventListener("click", handleFirstClick);
return () => {
document.removeEventListener("click", handleFirstClick);
};
}, []);
const handleGetStarted = () => {
setIsStarted(false);
@@ -175,16 +226,19 @@ function CafePage({
const newItems = [...shopItems];
let targetIndex;
if (direction === 'up' && index > 0) {
if (direction === "up" && index > 0) {
targetIndex = index - 1;
} else if (direction === 'down' && index < newItems.length - 1) {
} else if (direction === "down" && index < newItems.length - 1) {
targetIndex = index + 1;
}
console.log(index);
console.log(targetIndex);
if (targetIndex !== undefined) {
// Swap items
[newItems[index], newItems[targetIndex]] = [newItems[targetIndex], newItems[index]];
[newItems[index], newItems[targetIndex]] = [
newItems[targetIndex],
newItems[index],
];
newItems[index].order = targetIndex;
newItems[targetIndex].order = index;
@@ -192,9 +246,14 @@ function CafePage({
// Call the API to move the item type
try {
await moveItemType(itemTypeId, previousItems[targetIndex].itemTypeId, index, targetIndex);
await moveItemType(
itemTypeId,
previousItems[targetIndex].itemTypeId,
index,
targetIndex
);
} catch (error) {
console.error('Error moving item type:', error);
console.error("Error moving item type:", error);
// Revert the changes if the backend fails
setShopItems(previousItems);
}
@@ -224,156 +283,265 @@ function CafePage({
isFullscreen={true}
/>
) : ( */}
<div className={`Cafe ${isExceededDeadline ? 'grayscale' : ''}`}>
<div
className={`Cafe ${isExceededDeadline ? "grayscale" : ""}`}
style={{
display: isTablet ? "flex" : "block",
flexDirection: "row",
width: "100%",
}}
>
{API_BASE_URL != "https://dev.api.kedaimaster.com" &&
API_BASE_URL != "https://api.kedaimaster.com" && (
<div className="Watermark"></div>
)}
<div style={{ width: isTablet ? "60%" : "100%" }}>
<div className="App-header">
<Header
HeaderText={"Menu"}
showProfile={true}
setModal={setModal}
isLogout={handleLogout}
shopId={shopId}
shopName={shopName}
shopImage={config.image}
shopOwnerId={shopOwnerId}
shopClerks={shopClerks}
tableCode={table.tableCode}
user={user}
guestSides={guestSides}
guestSideOfClerk={guestSideOfClerk}
removeConnectedGuestSides={removeConnectedGuestSides}
setIsEditMode={(e) => setIsEditMode(e)}
isEditMode={isEditMode}
/>
<MusicPlayer
socket={socket}
shopId={shopId}
user={user}
shopOwnerId={shopOwnerId}
isSpotifyNeedLogin={isSpotifyNeedLogin}
queue={queue}
setModal={setModal}
/>
{user.username !== undefined &&
(user.cafeId === shopId || user.user_id === shopOwnerId) &&
(user.roleId === 1 || user.roleId === 2) && (
<div
style={{
backgroundColor: "#5c7c5c",
padding: "7px 28px",
margin: "0 10px",
borderRadius: "15px",
display: "flex",
alignItems: "center",
justifyContent: "space-between",
textShadow: "2px 2px 4px rgba(0, 0, 0, 0.7)",
fontSize: "16px",
}}
>
Mode Edit&nbsp;
<Switch
borderRadius={0}
checked={isEditMode}
onChange={() => setIsEditMode(!isEditMode)}
/>
</div>
)}
{API_BASE_URL != 'https://dev.api.kedaimaster.com' && API_BASE_URL != 'https://api.kedaimaster.com' &&
<div className="Watermark"></div>
}
<div className="App-header">
<Header
HeaderText={"Menu"}
showProfile={true}
setModal={setModal}
isLogout={handleLogout}
shopId={shopId}
shopName={shopName}
shopImage={config.image}
shopOwnerId={shopOwnerId}
shopClerks={shopClerks}
tableCode={table.tableCode}
user={user}
guestSides={guestSides}
guestSideOfClerk={guestSideOfClerk}
removeConnectedGuestSides={removeConnectedGuestSides}
setIsEditMode={(e) => setIsEditMode(e)}
isEditMode={isEditMode}
/>
<MusicPlayer
socket={socket}
shopId={shopId}
user={user}
shopOwnerId={shopOwnerId}
isSpotifyNeedLogin={isSpotifyNeedLogin}
queue={queue}
setModal={setModal}
/>{
user.username !== undefined &&
(user.cafeId === shopId || user.user_id === shopOwnerId) &&
(user.roleId === 1 || user.roleId === 2) && (
<div style={{
backgroundColor: '#5c7c5c',
padding: '7px 28px',
margin: '0 10px',
borderRadius: '15px',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
textShadow: '2px 2px 4px rgba(0, 0, 0, 0.7)',
fontSize: '16px'
}}>
Mode Edit&nbsp;
<Switch
borderRadius={0}
checked={isEditMode}
onChange={() => setIsEditMode(!isEditMode)}
/>
</div>
)
}
<ItemTypeLister
user={user}
shopOwnerId={shopOwnerId}
shopId={shopId}
itemTypes={shopItems}
setShopItems={setShopItems}
isEditMode={isEditMode}
onFilterChange={(e) => setFilterId(e)}
filterId={filterId}
beingEditedType={beingEditedType}
setBeingEditedType={setBeingEditedType}
/>
{/* <div style={{ marginTop: "15px" }}></div> */}
<div>
{shopItems
.filter(
(itemType) =>
filterId == 0 || itemType.itemTypeId === filterId
)
.map((itemType, index) => (
<ItemLister
index={index}
indexTotal={shopItems.length}
shopId={shopId}
shopOwnerId={shopOwnerId}
user={user}
key={itemType.itemTypeId}
itemTypeId={itemType.itemTypeId}
typeName={itemType.name}
typeImage={itemType.image}
setShopItems={setShopItems}
itemList={itemType.itemList}
typeVisibility={itemType.visibility}
moveItemTypeUp={(e) => moveItemTypeHandler(e, 'up', index)}
moveItemTypeDown={(e) => moveItemTypeHandler(e, 'down', index)}
isEditMode={isEditMode}
beingEditedType={beingEditedType}
setBeingEditedType={setBeingEditedType}
raw={isEditMode || filterId == 0 ? false : true}
handleCreateItem={(
itemTypeID,
name,
price,
selectedImage,
description,
promoPrice,
) =>
createItem(
shopId,
<ItemTypeLister
user={user}
shopOwnerId={shopOwnerId}
shopId={shopId}
itemTypes={shopItems}
setShopItems={setShopItems}
isEditMode={isEditMode}
onFilterChange={(e) => setFilterId(e)}
filterId={filterId}
beingEditedType={beingEditedType}
setBeingEditedType={setBeingEditedType}
/>
{/* <div style={{ marginTop: "15px" }}></div> */}
<div>
{shopItems
.filter(
(itemType) =>
filterId == 0 || itemType.itemTypeId === filterId
)
.map((itemType, index) => (
<ItemLister
index={index}
indexTotal={shopItems.length}
shopId={shopId}
shopOwnerId={shopOwnerId}
user={user}
key={itemType.itemTypeId}
itemTypeId={itemType.itemTypeId}
typeName={itemType.name}
typeImage={itemType.image}
setShopItems={setShopItems}
itemList={itemType.itemList}
typeVisibility={itemType.visibility}
moveItemTypeUp={(e) =>
moveItemTypeHandler(e, "up", index)
}
moveItemTypeDown={(e) =>
moveItemTypeHandler(e, "down", index)
}
isEditMode={isEditMode}
beingEditedType={beingEditedType}
setBeingEditedType={setBeingEditedType}
raw={isEditMode || filterId == 0 ? false : true}
handleCreateItem={(
itemTypeID,
name,
price,
selectedImage,
itemTypeID,
description,
promoPrice,
)
}
handleUpdateItem={(itemId, name, price, selectedImage, description, promoPrice) =>
updateItem(itemId, name, price, selectedImage, description, promoPrice)
}
/>
))}
{!isEditMode && (user.username || cartItemsLength > 0) &&
<div style={{ marginTop: '10px', height: '40px', position: 'sticky', bottom: '40px', display: 'flex', justifyContent: 'center', alignItems: 'center', textAlign: 'center' }}>
{(lastTransaction != null || cartItemsLength > 0) &&
<div onClick={goToCart} style={{ backgroundColor: '#73a585', width: user.username ? '55vw' : '70vw', height: '40px', borderRadius: '30px', display: 'flex', justifyContent: 'space-between', padding: '0 20px' }}>
<div style={{ display: 'flex', flexWrap: 'wrap', alignContent: 'center' }}>{lastTransaction != null && '+'}{cartItemsLength} item</div>
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end', width: '130px' }}>
{((lastTransaction == null || lastTransaction?.payment_type != 'paylater')) ?
<span style={{ whiteSpace: 'nowrap' }}>Rp{totalPrice}</span>
:
<span style={{ whiteSpace: 'nowrap' }}>Open bill</span>
}
<div style={{ display: 'flex', alignItems: 'center', marginLeft: '5px', width: '20px' }}>
<svg viewBox="0 0 34 34" style={{ fill: 'white', marginTop: '4px' }}>
<path d="M9.79175 24.75C8.09591 24.75 6.72383 26.1375 6.72383 27.8333C6.72383 29.5292 8.09591 30.9167 9.79175 30.9167C11.4876 30.9167 12.8751 29.5292 12.8751 27.8333C12.8751 26.1375 11.4876 24.75 9.79175 24.75ZM0.541748 0.0833435V3.16668H3.62508L9.17508 14.8679L7.09383 18.645C6.84717 19.0767 6.70842 19.5854 6.70842 20.125C6.70842 21.8208 8.09591 23.2083 9.79175 23.2083H28.2917V20.125H10.4392C10.2234 20.125 10.0538 19.9554 10.0538 19.7396L10.1001 19.5546L11.4876 17.0417H22.973C24.1292 17.0417 25.1467 16.4096 25.6709 15.4538L31.1901 5.44834C31.3134 5.23251 31.3751 4.97043 31.3751 4.70834C31.3751 3.86043 30.6813 3.16668 29.8334 3.16668H7.03217L5.583 0.0833435H0.541748ZM25.2084 24.75C23.5126 24.75 22.1405 26.1375 22.1405 27.8333C22.1405 29.5292 23.5126 30.9167 25.2084 30.9167C26.9042 30.9167 28.2917 29.5292 28.2917 27.8333C28.2917 26.1375 26.9042 24.75 25.2084 24.75Z"></path>
</svg>
promoPrice
) =>
createItem(
shopId,
name,
price,
selectedImage,
itemTypeID,
description,
promoPrice
)
}
handleUpdateItem={(
itemId,
name,
price,
selectedImage,
description,
promoPrice
) =>
updateItem(
itemId,
name,
price,
selectedImage,
description,
promoPrice
)
}
/>
))}
{!isEditMode && (user.username || cartItemsLength > 0) && (
<div
style={{
marginTop: "10px",
height: "40px",
position: "sticky",
bottom: "40px",
display: "flex",
justifyContent: "center",
alignItems: "center",
textAlign: "center",
}}
>
{(!isTablet &&(lastTransaction != null || cartItemsLength > 0)) && (
<div
onClick={goToCart}
style={{
backgroundColor: "#73a585",
width: user.username ? "55vw" : "70vw",
height: "40px",
borderRadius: "30px",
display: "flex",
justifyContent: "space-between",
padding: "0 20px",
}}
>
<div
style={{
display: "flex",
flexWrap: "wrap",
alignContent: "center",
}}
>
{lastTransaction != null && "+"}
{cartItemsLength} item
</div>
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "flex-end",
width: "130px",
}}
>
{lastTransaction == null ||
lastTransaction?.payment_type != "paylater" ? (
<span style={{ whiteSpace: "nowrap" }}>
Rp{totalPrice}
</span>
) : (
<span style={{ whiteSpace: "nowrap" }}>
Open bill
</span>
)}
<div
style={{
display: "flex",
alignItems: "center",
marginLeft: "5px",
width: "20px",
}}
>
<svg
viewBox="0 0 34 34"
style={{ fill: "white", marginTop: "4px" }}
>
<path d="M9.79175 24.75C8.09591 24.75 6.72383 26.1375 6.72383 27.8333C6.72383 29.5292 8.09591 30.9167 9.79175 30.9167C11.4876 30.9167 12.8751 29.5292 12.8751 27.8333C12.8751 26.1375 11.4876 24.75 9.79175 24.75ZM0.541748 0.0833435V3.16668H3.62508L9.17508 14.8679L7.09383 18.645C6.84717 19.0767 6.70842 19.5854 6.70842 20.125C6.70842 21.8208 8.09591 23.2083 9.79175 23.2083H28.2917V20.125H10.4392C10.2234 20.125 10.0538 19.9554 10.0538 19.7396L10.1001 19.5546L11.4876 17.0417H22.973C24.1292 17.0417 25.1467 16.4096 25.6709 15.4538L31.1901 5.44834C31.3134 5.23251 31.3751 4.97043 31.3751 4.70834C31.3751 3.86043 30.6813 3.16668 29.8334 3.16668H7.03217L5.583 0.0833435H0.541748ZM25.2084 24.75C23.5126 24.75 22.1405 26.1375 22.1405 27.8333C22.1405 29.5292 23.5126 30.9167 25.2084 30.9167C26.9042 30.9167 28.2917 29.5292 28.2917 27.8333C28.2917 26.1375 26.9042 24.75 25.2084 24.75Z"></path>
</svg>
</div>
</div>
</div>
</div>
}
{user.username &&
<div onClick={goToTransactions} style={{ backgroundColor: '#73a585', width: '15vw', height: '40px', borderRadius: '30px', display: 'flex', justifyContent: 'center', marginLeft: lastTransaction != null || cartItemsLength > 0 ? '6px' : '0px' }}>
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', width: '38px', marginRight: '5px' }}>
<div style={{ display: 'flex', alignItems: 'center', marginLeft: '5px', width: '20px' }}>
<svg viewBox="0 0 512 512">
<g
transform="translate(0 460) scale(0.09 -0.09)"
style={{ fill: 'white', marginTop: '4px' }}
stroke="none"
>
<path
d="M1639 5107 c-47 -13 -70 -28 -177 -109 -119 -90 -246 -102 -381 -34
)}
{user.username && (
<div
onClick={goToTransactions}
style={{
backgroundColor: "#73a585",
width: "15vw",
height: "40px",
borderRadius: "30px",
display: "flex",
justifyContent: "center",
marginLeft:
lastTransaction != null || cartItemsLength > 0
? "6px"
: "0px",
}}
>
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
width: "38px",
marginRight: "5px",
}}
>
<div
style={{
display: "flex",
alignItems: "center",
marginLeft: "5px",
width: "20px",
}}
>
<svg viewBox="0 0 512 512">
<g
transform="translate(0 460) scale(0.09 -0.09)"
style={{ fill: "white", marginTop: "4px" }}
stroke="none"
>
<path
d="M1639 5107 c-47 -13 -70 -28 -177 -109 -119 -90 -246 -102 -381 -34
-53 27 -83 36 -121 36 -88 0 -167 -57 -190 -138 -8 -26 -10 -620 -8 -1982 l3
-1945 24 -38 c13 -21 42 -50 64 -65 l41 -27 1535 -5 1536 -5 58 -22 c158 -60
291 -205 322 -352 10 -45 74 -108 119 -117 78 -14 154 25 182 93 12 27 14 398
@@ -389,23 +557,49 @@ function CafePage({
20 6 475 9 1183 8 l1150 -2 38 -24z m4 -903 c62 -41 88 -90 88 -168 0 -78 -26
-127 -88 -168 l-41 -27 -665 0 -666 0 -38 24 c-76 47 -111 140 -88 229 14 51
76 117 123 131 20 6 291 9 684 8 l650 -2 41 -27z"
/>
<path
d="M592 489 c-47 -14 -109 -79 -123 -131 -33 -122 37 -265 159 -325 l57
/>
<path
d="M592 489 c-47 -14 -109 -79 -123 -131 -33 -122 37 -265 159 -325 l57
-28 1815 -2 c1736 -2 1813 -2 1765 15 -125 43 -186 126 -205 279 -12 89
-39 138 -97 174 l-38 24 -1650 2 c-1023 1 -1662 -2 -1683 -8z"
/>
</g>
</svg>
/>
</g>
</svg>
</div>
</div>
</div>
</div>
}
</div>
}
)}
</div>
)}
</div>
</div>
{/* <Watermark /> */}
</div>
<Watermark />
{isTablet &&
<div
style={{
width: "40%",
position: "fixed",
right: 0,
top: 0,
zIndex: 199
}}
>
<Cart
shopId={shopId}
shop={shop}
table={table}
setModal={setModal}
sendParam={sendParam}
socket={socket}
totalItemsCount={totalItemsCount}
deviceType={deviceType}
shopItems={shopItems}
setShopItems={setShopItems}
isTablet={true}
/>
</div>
}
</div>
{/* )} */}
</>

648
src/pages/Cart.js
View File

@@ -14,7 +14,7 @@ import {
handlePaymentFromGuestSide,
handlePaymentFromGuestDevice,
handleExtendFromGuestDevice,
handleCloseBillFromGuestDevice
handleCloseBillFromGuestDevice,
} from "../helpers/transactionHelpers";
import { getItemsByCafeId } from "../helpers/cartHelpers.js";
@@ -22,15 +22,27 @@ import { getItemsByCafeId } from "../helpers/cartHelpers.js";
import Dropdown from "./Dropdown.js";
import { useNavigationHelpers } from "../helpers/navigationHelpers";
const formatToRupiah = (value) => {
if (typeof value !== "number") return value;
return value.toLocaleString("id-ID");
};
export default function Invoice({ shopId, setModal, table, sendParam, deviceType, socket, shopItems, setShopItems }) {
export default function Invoice({
shopId,
setModal,
table,
sendParam,
deviceType,
socket,
shopItems,
setShopItems,
isTablet
}) {
const { shopIdentifier, tableCode } = useParams();
sendParam({ shopIdentifier, tableCode });
const {
goToShop
} = useNavigationHelpers(shopIdentifier, table.tableCode);
const { goToShop } = useNavigationHelpers(shopIdentifier, table.tableCode);
const [cartItems, setCartItems] = useState([]);
const [totalPrice, setTotalPrice] = useState(0);
@@ -51,14 +63,14 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
const fetchPaymentMethods = async () => {
try {
const methods = await getPaymentMethods(shopId);
console.log(methods)
const lastTransaction = JSON.parse(localStorage.getItem('lastTransaction'));
if (lastTransaction?.payment_type == 'paylater') methods.isOpenBillAvailable = false;
setPaymentMethods(methods)
} catch (err) {
}
console.log(methods);
const lastTransaction = JSON.parse(
localStorage.getItem("lastTransaction")
);
if (lastTransaction?.payment_type == "paylater")
methods.isOpenBillAvailable = false;
setPaymentMethods(methods);
} catch (err) {}
};
if (shopId) {
@@ -70,29 +82,27 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
const fetchCartItems = async () => {
try {
const cart = getItemsByCafeId(shopId);
const itemMap = new Map(cart.map(item => [item.itemId, item.qty]));
const itemMap = new Map(cart.map((item) => [item.itemId, item.qty]));
// Step 2: Filter and transform shopItems
const filteredItems = shopItems
.map(itemType => ({
.map((itemType) => ({
itemTypeId: itemType.itemTypeId,
cafeId: itemType.cafeId,
typeName: itemType.name,
itemList: itemType.itemList
.filter(item => itemMap.has(item.itemId)) // Keep only items in getItemsByCafeId
.map(item => ({
.filter((item) => itemMap.has(item.itemId)) // Keep only items in getItemsByCafeId
.map((item) => ({
itemId: item.itemId,
price: (item.promoPrice ? item.promoPrice : item.price),
price: item.promoPrice ? item.promoPrice : item.price,
name: item.name,
image: item.image,
qty: itemMap.get(item.itemId), // Add qty from getItemsByCafeId
availability: item.availability
}))
availability: item.availability,
})),
}))
.filter(itemType => itemType.itemList.length > 0); // Remove empty itemTypes
console.log(filteredItems)
.filter((itemType) => itemType.itemList.length > 0); // Remove empty itemTypes
console.log(filteredItems);
// Update local storage by removing unavailable items
const updatedLocalStorage =
@@ -120,7 +130,10 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
return (
total +
itemType.itemList.reduce((subtotal, item) => {
return subtotal + item.qty * (item.promoPrice ? item.promoPrice : item.price);
return (
subtotal +
item.qty * (item.promoPrice ? item.promoPrice : item.price)
);
}, 0)
);
}, 0);
@@ -128,8 +141,8 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
setTimeout(function () {
setCartItems(filteredItems);
setTotalPrice(totalPrice);
setIsLoading(false)
}, 100); //delay is in milliseconds
setIsLoading(false);
}, 100); //delay is in milliseconds
} catch (error) {
console.error("Error fetching cart items:", error);
// Handle error if needed
@@ -138,18 +151,17 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
fetchCartItems();
const getNewestCartItems = async () => {
try {
// Fetch items from the cart details (latest state)
const items = await getCartDetails(shopId);
// Loop through each item type in the items from the cart details
items.forEach(itemType => {
itemType.itemList.forEach(item => {
items.forEach((itemType) => {
itemType.itemList.forEach((item) => {
// Loop through the shopItems and find the corresponding itemId
shopItems.forEach(shopItemType => {
shopItemType.itemList.forEach(shopItem => {
shopItems.forEach((shopItemType) => {
shopItemType.itemList.forEach((shopItem) => {
if (shopItem.itemId === item.itemId) {
// Update shopItems with the new data from items (e.g., availability, price)
shopItem.availability = item.availability;
@@ -179,7 +191,8 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
}, 100); // delay is in milliseconds
// Update local storage by removing unavailable items and updating prices
const updatedLocalStorage = JSON.parse(localStorage.getItem("cart")) || [];
const updatedLocalStorage =
JSON.parse(localStorage.getItem("cart")) || [];
const newLocalStorage = updatedLocalStorage.map((cafe) => {
if (cafe.cafeId === shopId) {
return {
@@ -194,8 +207,10 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
// Update the price in the local storage item
return {
...item,
price: updatedItem.promoPrice ? updatedItem.promoPrice : updatedItem.price,
availability: updatedItem.availability
price: updatedItem.promoPrice
? updatedItem.promoPrice
: updatedItem.price,
availability: updatedItem.availability,
};
}
@@ -231,7 +246,10 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
return (
total +
itemType.itemList.reduce((subtotal, item) => {
return subtotal + item.qty * (item.promoPrice ? item.promoPrice : item.price);
return (
subtotal +
item.qty * (item.promoPrice ? item.promoPrice : item.price)
);
}, 0)
);
}, 0);
@@ -240,13 +258,12 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
console.error("Error fetching cart items:", error);
// Handle error if needed
}
};
getNewestCartItems();
}, [shopId]);
}, [shopId, localStorage.getItem('cart')]);
const handlePayCloseBill = async (orderMethod) =>{
const handlePayCloseBill = async (orderMethod) => {
setIsPaymentLoading(true);
console.log("tipe" + deviceType);
if (transactionData) {
@@ -257,7 +274,7 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
socketId
);
}
}
};
const handlePay = async (orderMethod) => {
setIsPaymentLoading(true);
@@ -271,39 +288,42 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
orderMethod,
socketId
);
localStorage.removeItem('lastTransaction')
localStorage.removeItem("lastTransaction");
// Dispatch the custom event
window.dispatchEvent(new Event("localStorageUpdated"));
}
else
} else if (deviceType == "clerk") {
const pay = await handlePaymentFromClerk(
shopId,
email,
orderMethod,
orderType,
tableNumber,
textareaRef.current.value
);
if (pay) window.location.reload();
if (deviceType == "clerk") {
const pay = await handlePaymentFromClerk(
shopId,
email,
orderMethod,
orderType,
tableNumber
);
} else if (deviceType == "guestSide") {
const pay = await handlePaymentFromGuestSide(
shopId,
email,
orderMethod,
orderType,
tableNumber
);
} else if (deviceType == "guestDevice") {
const socketId = socket.id;
const pay = await handlePaymentFromGuestDevice(
shopId,
orderMethod,
orderType,
table.tableNo || tableNumber,
textareaRef.current.value,
socketId
);
}
} else if (deviceType == "guestSide") {
const pay = await handlePaymentFromGuestSide(
shopId,
email,
orderMethod,
orderType,
tableNumber
);
if (pay) window.location.reload();
} else if (deviceType == "guestDevice") {
const socketId = socket.id;
const pay = await handlePaymentFromGuestDevice(
shopId,
orderMethod,
orderType,
table.tableNo || tableNumber,
textareaRef.current.value,
socketId
);
if (pay) window.location.reload();
}
console.log("transaction from " + deviceType + "success");
setIsPaymentLoading(false);
@@ -331,26 +351,34 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
}, [table]);
useEffect(() => {
console.log(localStorage.getItem('cart'))
console.log(cartItems)
console.log(localStorage.getItem("cart"));
console.log(cartItems);
if (localStorage.getItem('cart') == null || localStorage.getItem('cart') == '' || localStorage.getItem('cart') == '[]') return;
if (
localStorage.getItem("cart") == null ||
localStorage.getItem("cart") == "" ||
localStorage.getItem("cart") == "[]"
)
return;
// Parse the local storage cart
const localStorageCart = JSON.parse(localStorage.getItem('cart'));
console.log(localStorageCart)
const localStorageCart = JSON.parse(localStorage.getItem("cart"));
console.log(localStorageCart);
// Create a set of itemIds from the local storage cart for quick lookup
const localStorageItemIds = new Set(localStorageCart[0].items.map(item => item.itemId));
const localStorageItemIds = new Set(
localStorageCart[0].items.map((item) => item.itemId)
);
// Filter out items from cartItems that do not exist in the local storage cart
const updatedCartItems = cartItems.map(itemType => ({
const updatedCartItems = cartItems.map((itemType) => ({
...itemType,
itemList: itemType.itemList.filter(item => localStorageItemIds.has(item.itemId))
itemList: itemType.itemList.filter((item) =>
localStorageItemIds.has(item.itemId)
),
}));
setCartItems(updatedCartItems);
const totalPrice = updatedCartItems.reduce((total, itemType) => {
return (
total +
@@ -360,8 +388,7 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
);
}, 0);
setTotalPrice(totalPrice);
}, [localStorage.getItem('cart')]);
}, [localStorage.getItem("cart")]);
const handleOrderTypeChange = (event) => {
setOrderType(event.target.value);
@@ -379,44 +406,81 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
setEmail(event.target.value);
};
const transactionData = JSON.parse(localStorage.getItem('lastTransaction'));
const transactionData = JSON.parse(localStorage.getItem("lastTransaction"));
return (
<div className={styles.Invoice} style={{ height: (getItemsByCafeId(shopId).length > 0 ? '' : '100vh'), minHeight: (getItemsByCafeId(shopId).length > 0 ? '100vh' : '') }}>
<div
className={styles.Invoice}
style={{
height: getItemsByCafeId(shopId).length > 0 ? "" : "100vh",
minHeight: getItemsByCafeId(shopId).length > 0 ? "100vh" : "",
}}
>
<div
onClick={goToShop}
style={{
marginLeft: "22px",
marginTop: "49px",
marginRight: "10px",
display: "flex",
flexWrap: "nowrap",
alignItems: "center",
fontSize: "25px",
}}
>
{!isTablet &&
<svg
xmlns="http://www.w3.org/2000/svg"
width="30"
height="30"
viewBox="0 0 512 512"
>
<path d="M48,256c0,114.87,93.13,208,208,208s208-93.13,208-208S370.87,48,256,48,48,141.13,48,256Zm212.65-91.36a16,16,0,0,1,.09,22.63L208.42,240H342a16,16,0,0,1,0,32H208.42l52.32,52.73A16,16,0,1,1,238,347.27l-79.39-80a16,16,0,0,1,0-22.54l79.39-80A16,16,0,0,1,260.65,164.64Z" />
</svg>
}
Keranjang
</div>
<div onClick={goToShop} style={{ marginLeft: '22px', marginTop: '49px', marginRight: '10px', display: 'flex', flexWrap: 'nowrap', alignItems: 'center', fontSize: '25px' }} ><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 512 512"><path d="M48,256c0,114.87,93.13,208,208,208s208-93.13,208-208S370.87,48,256,48,48,141.13,48,256Zm212.65-91.36a16,16,0,0,1,.09,22.63L208.42,240H342a16,16,0,0,1,0,32H208.42l52.32,52.73A16,16,0,1,1,238,347.27l-79.39-80a16,16,0,0,1,0-22.54l79.39-80A16,16,0,0,1,260.65,164.64Z" /></svg>Keranjang</div>
{(transactionData == null && getItemsByCafeId(shopId).length < 1) ?
<div style={{ height: '75vh', display: 'flex', justifyContent: 'center', flexDirection: 'column', alignContent: 'center', alignItems: 'center' }}>
<div style={{ width: '50%' }}>
<svg
viewBox="0 0 32 32"
style={{ fill: "#8F8787" }}
>
{transactionData == null && getItemsByCafeId(shopId).length < 1 ? (
<div
style={{
height: "75vh",
display: "flex",
justifyContent: "center",
flexDirection: "column",
alignContent: "center",
alignItems: "center",
}}
>
<div style={{ width: isTablet ? "30%":"50%" }}>
<svg viewBox="0 0 32 32" style={{ fill: "#8F8787" }}>
<path d="M9.79175 24.75C8.09591 24.75 6.72383 26.1375 6.72383 27.8333C6.72383 29.5292 8.09591 30.9167 9.79175 30.9167C11.4876 30.9167 12.8751 29.5292 12.8751 27.8333C12.8751 26.1375 11.4876 24.75 9.79175 24.75ZM0.541748 0.0833435V3.16668H3.62508L9.17508 14.8679L7.09383 18.645C6.84717 19.0767 6.70842 19.5854 6.70842 20.125C6.70842 21.8208 8.09591 23.2083 9.79175 23.2083H28.2917V20.125H10.4392C10.2234 20.125 10.0538 19.9554 10.0538 19.7396L10.1001 19.5546L11.4876 17.0417H22.973C24.1292 17.0417 25.1467 16.4096 25.6709 15.4538L31.1901 5.44834C31.3134 5.23251 31.3751 4.97043 31.3751 4.70834C31.3751 3.86043 30.6813 3.16668 29.8334 3.16668H7.03217L5.583 0.0833435H0.541748ZM25.2084 24.75C23.5126 24.75 22.1405 26.1375 22.1405 27.8333C22.1405 29.5292 23.5126 30.9167 25.2084 30.9167C26.9042 30.9167 28.2917 29.5292 28.2917 27.8333C28.2917 26.1375 26.9042 24.75 25.2084 24.75Z" />
</svg>
</div>
<h1 style={{ fontSize: '120%', color: '#8F8787' }}>Tidak ada item di keranjang</h1>
<h1 style={{ fontSize: "120%", color: "#8F8787" }}>
Tidak ada item di keranjang
</h1>
</div>
:
(isLoading ? <></> :
<>
{getItemsByCafeId(shopId).length > 0 &&
<div className={styles.RoundedRectangle}>
{cartItems.map((itemType) => (
<ItemLister
shopId={shopId}
forInvoice={true}
key={itemType.id}
typeName={itemType.typeName}
itemList={itemType.itemList}
/>
))}
) : isLoading ? (
<></>
) : (
<>
{getItemsByCafeId(shopId).length > 0 && (
<div className={styles.RoundedRectangle}>
{cartItems.map((itemType) => (
<ItemLister
shopId={shopId}
forInvoice={true}
key={itemType.id}
typeName={itemType.typeName}
itemList={itemType.itemList}
/>
))}
{table.tableNo != null && (
<div className={styles.OrderTypeContainer}>
<span htmlFor="orderType">Diantar ke {table.tableNo}</span>
{/* <select
{table.tableNo != null && (
<div className={styles.OrderTypeContainer}>
<span htmlFor="orderType">Diantar ke {table.tableNo}</span>
{/* <select
id="orderType"
value={orderType}
onChange={handleOrderTypeChange}
@@ -427,166 +491,232 @@ export default function Invoice({ shopId, setModal, table, sendParam, deviceType
<option value="pickup">Pickup</option>
{table == null && <option value="serve">Serve</option>}
</select> */}
</div>
)}
{orderType === "serve" && table.length < 1 && (
<div className={styles.OrderTypeContainer}>
<span htmlFor="orderType">Serve to:</span>
<input
type="text"
placeholder="Table Number"
value={tableNumber}
onChange={handleTableNumberChange}
className={styles.TableNumberInput}
/>
</div>
)}
<div className={styles.NoteContainer}>
<span>Atas Nama :</span>
<span></span>
</div>
)}
<div className={styles.NoteContainer} >
{orderType === "serve" && table.length < 1 && (
<div className={styles.OrderTypeContainer}>
<span htmlFor="orderType">Serve to:</span>
<input
className={styles.NoteInput}
placeholder="Tambahkan catatan..."
type="text"
placeholder="Table Number"
value={tableNumber}
onChange={handleTableNumberChange}
className={styles.TableNumberInput}
/>
</div>
)}
<div className={styles.NoteContainer}style={{height: '18px'}}>
<span>Catatan :</span>
<span></span>
</div>
<div className={styles.NoteContainer}>
<textarea
ref={textareaRef}
className={styles.NoteInput}
placeholder="Tambahkan catatan..."
/>
</div>
<div className={styles.NoteContainer}>
<span>Atas Nama :</span>
<span></span>
</div>
}
{transactionData &&
<div className={styles.RoundedRectangle} style={{ backgroundColor: '#c3c3c3', fontSize: '15px', display: 'flex', justifyContent: 'space-between' }}>
{transactionData.payment_type != 'paylater' ?
<>
<div onClick={() => setModal('transaction_item', { transactionId: transactionData.transactionId })} className={styles.AddedLastTransaction}>
Pembayaran akan ditambahkan ke transaksi sebelumnya
</div>
<div className={styles.CancelAddedLastTransaction} onClick={() => { window.location.reload(); localStorage.removeItem('lastTransaction') }}>
<svg
style={{ width: '40px', height: '40px' }}
className={styles['plusNegative2']}
clipRule="evenodd"
fillRule="evenodd"
strokeLinejoin="round"
strokeMiterlimit="2"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="m12.002 2c5.518 0 9.998 4.48 9.998 9.998 0 5.517-4.48 9.997-9.998 9.997-5.517 0-9.997-4.48-9.997-9.997 0-5.518 4.48-9.998 9.997-9.998zm0 1.5c-4.69 0-8.497 3.808-8.497 8.498s3.807 8.497 8.497 8.497 8.498-3.807 8.498-8.497-3.808-8.498-8.498-8.498zm-.747 7.75h-3.5c-.414 0-.75.336-.75.75s.336.75.75.75h3.5v3.5c0 .414.336.75.75.75s.75-.336.75-.75v-3.5h3.5c.414 0 .75-.336.75-.75s-.336-.75-.75-.75h-3.5v-3.5c0-.414-.336-.75-.75-.75s-.75.336-.75.75z"
fillRule="nonzero"
/>
</svg>
</div>
</>
:
<div className={styles.AddedLastTransaction}>
<div>
Open bill
<div onClick={() => setModal('transaction_item', { transactionId: transactionData.transactionId })}>
Lihat tagihan
</div>
</div>
{getItemsByCafeId(shopId).length > 0 ?
<button className={styles.PayButton3} onClick={() => handlePay(orderMethod)}>
{isPaymentLoading ? (
<ColorRing height="50" width="50" color="white" />
) : (
<div>
{transactionData ?
<span>Tambahkan</span>
:
<span>Pesan</span>
}
<span>Rp{totalPrice}</span>
</div>
)}
</button>
:
<button className={styles.PayButton3} style={{ backgroundColor: 'rgb(42 145 24)', letterSpacing: '1px' }} onClick={goToShop}>
<div>
<span>Tambahkan item lain</span>
</div>
</button>}
</div>
}
<div className={styles.NoteContainer}>
<input
className={styles.NoteInput}
placeholder="Tambahkan catatan..."
/>
</div>
}
<div className={styles.PaymentOption}>
<div className={styles.TotalContainer}>
<span>Pembayaran</span>
<span>
{paymentMethods != null && <Dropdown setDropdownKey={() => setDropdownKey(dropdownKey + 1)} paymentMethods={paymentMethods} onChange={handleOrderMethodChange} />}
</span>
<div className={styles.NoteContainer} style={{ height: "18px" }}>
<span>Catatan :</span>
<span></span>
</div>
{transactionData && transactionData.payment_type === 'paylater' ?
<div style={{ display: 'flex', paddingLeft: '25px', paddingRight: '25px', marginTop: '17px' }}>
<button className={styles.PayButton} onClick={() => handlePayCloseBill(orderMethod)}>
{isPaymentLoading ? (
<ColorRing height="50" width="50" color="white" />
) : (
<div>
<span>Tutup bill</span>
<span>Rp{
transactionData.DetailedTransactions.reduce((total, transaction) => {
return total + (transaction.promoPrice == 0 || transaction.promoPrice == null
? transaction.price * transaction.qty
: transaction.promoPrice * transaction.qty);
}, 0)
}</span>
</div>
)}
</button>
</div>
:
<div style={{ display: 'flex', paddingLeft: '25px', paddingRight: '25px', marginTop: '17px' }}>
<button className={styles.PayButton} onClick={() => handlePay(orderMethod)}>
{isPaymentLoading ? (
<ColorRing height="50" width="50" color="white" />
) : (
<div>
{transactionData ?
<span>Tambahkan</span>
:
<span>Pesan</span>
}
<span>Rp{totalPrice}</span>
</div>
)}
</button>
</div>
}
<div className={styles.NoteContainer}>
<textarea
ref={textareaRef}
className={styles.NoteInput}
placeholder="Tambahkan catatan..."
/>
</div>
</div>
<div className={styles.PaymentOptionMargin}></div>
</>
)
}
)}
{transactionData && (
<div
className={styles.RoundedRectangle}
style={{
backgroundColor: "#c3c3c3",
fontSize: "15px",
display: "flex",
justifyContent: "space-between",
}}
>
{transactionData.payment_type != "paylater" ? (
<>
<div
onClick={() =>
setModal("transaction_item", {
transactionId: transactionData.transactionId,
})
}
className={styles.AddedLastTransaction}
>
Pembayaran akan ditambahkan ke transaksi sebelumnya
</div>
<div
className={styles.CancelAddedLastTransaction}
onClick={() => {
window.location.reload();
localStorage.removeItem("lastTransaction");
}}
>
<svg
style={{ width: "40px", height: "40px" }}
className={styles["plusNegative2"]}
clipRule="evenodd"
fillRule="evenodd"
strokeLinejoin="round"
strokeMiterlimit="2"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="m12.002 2c5.518 0 9.998 4.48 9.998 9.998 0 5.517-4.48 9.997-9.998 9.997-5.517 0-9.997-4.48-9.997-9.997 0-5.518 4.48-9.998 9.997-9.998zm0 1.5c-4.69 0-8.497 3.808-8.497 8.498s3.807 8.497 8.497 8.497 8.498-3.807 8.498-8.497-3.808-8.498-8.498-8.498zm-.747 7.75h-3.5c-.414 0-.75.336-.75.75s.336.75.75.75h3.5v3.5c0 .414.336.75.75.75s.75-.336.75-.75v-3.5h3.5c.414 0 .75-.336.75-.75s-.336-.75-.75-.75h-3.5v-3.5c0-.414-.336-.75-.75-.75s-.75.336-.75.75z"
fillRule="nonzero"
/>
</svg>
</div>
</>
) : (
<div className={styles.AddedLastTransaction}>
<div>
Open bill
<div
onClick={() =>
setModal("transaction_item", {
transactionId: transactionData.transactionId,
})
}
>
Lihat tagihan
</div>
</div>
{getItemsByCafeId(shopId).length > 0 ? (
<button
className={styles.PayButton3}
onClick={() => handlePay(orderMethod)}
>
{isPaymentLoading ? (
<ColorRing height="40" width="40" color="white" />
) : (
<div>
{transactionData ? (
<span>Tambahkan</span>
) : (
<span>Pesan</span>
)}
<span>Rp{formatToRupiah(totalPrice)}</span>
</div>
)}
</button>
) : (
<button
className={styles.PayButton3}
style={{
backgroundColor: "rgb(42 145 24)",
letterSpacing: "1px",
}}
onClick={goToShop}
>
<div>
<span>Tambahkan item lain</span>
</div>
</button>
)}
</div>
)}
</div>
)}
<div className={styles.PaymentOption}>
<div className={styles.TotalContainer}>
<span>Pembayaran</span>
<span>
{paymentMethods != null && (
<Dropdown
setDropdownKey={() => setDropdownKey(dropdownKey + 1)}
paymentMethods={paymentMethods}
onChange={handleOrderMethodChange}
/>
)}
</span>
</div>
{transactionData && transactionData.payment_type === "paylater" ? (
<div
style={{
display: "flex",
paddingLeft: "25px",
paddingRight: "25px",
marginTop: "17px",
}}
>
<button
className={styles.PayButton}
onClick={() => handlePayCloseBill(orderMethod)}
>
{isPaymentLoading ? (
<ColorRing height="50" width="50" color="white" />
) : (
<div>
<span>Tutup bill</span>
<span>
Rp
{formatToRupiah(
transactionData.DetailedTransactions.reduce(
(total, transaction) => {
return (
total +
(transaction.promoPrice == 0 ||
transaction.promoPrice == null
? transaction.price * transaction.qty
: transaction.promoPrice * transaction.qty)
);
},
0
)
)}
</span>
</div>
)}
</button>
</div>
) : (
<div
style={{
display: "flex",
paddingLeft: "25px",
paddingRight: "25px",
marginTop: "17px",
}}
>
<button
className={styles.PayButton}
onClick={() => handlePay(orderMethod)}
>
{isPaymentLoading ? (
<ColorRing height="50" width="50" color="white" />
) : (
<div>
{transactionData ? (
<span>Tambahkan</span>
) : (
<span>Pesan</span>
)}
<span>Rp{formatToRupiah(totalPrice)}</span>
</div>
)}
</button>
</div>
)}
</div>
<div className={styles.PaymentOptionMargin}></div>
</>
)}
</div>
);
}

279
src/pages/Invoice.module.css
View File

@@ -1,3 +1,5 @@
@media (max-width: 768px) {
.Invoice {
overflow-x: hidden;
background-color: white;
@@ -40,11 +42,10 @@
font-size: calc(10px + 2vmin);
color: rgba(88, 55, 50, 1);
border-radius: 15px 15px 0 0;
position: fixed;
bottom: 0;
right: 0;
left: 0;
width: 100%;
}
.PaymentOptionMargin {
@@ -59,12 +60,16 @@
position: relative;
height: 220px;
bottom: 0;
right: 0;
width: 40%;
}
.TotalContainer {
display: flex;
justify-content: space-between;
width: 80vw;
/* width: 80vw; */
margin: 0 auto;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 600;
@@ -92,13 +97,13 @@
margin-bottom: 23px;
}
.PayButton div{
.PayButton div {
display: flex;
justify-content: space-between;
padding-left: 20px;
padding-right: 20px;
}
.PayButton3{
.PayButton3 {
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
@@ -115,8 +120,7 @@
margin-top: 10px;
}
.PayButton3 div{
.PayButton3 div {
display: flex;
justify-content: space-between;
padding-left: 20px;
@@ -201,22 +205,275 @@
overflow-wrap: break-word; /* Ensure text wraps */
}
.AddedLastTransaction{
.AddedLastTransaction {
width: 100%;
font-size: 1em;
padding: 10px 20px;
margin-bottom: 7px;
font-weight: 600;
}
.AddedLastTransaction div{
.AddedLastTransaction div {
display: flex;
justify-content: space-between;
}
.CancelAddedLastTransaction{
.CancelAddedLastTransaction {
width: 40px;
height: 40px;
margin-right: 30px;
margin-top: 10px;
transform: rotate(45deg);
}
}
@media (min-width: 768px) {
.Invoice {
overflow-x: hidden;
background-color: white;
display: flex;
flex-direction: column;
justify-content: flex-start;
font-size: calc(10px + 2vmin);
color: rgba(88, 55, 50, 1);
background-color: #e9e9e9;
}
.TotalContainer {
display: flex;
justify-content: space-between;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 600;
font-style: normal;
font-size: 1em;
padding: 10px 30px;
padding-top: 20px;
/* margin-bottom: 17px; */
}
.Invoice-title {
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
font-size: 6vw;
color: rgba(88, 55, 50, 1);
text-align: left;
margin-left: 20px;
margin-top: 7px;
}
.Invoice-detail {
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
font-size: 20px;
color: rgba(88, 55, 50, 1);
text-align: left;
margin-left: 20px;
margin-top: 17px;
}
.PaymentOption {
overflow: visible;
background-color: white;
display: flex;
flex-direction: column;
justify-content: center;
font-size: calc(10px + 2vmin);
color: rgba(88, 55, 50, 1);
border-radius: 15px 15px 0 0;
position: fixed;
bottom: 0;
right: 0;
width: 40%;
left: 60%;
}
.PaymentOptionMargin {
z-index: -1;
overflow-x: hidden;
background-color: white;
display: flex;
flex-direction: column;
justify-content: center;
font-size: calc(10px + 2vmin);
color: rgba(88, 55, 50, 1);
position: relative;
height: 220px;
bottom: 0;
right: 0;
width: 40%;
}
.PayButton {
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
font-size: 20px;
width: 80vw;
height: 40px;
border-radius: 50px;
background-color: rgba(88, 55, 50, 1);
color: white;
border: none;
margin: 0px auto;
cursor: pointer;
margin-bottom: 23px;
}
.PayButton div {
display: flex;
justify-content: space-between;
padding-left: 20px;
padding-right: 20px;
}
.PayButton3 {
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 500;
font-style: normal;
font-size: 20px;
width: 100%;
height: 40px;
border-radius: 50px;
background-color: rgba(88, 55, 50, 1);
color: white;
border: none;
margin: 0px auto;
cursor: pointer;
margin-top: 10px;
}
.PayButton3 div {
display: flex;
justify-content: space-between;
padding-left: 20px;
padding-right: 20px;
}
.Pay2Button {
text-align: center;
color: rgba(88, 55, 50, 1);
font-size: 1em;
margin-bottom: 25px;
cursor: pointer;
}
.Confirm {
display: flex;
justify-content: space-between;
width: 80vw;
margin: 0 auto;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 600;
font-style: normal;
font-size: 1.5em;
padding: 10px 0;
margin-bottom: 17px;
}
.RoundedRectangle {
border-radius: 20px;
padding-top: 5px;
margin: 12px;
background-color: #f9f9f9;
}
.EmailContainer {
display: flex;
justify-content: space-between;
width: 80vw;
margin: 0 auto;
font-size: 1em;
padding: 10px 0;
margin-bottom: 7px;
}
.OrderTypeContainer {
display: flex;
justify-content: space-between;
width: 80vw;
margin: 0 auto;
font-size: 1em;
padding: 10px 0;
margin-bottom: 7px;
}
.Note {
text-align: left;
color: rgba(88, 55, 50, 1);
font-size: 1em;
margin-bottom: 13px;
margin-left: 50px;
cursor: pointer;
}
.NoteContainer {
display: flex;
justify-content: space-between;
width: 80vw;
margin: 0 auto;
font-size: 1em;
padding: 10px 0;
margin-bottom: 7px;
font-weight: 600;
}
.NoteInput {
width: 78vw;
height: 18px;
border-radius: 20px;
margin: 0 auto;
padding: 10px;
font-size: 15px;
border: 1px solid rgba(88, 55, 50, 0.5);
resize: none; /* Prevent resizing */
overflow-wrap: break-word; /* Ensure text wraps */
}
.AddedLastTransaction {
width: 100%;
font-size: 1em;
padding: 10px 20px;
margin-bottom: 7px;
font-weight: 600;
}
.AddedLastTransaction div {
display: flex;
justify-content: space-between;
}
.CancelAddedLastTransaction {
width: 40px;
height: 40px;
margin-right: 30px;
margin-top: 10px;
transform: rotate(45deg);
}
.PaymentOptionMargin {
z-index: -1;
overflow-x: hidden;
background-color: white;
display: flex;
flex-direction: column;
justify-content: center;
font-size: calc(10px + 2vmin);
color: rgba(88, 55, 50, 1);
position: relative;
height: 220px;
}
.TotalContainer {
display: flex;
justify-content: space-between;
/* width: 80vw; */
margin: 0 auto;
font-family: "Plus Jakarta Sans", sans-serif;
font-weight: 600;
font-style: normal;
font-size: 1.3em;
padding: 10px 0;
padding-top: 20px;
/* margin-bottom: 17px; */
}
}

4
src/pages/Join.module.css
View File

@@ -42,8 +42,12 @@
line-height: 2.25rem;
letter-spacing: -1px;
margin-bottom: 6px;
margin: 10px
}
.buttonWrapper {
display: flex;
}
.descHeading {
width: 99%;
font-weight: 700;

4
src/pages/Message.js
View File

@@ -27,8 +27,10 @@ const LinktreePage = ({ handleYes, handleNo }) => {
<div className={styles.dashboardContainer} >
<div className={styles.mainHeading}>{captMessage}</div>
{descMessage && <div className={styles.descHeading}>{descMessage}</div>}
{handleYes && <div onClick={handleYes} className={styles.button}>{yesText}</div>}
<div className={styles.buttonWrapper}>
<div onClick={handleYes} className={styles.button}>{yesText}</div>
{noText && <div onClick={handleNo} className={styles.button}>{noText}</div>}
</div>
</div>
</div>
);

12
src/pages/Payment_claimed.js
View File

@@ -164,15 +164,15 @@ export default function Transactions({ propsShopId, sendParam, deviceType }) {
{isPaymentLoading ? (
<ColorRing height="50" width="50" color="white" />
) : transaction.confirmed === 1 ? (
"Confirm has paid" // Display "Confirm has paid" if the transaction is confirmed (1)
"Konfirmasi telah bayar" // Display "Confirm has paid" if the transaction is confirmed (1)
) : transaction.confirmed === -1 ? (
"Declined" // Display "Declined" if the transaction is declined (-1)
"Ditolah" // Display "Declined" if the transaction is declined (-1)
) : transaction.confirmed === 2 ? (
"Confirm item has ready" // Display "Item ready" if the transaction is ready (2)
"Konfirmasi item telah siap" // Display "Item ready" if the transaction is ready (2)
) : transaction.confirmed === 3 ? (
"Transaction success" // Display "Item ready" if the transaction is ready (2)
"Transaksi selesai" // Display "Item ready" if the transaction is ready (2)
) : (
"Confirm availability" // Display "Confirm availability" if the transaction is not confirmed (0)
"Konfirmasi ketersediaan" // Display "Confirm availability" if the transaction is not confirmed (0)
)}
</button>
</div>
@@ -181,7 +181,7 @@ export default function Transactions({ propsShopId, sendParam, deviceType }) {
className={styles.DeclineButton}
onClick={() => handleDecline(transaction.transactionId)}
>
decline
Tolak
</h5>
)}
</div>

100
src/pages/Transaction.js
View File

@@ -67,7 +67,7 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
if (c) {
console.log(c)
setTransaction(c);
setTransactionRefreshKey(transactionRefreshKey+1);
setTransactionRefreshKey(transactionRefreshKey + 1);
}
} catch (error) {
console.error("Error processing payment:", error);
@@ -84,7 +84,7 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
if (c) {
console.log(c)
setTransaction({ ...transaction, confirmed: c.confirmed });
setTransactionRefreshKey(transactionRefreshKey+1);
setTransactionRefreshKey(transactionRefreshKey + 1);
}
// if (c) {
// // Update the confirmed status locally
@@ -115,6 +115,9 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
autoResizeTextArea(noteRef.current);
}
}, [transaction?.notes]);
const handlePrint = () => {
window.print();
};
return (
<div key={transactionRefreshKey} className={styles.Transaction}>
@@ -128,18 +131,17 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
setSelectedTable(transaction.Table || { tableId: 0 })
}
>
<div className={styles['receipt-header']}>
<div className={styles['receipt-info']}>
<h3>{transaction.payment_type == 'cash' ? 'Tunai' : transaction.payment_type == 'cashless' ? 'Non tunai' : transaction.payment_type == 'paylater' ? 'Open bill' :'Close bill' }</h3>
<h3>{transaction.payment_type == 'cash' ? 'Tunai' : transaction.payment_type == 'cashless' ? 'Non tunai' : transaction.payment_type == 'paylater' ? 'Open bill' : 'Close bill'}</h3>
<p>Transaction ID: {transaction.transactionId}</p>
{
transaction.payment_type == 'paylater/cash' ?
<p>Cash</p>
:
(transaction.payment_type == 'paylater/cashless' &&
<p>Non tunai</p>
)
<p>Cash</p>
:
(transaction.payment_type == 'paylater/cashless' &&
<p>Non tunai</p>
)
}
</div>
</div>
@@ -161,8 +163,8 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
</svg>
</div>
{depth > 0 &&
<div className={styles.circle}>{depth}</div>
}
<div className={styles.circle}>{depth}</div>
}
</div>
<div className={styles['line']} ></div>
<div className={styles['circle-right']} onClick={() => handleMoveToTransaction('next', transaction.transactionId)}>
@@ -188,7 +190,7 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
<div>
{transaction.DetailedTransactions.map((detail) => (
<div className={styles['itemContainer']} key={detail.detailedTransactionId}>
<div className={styles['plusNegative']} style={{ visibility: transaction.confirmed >= 0 && detail.acceptedStatus == 0 ? 'visible' : 'hidden', margin: transaction.confirmed >= 0 && detail.acceptedStatus == 0 ? '4px 10px 0px 10px' : '4px 0px 0px 0px' }}
<div className={styles['plusNegative']} style={{ visibility: transaction.confirmed >= 0 && detail.acceptedStatus == 0 ? 'visible' : 'hidden', margin: transaction.confirmed >= 0 && detail.acceptedStatus == 0 ? '4px 10px 0px 10px' : '4px 0px 0px 0px' }}
onClick={() =>
setNotAcceptedItems(prevState =>
prevState.includes(detail.detailedTransactionId)
@@ -225,27 +227,27 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
overflow: 'hidden',
textOverflow: 'ellipsis'
}}>
{detail.Item.name}</span> - {notAcceptedItems.includes(detail.detailedTransactionId) || detail.qty < 1 ? 'tidak tersedia' : `${detail.qty} x Rp
{detail.Item.name}</span> - {notAcceptedItems.includes(detail.detailedTransactionId) || detail.qty < 1 ? 'tidak tersedia' : `${detail.qty} x Rp
${detail.promoPrice ? detail.promoPrice : detail.price}`}
</div>
))}
</div>
{!transaction.is_paid && transaction.confirmed > -1 &&
<div
onClick={() => {
localStorage.setItem('lastTransaction', JSON.stringify(transaction));
setModal("message", { captMessage: 'Silahkan tambahkan pesanan', descMessage: 'Pembayaran akan ditambahkan ke transaksi sebelumnya.' }, null, null);
{!transaction.is_paid && transaction.confirmed > -1 &&
<div
onClick={() => {
localStorage.setItem('lastTransaction', JSON.stringify(transaction));
setModal("message", { captMessage: 'Silahkan tambahkan pesanan', descMessage: 'Pembayaran akan ditambahkan ke transaksi sebelumnya.' }, null, null);
// Dispatch the custom event
window.dispatchEvent(new Event("localStorageUpdated"));
}}
className={styles["addNewItem"]}
>
Tambah pesanan
</div>
}
// Dispatch the custom event
window.dispatchEvent(new Event("localStorageUpdated"));
}}
className={styles["addNewItem"]}
>
Tambah pesanan
</div>
}
<h2 className={styles["Transactions-detail"]}>
{transaction.serving_type === "pickup"
@@ -311,9 +313,55 @@ export default function Transactions({ propsShopId, sendParam, deviceType, handl
batalkan
</h5>
)}
{transaction.confirmed > 1 && (
<h5
className={styles.DeclineButton}
onClick={() => handlePrint()}
>
Cetak struk
</h5>
)}
</div>
)}
</div>
{transaction &&
<div id="print-section" className={styles.printContainer}>
<div className="receipt">
<h2 className="center-text">Struk Pembayaran</h2>
<hr />
<p>ID Transaksi: {transaction.transactionId}</p>
<p>Metode: {transaction.payment_type === 'cash' ? 'Tunai' :
transaction.payment_type === 'cashless' ? 'Non Tunai' :
'Open Bill'}</p>
<p>Meja: {transaction.Table?.tableNo || '-'}</p>
<hr />
{transaction.DetailedTransactions.map((detail) => (
<div key={detail.detailedTransactionId} className="item-line">
<p>{detail.Item.name}</p>
<p>{detail.qty} x Rp{detail.promoPrice || detail.price}</p>
</div>
))}
<hr />
<p className="total">Total: Rp {calculateTotalPrice(transaction.DetailedTransactions)}</p>
{transaction.notes && (
<>
<hr />
<p>Catatan:</p>
<p>{transaction.notes}</p>
</>
)}
<hr />
<p className="center-text">Terima Kasih!</p>
</div>
</div>
}
</div>
);
}

8
src/pages/Transaction_failed.js
View File

@@ -16,12 +16,8 @@ export default function Transaction_pending() {
<div className={styles.Transaction}>
<div className={containerStyle}>
<div style={{ marginTop: "30px", textAlign: "center" }}>
<h2>transaction failed</h2>
<img
className={styles.expression}
src="https://i.imgur.com/B6k9exa.png"
alt="Failed"
/>
<h2>Transaksi dibatalkan</h2>
</div>
</div>
</div>

2
src/pages/Transactions.js
View File

@@ -198,7 +198,7 @@ console.log(aggregatedItems.values())
<div className={styles['receipt-header']}>
{transaction.confirmed === 1 ? (
<ColorRing className={styles['receipt-logo']} />
) : transaction.confirmed === -1 && !transaction.is_paid || transaction.confirmed === -2 && !transaction.is_paid ? (
) : (transaction.confirmed == -1 && !transaction.is_paid) || (transaction.confirmed === -2 && !transaction.is_paid) ? (
<div style={{ display: 'flex', justifyContent: 'center', margin: '16px 0px' }}>
<svg
style={{ width: '60px', transform: 'Rotate(45deg)' }}

54
src/pages/Transactions.module.css
View File

@@ -395,4 +395,56 @@
text-align: center;
color: white;
line-height: 27px;
}
}
/* Transactions.module.css */
.printContainer {
display: none; /* Hidden in normal view */
}
/* Print-specific styles */
@media print {
.Transaction {
display: none; /* Hide everything else when printing */
}
.printContainer {
display: block !important;
position: static;
background: white;
color: black;
font-family: 'Courier New', Courier, monospace;
padding: 20px;
}
.receipt {
width: 100%;
max-width: 400px;
margin: 0 auto;
}
.center-text {
text-align: center;
font-weight: bold;
}
.item-line {
display: flex;
justify-content: space-between;
margin-bottom: 8px;
}
.total {
text-align: right;
font-size: 1.2em;
font-weight: bold;
margin-top: 20px;
}
button, .DeclineButton, .addNewItem {
display: none !important;
}
}