diff --git a/package-lock.json b/package-lock.json index aeda0dd..8e3a37d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2968,381 +2968,6 @@ } } }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.58.0.tgz", - "integrity": "sha512-mr0tmS/4FoVk1cnaeN244A/wjvGDNItZKR8hRhnmCzygyRXYtKF5jVDSIILR1U97CTzAYmbgIj/Dukg62ggG5w==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "peer": true - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.58.0.tgz", - "integrity": "sha512-+s++dbp+/RTte62mQD9wLSbiMTV+xr/PeRJEc/sFZFSBRlHPNPVaf5FXlzAL77Mr8FtSfQqCN+I598M8U41ccQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "peer": true - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.58.0.tgz", - "integrity": "sha512-MFWBwTcYs0jZbINQBXHfSrpSQJq3IUOakcKPzfeSznONop14Pxuqa0Kg19GD0rNBMPQI2tFtu3UzapZpH0Uc1Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.58.0.tgz", - "integrity": "sha512-yiKJY7pj9c9JwzuKYLFaDZw5gma3fI9bkPEIyofvVfsPqjCWPglSHdpdwXpKGvDeYDms3Qal8qGMEHZ1M/4Udg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.58.0.tgz", - "integrity": "sha512-x97kCoBh5MOevpn/CNK9W1x8BEzO238541BGWBc315uOlN0AD/ifZ1msg+ZQB05Ux+VF6EcYqpiagfLJ8U3LvQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "peer": true - }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.58.0.tgz", - "integrity": "sha512-Aa8jPoZ6IQAG2eIrcXPpjRcMjROMFxCt1UYPZZtCxRV68WkuSigYtQ/7Zwrcr2IvtNJo7T2JfDXyMLxq5L4Jlg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.58.0.tgz", - "integrity": "sha512-Ob8YgT5kD/lSIYW2Rcngs5kNB/44Q2RzBSPz9brf2WEtcGR7/f/E9HeHn1wYaAwKBni+bdXEwgHvUd0x12lQSA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.58.0.tgz", - "integrity": "sha512-K+RI5oP1ceqoadvNt1FecL17Qtw/n9BgRSzxif3rTL2QlIu88ccvY+Y9nnHe/cmT5zbH9+bpiJuG1mGHRVwF4Q==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.58.0.tgz", - "integrity": "sha512-T+17JAsCKUjmbopcKepJjHWHXSjeW7O5PL7lEFaeQmiVyw4kkc5/lyYKzrv6ElWRX/MrEWfPiJWqbTvfIvjM1Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.58.0.tgz", - "integrity": "sha512-cCePktb9+6R9itIJdeCFF9txPU7pQeEHB5AbHu/MKsfH/k70ZtOeq1k4YAtBv9Z7mmKI5/wOLYjQ+B9QdxR6LA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.58.0.tgz", - "integrity": "sha512-iekUaLkfliAsDl4/xSdoCJ1gnnIXvoNz85C8U8+ZxknM5pBStfZjeXgB8lXobDQvvPRCN8FPmmuTtH+z95HTmg==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.58.0.tgz", - "integrity": "sha512-68ofRgJNl/jYJbxFjCKE7IwhbfxOl1muPN4KbIqAIe32lm22KmU7E8OPvyy68HTNkI2iV/c8y2kSPSm2mW/Q9Q==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.58.0.tgz", - "integrity": "sha512-dpz8vT0i+JqUKuSNPCP5SYyIV2Lh0sNL1+FhM7eLC457d5B9/BC3kDPp5BBftMmTNsBarcPcoz5UGSsnCiw4XQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.58.0.tgz", - "integrity": "sha512-4gdkkf9UJ7tafnweBCR/mk4jf3Jfl0cKX9Np80t5i78kjIH0ZdezUv/JDI2VtruE5lunfACqftJ8dIMGN4oHew==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.58.0.tgz", - "integrity": "sha512-YFS4vPnOkDTD/JriUeeZurFYoJhPf9GQQEF/v4lltp3mVcBmnsAdjEWhr2cjUCZzZNzxCG0HZOvJU44UGHSdzw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.58.0.tgz", - "integrity": "sha512-x2xgZlFne+QVNKV8b4wwaCS8pwq3y14zedZ5DqLzjdRITvreBk//4Knbcvm7+lWmms9V9qFp60MtUd0/t/PXPw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.58.0.tgz", - "integrity": "sha512-jIhrujyn4UnWF8S+DHSkAkDEO3hLX0cjzxJZPLF80xFyzyUIYgSMRcYQ3+uqEoyDD2beGq7Dj7edi8OnJcS/hg==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.58.0.tgz", - "integrity": "sha512-+410Srdoh78MKSJxTQ+hZ/Mx+ajd6RjjPwBPNd0R3J9FtL6ZA0GqiiyNjCO9In0IzZkCNrpGymSfn+kgyPQocg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.58.0.tgz", - "integrity": "sha512-ZjMyby5SICi227y1MTR3VYBpFTdZs823Rs/hpakufleBoufoOIB6jtm9FEoxn/cgO7l6PM2rCEl5Kre5vX0QrQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.58.0.tgz", - "integrity": "sha512-ds4iwfYkSQ0k1nb8LTcyXw//ToHOnNTJtceySpL3fa7tc/AsE+UpUFphW126A6fKBGJD5dhRvg8zw1rvoGFxmw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "peer": true - }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.58.0.tgz", - "integrity": "sha512-fd/zpJniln4ICdPkjWFhZYeY/bpnaN9pGa6ko+5WD38I0tTqk9lXMgXZg09MNdhpARngmxiCg0B0XUamNw/5BQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "peer": true - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.58.0.tgz", - "integrity": "sha512-YpG8dUOip7DCz3nr/JUfPbIUo+2d/dy++5bFzgi4ugOGBIox+qMbbqt/JoORwvI/C9Kn2tz6+Bieoqd5+B1CjA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "peer": true - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.58.0.tgz", - "integrity": "sha512-b9DI8jpFQVh4hIXFr0/+N/TzLdpBIoPzjt0Rt4xJbW3mzguV3mduR9cNgiuFcuL/TeORejJhCWiAXe3E/6PxWA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "peer": true - }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.58.0.tgz", - "integrity": "sha512-CSrVpmoRJFN06LL9xhkitkwUcTZtIotYAF5p6XOR2zW0Zz5mzb3IPpcoPhB02frzMHFNo1reQ9xSF5fFm3hUsQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "peer": true - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.58.0.tgz", - "integrity": "sha512-QFsBgQNTnh5K0t/sBsjJLq24YVqEIVkGpfN2VHsnN90soZyhaiA9UUHufcctVNL4ypJY0wrwad0wslx2KJQ1/w==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "peer": true - }, "node_modules/@sindresorhus/is": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", @@ -11600,48 +11225,19 @@ } }, "node_modules/rollup": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.58.0.tgz", - "integrity": "sha512-wbT0mBmWbIvvq8NeEYWWvevvxnOyhKChir47S66WCxw1SXqhw7ssIYejnQEVt7XYQpsj2y8F9PM+Cr3SNEa0gw==", + "version": "2.80.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.80.0.tgz", + "integrity": "sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==", "dev": true, "license": "MIT", "peer": true, - "dependencies": { - "@types/estree": "1.0.8" - }, "bin": { "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" + "node": ">=10.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.58.0", - "@rollup/rollup-android-arm64": "4.58.0", - "@rollup/rollup-darwin-arm64": "4.58.0", - "@rollup/rollup-darwin-x64": "4.58.0", - "@rollup/rollup-freebsd-arm64": "4.58.0", - "@rollup/rollup-freebsd-x64": "4.58.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.58.0", - "@rollup/rollup-linux-arm-musleabihf": "4.58.0", - "@rollup/rollup-linux-arm64-gnu": "4.58.0", - "@rollup/rollup-linux-arm64-musl": "4.58.0", - "@rollup/rollup-linux-loong64-gnu": "4.58.0", - "@rollup/rollup-linux-loong64-musl": "4.58.0", - "@rollup/rollup-linux-ppc64-gnu": "4.58.0", - "@rollup/rollup-linux-ppc64-musl": "4.58.0", - "@rollup/rollup-linux-riscv64-gnu": "4.58.0", - "@rollup/rollup-linux-riscv64-musl": "4.58.0", - "@rollup/rollup-linux-s390x-gnu": "4.58.0", - "@rollup/rollup-linux-x64-gnu": "4.58.0", - "@rollup/rollup-linux-x64-musl": "4.58.0", - "@rollup/rollup-openbsd-x64": "4.58.0", - "@rollup/rollup-openharmony-arm64": "4.58.0", - "@rollup/rollup-win32-arm64-msvc": "4.58.0", - "@rollup/rollup-win32-ia32-msvc": "4.58.0", - "@rollup/rollup-win32-x64-gnu": "4.58.0", - "@rollup/rollup-win32-x64-msvc": "4.58.0", "fsevents": "~2.3.2" } }, diff --git a/src/Features/ThemeChange/ThemeChange.js b/src/Features/ThemeChange/ThemeChange.js index 601bdeb..13c6a8e 100644 --- a/src/Features/ThemeChange/ThemeChange.js +++ b/src/Features/ThemeChange/ThemeChange.js @@ -196,6 +196,7 @@ export const getTableFonts = createAsyncThunk( export const getTemplate = createAsyncThunk( 'theme/getTemplate', + async ({ CompId, BranchId, AppId }) => { if ( CompId != null && diff --git a/src/Pages/BookingScreen/BookingPage.jsx b/src/Pages/BookingScreen/BookingPage.jsx index 0e6ef32..66b1b3d 100644 --- a/src/Pages/BookingScreen/BookingPage.jsx +++ b/src/Pages/BookingScreen/BookingPage.jsx @@ -62,6 +62,7 @@ const BookingPage = () => { const templateLoadedRef = useRef( Object.keys(templateData)?.length > 0 ? true : false ); + console.log(templateData, 'templateDatatemplateData'); const PricingAppPricingName = useSelector( GlobalPricingAppPricingName, shallowEqual @@ -402,7 +403,7 @@ const BookingPage = () => { !templateResponse?.data?.data || templateResponse.data.data.length === 0 ) { - //Professional(Plan); + Professional(Plan); } } // Check if template data is empty or not diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx index e4e1cbe..e4efaa7 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState, useEffect, lazy, Suspense } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { Popconfirm, Tooltip } from 'antd'; import { AiOutlineClose, AiFillDelete } from 'react-icons/ai'; @@ -281,22 +281,6 @@ const BSBillingTable1 = () => { handleEditQuantity(item); setshortKeyMethod(method); }; - - // const handleKeyDown = (event) => { - // if (!event.ctrlKey) return; - - // const key = event.key.toLowerCase(); - - // if (key === 'q') { - // event.preventDefault(); - // handleShortcut('qty'); - // } - - // if (key === 'e') { - // event.preventDefault(); - // handleShortcut('price'); - // } - // }; const handleKeyDown = (event) => { const key = event.key.toLowerCase(); // 👉 ALT + P → Open Edit Total Amount diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BsBill2.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BsBill2.jsx index 926b046..2296ebd 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BsBill2.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BsBill2.jsx @@ -111,7 +111,8 @@ const BsBill2 = () => { const GetCustId = useSelector(GlobalCustId); const selectedCustomer = useSelector(GlobalSelOption); - const [customerPriceHistoryOpen, setCustomerPriceHistoryOpen] = useState(false); + const [customerPriceHistoryOpen, setCustomerPriceHistoryOpen] = + useState(false); const [customerProduct, setCustomerProduct] = useState(null); const BillOrderPre = preferenceDatas?.[0]?.SettingDtlDetails?.find( @@ -136,16 +137,16 @@ const BsBill2 = () => { OrderType === 'Hold' ? CartOrderDetails?.filter((a, b) => a.BookingTypeName === 'TakeAway') : CartOrderDetails?.filter( - (a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId - ); + (a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId + ); const OldtableDataDinein = CartOrderDetails?.filter( (a, b) => a.BookingTypeName === 'Dine In' && a?.SalesId ); const OldtableDataTakeAway = OrderType != 'Hold' ? CartOrderDetails?.filter( - (a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId - ) + (a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId + ) : []; useEffect(() => { @@ -268,7 +269,7 @@ const BsBill2 = () => { const handleCustomerProductPriceHistory = (item) => { setCustomerPriceHistoryOpen(true); setCustomerProduct(item?.ProdId); - } + }; const increase = async (item) => { const OtherOrderDatas = CartOrderDetails?.filter( (cartItem) => @@ -329,26 +330,26 @@ const BsBill2 = () => { if (isItemInCart && BookingTypeProd != 'Dine In' && OrderType != 'Hold') { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [UpdatedCartItem, ...OtherorderDataforNormal]; @@ -359,26 +360,26 @@ const BsBill2 = () => { } } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [...OtherorderDataforNormal, UpdatedCartItem]; @@ -397,26 +398,26 @@ const BsBill2 = () => { ) { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [UpdatedCartItem, ...OtherorderDataforNormal]; @@ -427,26 +428,26 @@ const BsBill2 = () => { } } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [...OtherorderDataforNormal, UpdatedCartItem]; @@ -459,27 +460,27 @@ const BsBill2 = () => { } else if (isItemInCartHold && OrderType === 'Hold') { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCartHold, - OrderQty: isItemInCartHold?.OrderQty + 1, - TotalAmt: - (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate, - TaxAmt: ( - ((isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.TaxPercentage) / - (100 + isItemInCartHold?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCartHold, + OrderQty: isItemInCartHold?.OrderQty + 1, + TotalAmt: + (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate, + TaxAmt: ( ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate * isItemInCartHold?.TaxPercentage) / (100 + isItemInCartHold?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - + ( + ((isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.TaxPercentage) / + (100 + isItemInCartHold?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [ UpdatedCartItem, @@ -493,27 +494,27 @@ const BsBill2 = () => { } } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCartHold, - OrderQty: isItemInCartHold?.OrderQty + 1, - TotalAmt: - (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate, - TaxAmt: ( - ((isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.TaxPercentage) / - (100 + isItemInCartHold?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCartHold, + OrderQty: isItemInCartHold?.OrderQty + 1, + TotalAmt: + (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate, + TaxAmt: ( ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate * isItemInCartHold?.TaxPercentage) / (100 + isItemInCartHold?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - + ( + ((isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.TaxPercentage) / + (100 + isItemInCartHold?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [ ...OtherorderDataforNormalWithoutSalesId, @@ -678,27 +679,27 @@ const BsBill2 = () => { ) { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty - 1, - TotalAmt: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty - 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty - 1, + TotalAmt: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty - 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [UpdatedCartItem, ...OtherorderDataforNormal]; @@ -709,27 +710,27 @@ const BsBill2 = () => { } } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty - 1, - TotalAmt: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty - 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty - 1, + TotalAmt: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty - 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [...OtherorderDataforNormal, UpdatedCartItem]; @@ -748,27 +749,27 @@ const BsBill2 = () => { ) { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty - 1, - TotalAmt: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty - 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty - 1, + TotalAmt: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty - 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [UpdatedCartItem, ...OtherorderDataforNormal]; @@ -779,27 +780,27 @@ const BsBill2 = () => { } } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty - 1, - TotalAmt: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, - TaxAmt: ( - ((isItemInCart?.OrderQty - 1) * - isItemInCart?.OrderRate * - isItemInCart?.TaxPercentage) / - (100 + isItemInCart?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty - 1, + TotalAmt: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, + TaxAmt: ( ((isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate * isItemInCart?.TaxPercentage) / (100 + isItemInCart?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate - + ( + ((isItemInCart?.OrderQty - 1) * + isItemInCart?.OrderRate * + isItemInCart?.TaxPercentage) / + (100 + isItemInCart?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [...OtherorderDataforNormal, UpdatedCartItem]; @@ -812,29 +813,29 @@ const BsBill2 = () => { } else if (isItemInCartHold && OrderType === 'Hold') { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCartHold, - OrderQty: isItemInCartHold?.OrderQty - 1, - TotalAmt: - (isItemInCartHold?.OrderQty - 1) * - isItemInCartHold?.OrderRate, - TaxAmt: ( - ((isItemInCartHold?.OrderQty - 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.TaxPercentage) / - (100 + isItemInCartHold?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCartHold?.OrderQty - 1) * - isItemInCartHold?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCartHold, + OrderQty: isItemInCartHold?.OrderQty - 1, + TotalAmt: + (isItemInCartHold?.OrderQty - 1) * + isItemInCartHold?.OrderRate, + TaxAmt: ( ((isItemInCartHold?.OrderQty - 1) * isItemInCartHold?.OrderRate * isItemInCartHold?.TaxPercentage) / (100 + isItemInCartHold?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCartHold?.OrderQty - 1) * + isItemInCartHold?.OrderRate - + ( + ((isItemInCartHold?.OrderQty - 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.TaxPercentage) / + (100 + isItemInCartHold?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [ UpdatedCartItem, @@ -848,29 +849,29 @@ const BsBill2 = () => { } } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCartHold, - OrderQty: isItemInCartHold?.OrderQty - 1, - TotalAmt: - (isItemInCartHold?.OrderQty - 1) * - isItemInCartHold?.OrderRate, - TaxAmt: ( - ((isItemInCartHold?.OrderQty - 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.TaxPercentage) / - (100 + isItemInCartHold?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: - (isItemInCartHold?.OrderQty - 1) * - isItemInCartHold?.OrderRate - - ( + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCartHold, + OrderQty: isItemInCartHold?.OrderQty - 1, + TotalAmt: + (isItemInCartHold?.OrderQty - 1) * + isItemInCartHold?.OrderRate, + TaxAmt: ( ((isItemInCartHold?.OrderQty - 1) * isItemInCartHold?.OrderRate * isItemInCartHold?.TaxPercentage) / (100 + isItemInCartHold?.TaxPercentage) ).toFixed(2), - }; + WithoutTaxRate: + (isItemInCartHold?.OrderQty - 1) * + isItemInCartHold?.OrderRate - + ( + ((isItemInCartHold?.OrderQty - 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.TaxPercentage) / + (100 + isItemInCartHold?.TaxPercentage) + ).toFixed(2), + }; const UpdatedData = [ ...OtherorderDataforNormalWithoutSalesId, @@ -1003,8 +1004,6 @@ const BsBill2 = () => { } else { dispatch(changeOrderCardDetails(UpdatedData)); } - - } else if ( item?.BookingTypeName !== 'Dine In' && OrderType === 'Hold' @@ -1275,8 +1274,8 @@ const BsBill2 = () => { > {index === Math.floor((OldtableDataTakeAway.length - 1) / 2) && ( - - )} + + )} )}
{ ? item?.SalesId && OrderType !== 'Hold' ? 'rgb(243, 248, 213)' : triggerAnimation && - index === 0 && - !item?.SalesId && - tableDataTakeAway?.length >= PreviousdataLength + index === 0 && + !item?.SalesId && + tableDataTakeAway?.length >= PreviousdataLength ? 'wheat' : triggerAnimation && - index === 0 && - tableDataTakeAway?.length >= - PreviousdataLength && - !HoldOrderDtl && - !UnpaidData + index === 0 && + tableDataTakeAway?.length >= + PreviousdataLength && + !HoldOrderDtl && + !UnpaidData ? 'wheat' : 'inherit' : 'none', @@ -1310,9 +1309,9 @@ const BsBill2 = () => { item?.SalesId && OrderType !== 'Hold' ? 'rgb(243, 248, 213)' : GlobEstBooking === 'ParEst' && - GlobProdwisedata?.includes( - item?.InwardDtlId + ' ' + item?.BookingTypeName - ) + GlobProdwisedata?.includes( + item?.InwardDtlId + ' ' + item?.BookingTypeName + ) ? '#b2d1f7' : index % 2 === 0 ? 'white' @@ -1339,8 +1338,8 @@ const BsBill2 = () => { loading="lazy" src={ item?.ProdLogo && - item?.ProdLogo != null && - item?.ProdLogo != undefined + item?.ProdLogo != null && + item?.ProdLogo != undefined ? item?.ProdLogo : defaultimage } @@ -1402,21 +1401,21 @@ const BsBill2 = () => { {productBasedExtraCharges?.find( (find) => find.ProdId === item.ProdId ) !== undefined && ( -
- Extra Charges :{' '} - { - productBasedExtraCharges?.find( - (find) => find.ProdId === item.ProdId - )?.TotalAmt - } -
- )} +
+ Extra Charges :{' '} + { + productBasedExtraCharges?.find( + (find) => find.ProdId === item.ProdId + )?.TotalAmt + } +
+ )}

{ > {index == Math.round(OldtableDataDinein?.length / 2 - 0.1) && ( - - )} + + )}

)}
{ ? item?.SalesId ? 'rgb(243, 248, 213)' : BookingType === 'Dine In' && - triggerAnimation && - OldtableDataTakeAway?.length + index === 0 && - !item?.SalesId && - tableDataDinein?.length >= PreviousdataLength - ? 'wheat' - : BookingType !== 'Dine In' && triggerAnimation && OldtableDataTakeAway?.length + index === 0 && - tableDataDinein?.length >= PreviousdataLength && - !HoldOrderDtl && - !UnpaidData + !item?.SalesId && + tableDataDinein?.length >= PreviousdataLength + ? 'wheat' + : BookingType !== 'Dine In' && + triggerAnimation && + OldtableDataTakeAway?.length + index === 0 && + tableDataDinein?.length >= PreviousdataLength && + !HoldOrderDtl && + !UnpaidData ? 'wheat' : 'inherit' : 'none', background: item?.SalesId ? 'rgb(243, 248, 213)' : GlobEstBooking === 'ParEst' && - GlobProdwisedata?.includes( - item?.InwardDtlId + ' ' + item?.BookingTypeName - ) + GlobProdwisedata?.includes( + item?.InwardDtlId + ' ' + item?.BookingTypeName + ) ? '#b2d1f7' : (OldtableDataTakeAway?.length + index) % 2 === 0 ? 'white' @@ -1567,8 +1566,8 @@ const BsBill2 = () => { loading="lazy" src={ item?.ProdLogo && - item?.ProdLogo != null && - item?.ProdLogo != undefined + item?.ProdLogo != null && + item?.ProdLogo != undefined ? item?.ProdLogo : defaultimage } @@ -1625,21 +1624,21 @@ const BsBill2 = () => { {productBasedExtraCharges?.find( (find) => find.ProdId === item.ProdId ) !== undefined && ( -
- Extra Charges :{' '} - { - productBasedExtraCharges?.find( - (find) => find.ProdId === item.ProdId - )?.TotalAmt - } -
- )} +
+ Extra Charges :{' '} + { + productBasedExtraCharges?.find( + (find) => find.ProdId === item.ProdId + )?.TotalAmt + } +
+ )}

{ > {index == Math.round(tableDataTakeAway?.length / 2 - 0.1) && ( - - )} + + )}

)}
{ ? BookingType === 'Dine In' && item?.SalesId ? 'rgb(243, 248, 213)' : BookingType === 'Dine In' && - triggerAnimation && - OldtableDataDinein?.length + - OldtableDataTakeAway?.length + - index === - 0 && - !item?.SalesId && - tableDataTakeAway?.length >= PreviousdataLength - ? 'wheat' - : BookingType !== 'Dine In' && triggerAnimation && OldtableDataDinein?.length + - OldtableDataTakeAway?.length + - index === - 0 && - tableDataTakeAway?.length >= - PreviousdataLength && - !HoldOrderDtl && - !UnpaidData + OldtableDataTakeAway?.length + + index === + 0 && + !item?.SalesId && + tableDataTakeAway?.length >= PreviousdataLength + ? 'wheat' + : BookingType !== 'Dine In' && + triggerAnimation && + OldtableDataDinein?.length + + OldtableDataTakeAway?.length + + index === + 0 && + tableDataTakeAway?.length >= + PreviousdataLength && + !HoldOrderDtl && + !UnpaidData ? 'wheat' : (OldtableDataDinein?.length + - OldtableDataTakeAway?.length + - index) % - 2 === - 0 + OldtableDataTakeAway?.length + + index) % + 2 === + 0 ? 'white' : SelectedBillColor?.['OverallBackgroundColor'] ? SelectedBillColor?.[ - 'OverallBackgroundColor' - ] + 'OverallBackgroundColor' + ] : '#d6d6d6' : (OldtableDataDinein?.length + - OldtableDataTakeAway?.length + - index) % - 2 === - 0 + OldtableDataTakeAway?.length + + index) % + 2 === + 0 ? 'white' : SelectedBillColor?.['OverallBackgroundColor'] ? SelectedBillColor?.['OverallBackgroundColor'] @@ -1788,15 +1787,15 @@ const BsBill2 = () => { BookingType === 'Dine In' && item?.SalesId ? 'rgb(243, 248, 213)' : GlobEstBooking === 'ParEst' && - GlobProdwisedata?.includes( - item?.InwardDtlId + ' ' + item?.BookingTypeName - ) + GlobProdwisedata?.includes( + item?.InwardDtlId + ' ' + item?.BookingTypeName + ) ? '#b2d1f7' : (OldtableDataDinein?.length + - OldtableDataTakeAway?.length + - index) % - 2 === - 0 + OldtableDataTakeAway?.length + + index) % + 2 === + 0 ? 'white' : SelectedBillColor?.['OverallBackgroundColor'] ? SelectedBillColor?.['OverallBackgroundColor'] @@ -1805,9 +1804,9 @@ const BsBill2 = () => { BillOrderPre === 'Y' && !BookingTypeBoth ? triggerAnimation && OldtableDataDinein?.length + - OldtableDataTakeAway?.length + - index === - 0 && + OldtableDataTakeAway?.length + + index === + 0 && !item?.SalesId && tableDataTakeAway?.length >= PreviousdataLength && !HoldOrderDtl && @@ -1824,8 +1823,8 @@ const BsBill2 = () => { loading="lazy" src={ item?.ProdLogo && - item?.ProdLogo != null && - item?.ProdLogo != undefined + item?.ProdLogo != null && + item?.ProdLogo != undefined ? item?.ProdLogo : defaultimage } @@ -1880,21 +1879,21 @@ const BsBill2 = () => { {productBasedExtraCharges?.find( (find) => find.ProdId === item.ProdId ) !== undefined && ( -
- Extra Charges :{' '} - { - productBasedExtraCharges?.find( - (find) => find.ProdId === item.ProdId - )?.TotalAmt - } -
- )} +
+ Extra Charges :{' '} + { + productBasedExtraCharges?.find( + (find) => find.ProdId === item.ProdId + )?.TotalAmt + } +
+ )}

{ !BookingTypeBoth ? 'rgb(243, 248, 213)' : BookingType === 'Dine In' && - triggerAnimation && - OldtableDataTakeAway?.length + - OldtableDataDinein?.length + - tableDataTakeAway?.length + - index === - 0 && - !item?.SalesId && - tableDataDinein?.length >= PreviousdataLength - ? 'wheat' - : BookingType !== 'Dine In' && triggerAnimation && OldtableDataTakeAway?.length + - OldtableDataDinein?.length + - tableDataTakeAway?.length + - index === - 0 && - tableDataDinein?.length >= PreviousdataLength && - !HoldOrderDtl && - !UnpaidData + OldtableDataDinein?.length + + tableDataTakeAway?.length + + index === + 0 && + !item?.SalesId && + tableDataDinein?.length >= PreviousdataLength + ? 'wheat' + : BookingType !== 'Dine In' && + triggerAnimation && + OldtableDataTakeAway?.length + + OldtableDataDinein?.length + + tableDataTakeAway?.length + + index === + 0 && + tableDataDinein?.length >= PreviousdataLength && + !HoldOrderDtl && + !UnpaidData ? 'wheat' : 'inherit' : 'none', background: BookingType === 'Dine In' && - item?.SalesId && - !BookingTypeBoth + item?.SalesId && + !BookingTypeBoth ? 'rgb(243, 248, 213)' : GlobEstBooking === 'ParEst' && - GlobProdwisedata?.includes( - item?.InwardDtlId + ' ' + item?.BookingTypeName - ) + GlobProdwisedata?.includes( + item?.InwardDtlId + ' ' + item?.BookingTypeName + ) ? '#b2d1f7' : (OldtableDataTakeAway?.length + - OldtableDataDinein?.length + - tableDataTakeAway?.length + - index) % - 2 === - 0 + OldtableDataDinein?.length + + tableDataTakeAway?.length + + index) % + 2 === + 0 ? 'white' : SelectedBillColor?.['OverallBackgroundColor'] ? SelectedBillColor?.['OverallBackgroundColor'] @@ -2066,10 +2065,10 @@ const BsBill2 = () => { BillOrderPre === 'Y' && !BookingTypeBoth ? triggerAnimation && OldtableDataTakeAway?.length + - OldtableDataDinein?.length + - tableDataTakeAway?.length + - index === - 0 && + OldtableDataDinein?.length + + tableDataTakeAway?.length + + index === + 0 && !item?.SalesId && tableDataDinein?.length >= PreviousdataLength && !HoldOrderDtl && @@ -2086,8 +2085,8 @@ const BsBill2 = () => { loading="lazy" src={ item?.ProdLogo && - item?.ProdLogo != null && - item?.ProdLogo != undefined + item?.ProdLogo != null && + item?.ProdLogo != undefined ? item?.ProdLogo : defaultimage } @@ -2144,21 +2143,21 @@ const BsBill2 = () => { {productBasedExtraCharges?.find( (find) => find.ProdId === item.ProdId ) !== undefined && ( -

- Extra Charges :{' '} - { - productBasedExtraCharges?.find( - (find) => find.ProdId === item.ProdId - )?.TotalAmt - } -
- )} +
+ Extra Charges :{' '} + { + productBasedExtraCharges?.find( + (find) => find.ProdId === item.ProdId + )?.TotalAmt + } +
+ )}

{ ProductDetail={Modaldata} /> )} - {(customerPriceHistoryOpen && GetCustId) && + {customerPriceHistoryOpen && GetCustId && ( { setCustomerProduct={setCustomerProduct} selectedCustomer={selectedCustomer} /> - } + )}

diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx index b8f4595..740105d 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx @@ -1,4 +1,4 @@ -import React, { Suspense, useEffect, useState } from 'react'; +import React, { Suspense, useEffect, useState,lazy } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { Popconfirm, Tooltip } from 'antd'; import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.scss'; diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx index 7c5658e..aadc122 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BST6Payment.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState, useRef, lazy } from 'react'; +import React, { useEffect, useState, useRef, lazy ,Suspense } from 'react'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import moment from 'moment'; @@ -171,7 +171,7 @@ import { getCustomerDisplayWindow } from '../../../../../Features/customerDispla import { getEmpAccess } from '../../../../../Features/AppPage/CenterPage.js'; import PozoSplitPaymentIcon from '../../UtillComponents/Pozo retail icons/PozoSplitPaymentIcon.jsx'; import PozoCartIcon from '../../../../../Pages/BookingScreen/Components/UtillComponents/PozoCartIcon.jsx'; -import { Global_OverallOfferAmount } from '../../../../../Features/Offer/Offer.js'; +import { Global_OrderOfferDetail, Global_OverallOfferAmount } from '../../../../../Features/Offer/Offer.js'; import { useApplyOfferto_CardDetail } from '../../UtillComponents/BSNavBarOffer/BSNavBarOffer_CustomHooks.jsx'; import TooltipWrapper from '../../../../../Components/Tooltip/Tooltip'; import { useAuth } from '../../../../../AuthContext.jsx'; @@ -301,9 +301,6 @@ const BST6Payment = () => { const prodCat = useSelector(GlobalProductCategorie); const ProdSubCat = useSelector(GlobalProductSubCategorie); const templateData = useSelector(getTemplateData); - const holdCheckedSalesSetup = tableOptions?.some( - (item) => item?.OptionName === 'Hold' - ); const tableOptions = templateData?.BookingBilling?.[1]; const OfferCheckedInSetup = templateData?.BookingNavbar?.[1].some( (item) => item?.OptionName == 'Offer' @@ -471,6 +468,10 @@ const BST6Payment = () => { // for customised invoice number const { invoiceDate, clearInvoiceDate } = useDateStore(); const CurrentOrderId = useSelector(GlobalCurrentOrderId); + const holdCheckedSalesSetup = tableOptions?.some( + (item) => item?.OptionName === 'Hold' + ); + useEffect(() => { if ( OrderCardDetail?.length === 1 && diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx index e44bf95..52c605f 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBilling7Payment.jsx @@ -268,9 +268,6 @@ const BSBilling7Payment = () => { const templateData = useSelector(getTemplateData); const appPreferences = useSelector(ApplicationPreferences); const Combodata = useSelector(GlobalCombocarddata, shallowEqual); - const holdCheckedSalesSetup = tableOptions?.some( - (item) => item?.OptionName === 'Hold' - ); const bookingTypePreference = appPreferences?.find( (preference) => preference?.PreferredCatName === 'Booking Type' )?.PreferenceCatDetails; @@ -474,6 +471,10 @@ const BSBilling7Payment = () => { // for customised invoice number const { invoiceDate, clearInvoiceDate } = useDateStore(); const CurrentOrderId = useSelector(GlobalCurrentOrderId); + const holdCheckedSalesSetup = tableOptions?.some( + (item) => item?.OptionName === 'Hold' + ); + const filteredSettingNames = SettingDataSelector?.[0]?.['SettingDtlDetails'] ?.filter( (item) => diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx index 37fdb39..48eaffc 100644 --- a/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx +++ b/src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx @@ -97,7 +97,6 @@ import { useUtilsComponent } from '../../../../../Services/utils.js'; const StandardTable = () => { const { removeExtraCharge } = useUtilsComponent(); const dispatch = useDispatch(); - const applyOffer = useApplyOfferto_CardDetail(); const preferenceDatas = useSelector(PreferenceData); const preferenceDetails = preferenceDatas?.[0]?.SettingDtlDetails; const preferenceOffer = @@ -405,11 +404,9 @@ const StandardTable = () => { const Clearall = async () => { if (OrderType === 'Hold') { AvailableDate && UnblockSlotsAll(OrderCardDetail); - if (OfferCheckedInSetup && preferenceOffer) { - await applyOffer([]); - } else { - dispatch(changeOrderCardDetails([])); - } + + dispatch(changeOrderCardDetails([])); + if (salesBillEdit) { getstockbadge(); dispatch(changeBillEditingMode(false)); @@ -445,19 +442,12 @@ const StandardTable = () => { ); AvailableDate && UnblockSlotsAll(UnOrderData); - if (OfferCheckedInSetup && preferenceOffer) { - await applyOffer(UpdatedData); - } else { - dispatch(changeOrderCardDetails(UpdatedData)); - } + dispatch(changeOrderCardDetails(UpdatedData)); + await dispatch(changeBookingType('Dine In')); } else { AvailableDate && UnblockSlotsAll(OrderCardDetail); - if (OfferCheckedInSetup && preferenceOffer) { - await applyOffer([]); - } else { - dispatch(changeOrderCardDetails([])); - } + dispatch(changeOrderCardDetails([])); await dispatch(ChangeTotalAmount([])); await dispatch(changeUnpaidData(false)); await dispatch(changeReorderHoldDetails({})); diff --git a/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx b/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx index 35dd3c0..ca41261 100644 --- a/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx +++ b/src/Pages/BookingScreen/Components/BSCombo/BSC1NavBar.jsx @@ -1,4 +1,12 @@ -import React, { lazy, Suspense, useEffect, useRef, useState } from 'react'; +import React, { + lazy, + Suspense, + useCallback, + useEffect, + useRef, + useState, + useMemo, +} from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; import { TiLocation } from 'react-icons/ti'; @@ -17,10 +25,13 @@ import { getBranchDetail, getCompBranchData, } from '../../../../Features/BrachLogin/BranchLogin.js'; -import { clearSession, sessionStore } from '../../../../Services/Others'; +import { + clearSession, + getSession, + sessionStore, +} from '../../../../Services/Others'; import PozoHomeIcon from '../UtillComponents/Pozo retail icons/PozoHomeIcon.jsx'; import { GlobalCompBranchData } from '../../../../Features/BrachLogin/BranchLogin.js'; -import BSPrinterSetting from '../UtillComponents/BSPrinterSetting.jsx'; import { isMobile } from 'react-device-detect'; import { FaDisplay } from 'react-icons/fa6'; import { @@ -48,94 +59,109 @@ const BSPrinterSetting = lazy( ); const subDirectory = import.meta.env.ENV_BASE_URL; const commonUrl = import.meta.env.ENV_COMMON_BASE_URL; -const BSC1NavBar = (props) => { +const MemoTiLocation = React.memo(() => ( + +)); +const BSC1NavBar = () => { const divRef = useRef(null); const navigate = useNavigate(); const dispatch = useDispatch(); - const AppId = props?.SessionData?.AppId; - const CompId = props?.SessionData?.CompId; - const BranchId = props?.SessionData?.BranchId; - const UserId = props?.SessionData?.UserId; - const UserType = props?.SessionData?.UserType; - const [formattedDate, setFormattedDate] = useState(''); + const AppId = getSession('AppId'); + const CompId = getSession('CompId'); + const BranchId = getSession('BranchId'); + const UserId = getSession('UserId'); + const UserType = getSession('UserType'); + const [isAccOpen, setAccIsOpen] = useState(false); const [menu, setMenu] = useState(false); - const [branchName, setBranchName] = useState('Guest'); - const [BranchCity, setBranchCity] = useState(); - const CompBranchData = useSelector(GlobalCompBranchData); + const [branchData, setBranchData] = useState({ + branchName: 'Guest', + city: '', + }); + const FeatureAddonData = useSelector(GlobalFeatAddOnData); const preferenceDatas = useSelector(PreferenceData); const [isFullscreen, setIsFullscreen] = useState(false); // const [FeatureAddonData, setFeatureAddonData] = useState([]); const userProfileData = useSelector(userDataByUserId); - console.log('userProfileData', userProfileData); - const handleHome = () => { - navigate(`${subDirectory}app-page/home`); - }; - const ScanLayoutScreen = preferenceDatas?.[0]?.SettingDtlDetails?.find( - (item) => item.SettingIdName === 'ScanLayout' + const handleHome = useCallback(() => { + navigate(`${subDirectory}app-page/home`); + }, []); + + const ScanLayoutScreen = useMemo( + () => + preferenceDatas?.[0]?.SettingDtlDetails?.find( + (item) => item.SettingIdName === 'ScanLayout' + ), + [preferenceDatas] ); useEffect(() => { - const d = new Date(); - const options = { weekday: 'short', day: '2-digit', month: 'long' }; - const formatted = d.toLocaleDateString('en-GB', options); - setFormattedDate(formatted); + console.log( + 'ScanLayoutScreen?.SettingValue:', + ScanLayoutScreen?.SettingValue + ); + }, [ScanLayoutScreen?.SettingValue]); + + useEffect(() => { fetchBranchDetailData(); fetchBranchData(); - // if (UserType !== 'Super Admin' && UserType !== 'Super Admin User') { - // getFeatureAddonData(); - // } - }, []); - const fetchBranchDetailData = async () => { - const response = await dispatch( - getBranchDetail({ BrId: BranchId }) - ).unwrap(); - if (response?.data?.statusCode === 1) { - setBranchName(response?.data?.data?.[0]?.BrName); - setBranchCity(response?.data?.data?.[0]?.City); - } - }; - const fetchBranchData = async () => { - if (UserType === 'Super Admin' || UserType === 'Super Admin User') { - await dispatch( - getCompBranchData({ CompId: CompId, AppId: AppId }) - ).unwrap(); - } else if (UserType === 'Admin' || UserType === 'Admin User') { - await dispatch( - getCompBranchData({ AppId: AppId, UserId: UserId, CompId: CompId }) + }, [BranchId, UserType]); + const fetchBranchDetailData = useCallback(async () => { + try { + const response = await dispatch( + getBranchDetail({ BrId: BranchId }) ).unwrap(); + if (response?.data?.statusCode === 1) { + setBranchData({ + branchName: response?.data?.data?.[0]?.BrName, + city: response?.data?.data?.[0]?.City, + }); + } + } catch (error) { + console.error('Failed to fetch branch details:', error); } - }; + }, [BranchId]); - const UserAcc = () => { + const fetchBranchData = useCallback(async () => { + try { + if (UserType === 'Super Admin' || UserType === 'Super Admin User') { + await dispatch( + getCompBranchData({ CompId: CompId, AppId: AppId }) + ).unwrap(); + } else if (UserType === 'Admin' || UserType === 'Admin User') { + await dispatch( + getCompBranchData({ AppId: AppId, UserId: UserId, CompId: CompId }) + ).unwrap(); + } + } catch (error) { + console.error('Failed to fetch branch data:', error); + } + }, [UserType, CompId, AppId, UserId]); + + const UserAcc = useCallback(() => { setAccIsOpen(!isAccOpen); - }; - const BacktoLogin = () => { + }, [isAccOpen]); + + const BacktoLogin = useCallback(() => { clearSession('BranchId'); navigate(`${subDirectory}app-page/branch-login`); - }; + }, []); - // const Logout = () =>{ - // closeCustomerDisplayWindow() - // clearSession() - // window.location.replace(commonUrl); - - // } - //mohan - const Logout = async () => { - const status = 'N'; // replace with your actual status + const Logout = useCallback(async () => { + const status = 'N'; const res = await dispatch(GenerateLogout({ UserId, status })).unwrap(); if (res?.data?.statusCode === 1) { clearSession(); await sessionStore('Mode', 'Logout'); window.location.replace(commonUrl); } - }; - const openNewTab = async () => { + }, [UserId, dispatch]); + + const openNewTab = useCallback(async () => { const initialData = { Paymentgateway: false }; let screenDetails; @@ -147,7 +173,6 @@ const BSC1NavBar = (props) => { } } - // Select second monitor if available, otherwise use primary screen const secondScreen = screenDetails?.screens.find( (screen) => screen !== screenDetails.currentScreen ); @@ -161,10 +186,8 @@ const BSC1NavBar = (props) => { if (customerDisplayWindow && !customerDisplayWindow.closed) { setCustomerDisplayWindow(customerDisplayWindow); - customerDisplayWindow.onload = () => { setTimeout(() => { - // Ensure it moves & resizes correctly customerDisplayWindow.moveTo( targetScreen.left || 0, targetScreen.top || 0 @@ -173,26 +196,24 @@ const BSC1NavBar = (props) => { targetScreen.width, targetScreen.height ); - - // Try fullscreen (Needs user interaction) try { customerDisplayWindow.document.documentElement.requestFullscreen(); } catch (err) { console.warn('Fullscreen request failed:', err); } - - // Send initial data customerDisplayWindow.postMessage(initialData, '*'); }, 500); }; } else { console.error('Customer display window failed to open.'); } - }; - const handleEditProfile = async () => { + }, [subDirectory]); + + const handleEditProfile = useCallback(async () => { navigate(`${subDirectory}app-page/redirect-userprofile`); - }; - const handleFullscreen = async () => { + }, [subDirectory]); + + const handleFullscreen = useCallback(async () => { if (!isFullscreen) { try { await document.documentElement.requestFullscreen(); @@ -210,8 +231,7 @@ const BSC1NavBar = (props) => { console.error('Exit fullscreen error:', error); } } - }; - + }, [isFullscreen]); return ( Loading...}> <> @@ -279,17 +299,17 @@ const BSC1NavBar = (props) => {
{/* */} - + - {branchName} + {branchData.branchName} {' '} - {BranchCity && ( + {branchData.city && ( {' '} - + - {BranchCity} + {branchData.city} {' '} )} @@ -362,7 +382,6 @@ const BSC1NavBar = (props) => { import('../BookingFunctionality/FeaturesFunctionalities') ); import { isMobile } from 'react-device-detect'; -import BarcodeScanner from '../UtillComponents/BarcodeScanner.jsx'; import { getTemplateData, StoredSessionData, } from '../../../../Features/ThemeChange/ThemeChange.js'; import { v4 as uuidv4 } from 'uuid'; -import BSNavBarWeightScale from '../UtillComponents/BSNavBarWeightScale.jsx'; import { changeFreeProductForLoyalty, ChangeFreeProductList, @@ -4859,25 +4857,6 @@ export default function BSC1Search(props) {
- {/* {isMobile && screenWidth <= 768 && ( - - {openScanner && ( - - )} - - )} */} ); diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx index c7a2d04..bc7ef82 100644 --- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx +++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavBarUserInfo.jsx @@ -11,7 +11,7 @@ import { useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; const UserRelieveManager = lazy(() => import('../../Template/RealivingUser')); // Scss -import "../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss" +import '../../../../Styles/BookingScreen/Components/BSNavbar/BSNavbar1.scss'; const subDirectory = import.meta.env.ENV_BASE_URL; const BSNavBarUserInfo = ({ diff --git a/src/Pages/BookingScreen/Components/UtillComponents/BSScanTemplate.jsx b/src/Pages/BookingScreen/Components/UtillComponents/BSScanTemplate.jsx index a024e1f..8df5e09 100644 --- a/src/Pages/BookingScreen/Components/UtillComponents/BSScanTemplate.jsx +++ b/src/Pages/BookingScreen/Components/UtillComponents/BSScanTemplate.jsx @@ -1,92 +1,83 @@ -import { BsUpcScan } from "react-icons/bs"; -import { FiLayout } from "react-icons/fi"; +import { BsUpcScan } from 'react-icons/bs'; +import { FiLayout } from 'react-icons/fi'; import { - changeScanTemplate, changetemplateData, getTemplate, + changeScanTemplate, + changetemplateData, + getTemplate, getTemplateData, GlobalCustThemeData, GlobalPricingAppPricingName, GlobalScanTemplate, - StoredSessionData -} from "../../../../Features/ThemeChange/ThemeChange"; -import { useSelector, useDispatch } from "react-redux"; -import { GlobalFeatAddOnData } from "../../../../Features/BookingScreen/BookingData/BookingData"; -import { useEffect, useState } from "react"; -import { Switch } from "antd"; + StoredSessionData, +} from '../../../../Features/ThemeChange/ThemeChange'; +import { useSelector, useDispatch } from 'react-redux'; +import { GlobalFeatAddOnData } from '../../../../Features/BookingScreen/BookingData/BookingData'; +import { useCallback, useEffect, useMemo, useState } from 'react'; +import { Switch } from 'antd'; const BSScanTemplate = () => { - const dispatch = useDispatch(); - const Scantemplatedata = useSelector(GlobalScanTemplate) + const Scantemplatedata = useSelector(GlobalScanTemplate); const PricingAppPricingName = useSelector(GlobalPricingAppPricingName); const FeatureAddonData = useSelector(GlobalFeatAddOnData); const selectedtemplateData = useSelector(getTemplateData); - console.log(Scantemplatedata, "Scantemplatedata") + console.log(Scantemplatedata, 'Scantemplatedata'); const SessionData = useSelector(StoredSessionData); - const custselectedtemplate = useSelector(GlobalCustThemeData) - console.log(custselectedtemplate, "custselectedtemplate") + const custselectedtemplate = useSelector(GlobalCustThemeData); + console.log(custselectedtemplate, 'custselectedtemplate'); const AppId = SessionData?.AppId; const CompId = SessionData?.CompId; const BranchId = SessionData?.BranchId; const UserId = SessionData?.UserId; - - const initialChecked = (selectedtemplateData?.BookingLayout?.[0] !== 'Combo1' && - selectedtemplateData?.BookingLayout?.[0] !== 'Combo2') - ? !!Scantemplatedata?.Scantemplate - : false; - - - const ChangeScanLayoutfun = async () => { - let templatedata = { BookingLayout: [ 'Combo1', [ { - "TemplateOptionsId": 98930, - "OptionId": 70, - "OptionName": "Navbar" + TemplateOptionsId: 98930, + OptionId: 70, + OptionName: 'Navbar', }, { - "TemplateOptionsId": 98931, - "OptionId": 71, - "OptionName": "Billing" - } + TemplateOptionsId: 98931, + OptionId: 71, + OptionName: 'Billing', + }, ], ], BookingCombo1: [ 'Combo1Navbar1', [ { - "TemplateOptionsId": 98932, - "OptionId": 145, - "OptionName": "RePrint" + TemplateOptionsId: 98932, + OptionId: 145, + OptionName: 'RePrint', }, { - "TemplateOptionsId": 98933, - "OptionId": 148, - "OptionName": "TakeAway" + TemplateOptionsId: 98933, + OptionId: 148, + OptionName: 'TakeAway', }, { - "TemplateOptionsId": 98934, - "OptionId": 150, - "OptionName": "ExtraCharge" + TemplateOptionsId: 98934, + OptionId: 150, + OptionName: 'ExtraCharge', }, { - "TemplateOptionsId": 98935, - "OptionId": 146, - "OptionName": "QuickAdd" + TemplateOptionsId: 98935, + OptionId: 146, + OptionName: 'QuickAdd', }, { - "TemplateOptionsId": 98936, - "OptionId": 149, - "OptionName": "Offer" - } + TemplateOptionsId: 98936, + OptionId: 149, + OptionName: 'Offer', + }, ], ], - BookingBilling: [ 'Billing3', [ @@ -140,28 +131,38 @@ const BSScanTemplate = () => { ], }; if (Scantemplatedata?.Scantemplate) { - await dispatch(changeScanTemplate({ Scantemplate: false, changetemp: 'Layout', Template: {} })) - + await dispatch( + changeScanTemplate({ + Scantemplate: false, + changetemp: 'Layout', + Template: {}, + }) + ); } else { - await dispatch(changeScanTemplate({ Scantemplate: true, changetemp: 'Combo', Template: templatedata })) + await dispatch( + changeScanTemplate({ + Scantemplate: true, + changetemp: 'Combo', + Template: templatedata, + }) + ); } - - } + }; const fetchData = async (Plan) => { - const templateResponse = await dispatch(getTemplate({ CompId, BranchId, AppId })).unwrap(); + const templateResponse = await dispatch( + getTemplate({ CompId, BranchId, AppId }) + ).unwrap(); if ( !templateResponse?.data?.data || templateResponse.data.data.length === 0 ) { // If no template data, call Professional('Advance') Professional(Plan); - } - else { + } else { } // Check if template data is empty or not - }; const ChangeCardLayoutfun = async () => { @@ -339,10 +340,23 @@ const BSScanTemplate = () => { ], }; - if (custselectedtemplate == "Combo1" || custselectedtemplate == "Combo1") { - await dispatch(changeScanTemplate({ Scantemplate: false, changetemp: 'Layout', Template: tempdata, OldTemp: custselectedtemplate })) + if (custselectedtemplate == 'Combo1' || custselectedtemplate == 'Combo1') { + await dispatch( + changeScanTemplate({ + Scantemplate: false, + changetemp: 'Layout', + Template: tempdata, + OldTemp: custselectedtemplate, + }) + ); } else { - await dispatch(changeScanTemplate({ Scantemplate: false, changetemp: 'Layout', Template: {} })) + await dispatch( + changeScanTemplate({ + Scantemplate: false, + changetemp: 'Layout', + Template: {}, + }) + ); const Advance = PricingAppPricingName?.some( (item) => item.PricingName === 'Premium' ); @@ -350,7 +364,8 @@ const BSScanTemplate = () => { (item) => item.PricingName === 'Pro' ); const hasCustomizedTemplate = FeatureAddonData?.FeatureDtls?.some( - (item) => item?.FeatureAddonName?.toLowerCase() === 'customized template' + (item) => + item?.FeatureAddonName?.toLowerCase() === 'customized template' ); if (PricingAppPricingName?.length > 0) { if (Advance) { @@ -361,7 +376,7 @@ const BSScanTemplate = () => { fetchData(); } else { Professional('Pro'); - setIsmounted(false) + setIsmounted(false); } } else { if (hasCustomizedTemplate) { @@ -373,8 +388,7 @@ const BSScanTemplate = () => { } } } - - } + }; const Professional = async (data) => { const tempData = { SelectedApplication: AppId, @@ -384,57 +398,22 @@ const BSScanTemplate = () => { dispatch(changetemplateData(tempData)); }; - - const handleToggle = (checked) => { + const handleToggle = useCallback(() => { // Call the appropriate function - if (selectedtemplateData?.BookingLayout?.[0] === 'Combo1' || - selectedtemplateData?.BookingLayout?.[0] === 'Combo2') { + if ( + selectedtemplateData?.BookingLayout?.[0] === 'Combo1' || + selectedtemplateData?.BookingLayout?.[0] === 'Combo2' + ) { ChangeCardLayoutfun(); } else { ChangeScanLayoutfun(); } - }; - const toggleLabe = Scantemplatedata?.Scantemplate ? "Scan" : "Card"; - - - console.log(Scantemplatedata?.Scantemplate, 'Scantemplatedata', toggleLabe); - + }, [selectedtemplateData]); + const toggleLabe = useMemo(() => { + return Scantemplatedata?.Scantemplate ? 'Scan' : 'Card'; + }, [Scantemplatedata]); return ( - // <> - // {(selectedtemplateData?.BookingLayout?.[0] == 'Combo1' || - // selectedtemplateData?.BookingLayout?.[0] == 'Combo2') ? - //
ChangeCardLayoutfun()}> - // - //
- // : - //
ChangeScanLayoutfun()}> - - // - //
- // } - - // {/* */} - // <>
{ />
- ) - -} -export default BSScanTemplate \ No newline at end of file + ); +}; +export default BSScanTemplate; diff --git a/src/Pages/BookingScreen/Template/BSLayout3/BSLayout3.jsx b/src/Pages/BookingScreen/Template/BSLayout3/BSLayout3.jsx index 6a1abe8..7b4a229 100644 --- a/src/Pages/BookingScreen/Template/BSLayout3/BSLayout3.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout3/BSLayout3.jsx @@ -160,6 +160,7 @@ const BSLayout3 = () => { const BookingCard = BSLayout3Data?.BookingCard; const BookingBilling = BSLayout3Data?.BookingBilling?.[0]; const animations = ['example1', 'example2', 'example3']; + const [count, setcount] = useState(0); let ss = animations[count]; const DineInAccess = useMemo(() => { return SettingDataSelector?.[0]?.SettingDtlDetails.filter( diff --git a/src/Pages/BookingScreen/Template/BSLayout5/BSLayout5.jsx b/src/Pages/BookingScreen/Template/BSLayout5/BSLayout5.jsx index 86d2efc..d404482 100644 --- a/src/Pages/BookingScreen/Template/BSLayout5/BSLayout5.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout5/BSLayout5.jsx @@ -124,6 +124,7 @@ const BSLayout5 = () => { const OrderStatus = useSelector(GlobalOrderStatus); const SessionData = useSelector(StoredSessionData); const badgeCount = useSelector(globalKioskSalesCount); + const [count, setcount] = useState(0); const BookingStatus = useSelector(GlobalBookingStatus); const tableData = useSelector(GlobalOrderCardDetails); const CheckBookingStatus = diff --git a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx index 3c44547..138c63c 100644 --- a/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx +++ b/src/Pages/BookingScreen/Template/BSLayout7/BSCombo1.jsx @@ -1,4 +1,11 @@ -import React, { useEffect, useState, useCallback, lazy, Suspense } from 'react'; +import React, { + useEffect, + useState, + useCallback, + lazy, + Suspense, + useMemo, +} from 'react'; import { useDispatch, useSelector } from 'react-redux'; import moment from 'moment'; import { Tooltip, Badge, Popconfirm } from 'antd'; @@ -120,6 +127,7 @@ import PlanExpireNotification from '../PlanExpireNotification.jsx'; const subDirectory = import.meta.env.BASE_URL; const commonDirectory = import.meta.env.COMMON_BASE_URL; +const MemoGiBasket = React.memo(GiBasket); export default function BSCombo1() { const dispatch = useDispatch(); @@ -140,6 +148,7 @@ export default function BSCombo1() { const AppExpDate = useSelector(GlobalAppExpDateData); const PricingAppPricingName = useSelector(GlobalPricingAppPricingName); const appPreferences = useSelector(ApplicationPreferences); + const [isAltPressed, setIsAltPressed] = useState(false); const commonModulePreference = appPreferences?.find( (preference) => preference?.PreferredCatName === 'Common Module' )?.PreferenceCatDetails; @@ -159,6 +168,7 @@ export default function BSCombo1() { // const [AppExpDate, setAppExpDate] = useState(0); const [Kioskopen, setKioskopen] = useState(false); + const [count, setcount] = useState(0); const [messageType, setMessageType] = useState(null); const [messageData, setMessageData] = useState(null); const [multiple, setMultiple] = useState(false); @@ -332,6 +342,24 @@ export default function BSCombo1() { await dispatch(changeCombosearch(false)); } }; + const fill = useMemo( + () => (Comboglobal ? '#52C41A' : '#1292EE'), + [Comboglobal] + ); + const enableBackground = useMemo( + () => (Comboglobal ? '#1292EE' : '#52C41A'), + [Comboglobal] + ); + const basketStyle = useMemo( + () => ({ + pointerEvents: OrderType === 'Failed' ? 'none' : 'auto', + cursor: 'pointer', + }), + [OrderType] + ); + const handleClickMemo = useCallback(() => { + handleClick(); + }, []); return ( Loading...}> <> @@ -351,7 +379,7 @@ export default function BSCombo1() { {/* Combo Container */}
- +
{/* Multiple search */} @@ -538,17 +566,11 @@ export default function BSCombo1() { title="Combo Product" isMobile={isMobile} > -
diff --git a/src/Pages/BookingScreen/Template/BranchName.jsx b/src/Pages/BookingScreen/Template/BranchName.jsx index 98c2344..0ec15ca 100644 --- a/src/Pages/BookingScreen/Template/BranchName.jsx +++ b/src/Pages/BookingScreen/Template/BranchName.jsx @@ -105,6 +105,8 @@ const BranchName = ({ IconStatus }) => { textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: '100%', + fontFamily: 'Poppins', + fontWeight: '500', }} > {branchName} diff --git a/src/ProtectedRoutes.jsx b/src/ProtectedRoutes.jsx index 9b67df7..82a9e61 100644 --- a/src/ProtectedRoutes.jsx +++ b/src/ProtectedRoutes.jsx @@ -24,6 +24,12 @@ const commonUrl = import.meta.env.ENV_COMMON_BASE_URL; const subDirectory = import.meta.env.BASE_URL; const ProtectedRoutes = ({ routesConfig }) => { + + useTemplate( + getSession('CompId'), + getSession('BranchId'), + getSession('AppId') + ); const navigate = useNavigate(); const dispatch = useDispatch(); const UserType = getSession('UserType'); diff --git a/src/utils/useTemplate.js b/src/utils/useTemplate.js index 4a321ee..5bb25ad 100644 --- a/src/utils/useTemplate.js +++ b/src/utils/useTemplate.js @@ -3,6 +3,7 @@ import { useDispatch } from 'react-redux'; import { getTemplate } from '../Features/ThemeChange/ThemeChange.js'; export const useTemplate = (CompId, BranchId, AppId) => { + const dispatch = useDispatch(); useEffect(() => { @@ -14,5 +15,5 @@ export const useTemplate = (CompId, BranchId, AppId) => { } }; fetchTemplate(); - }, [dispatch, CompId, BranchId, AppId]); + }, [ CompId, BranchId, AppId]); };