diff --git a/src/Components/Menu/PozoMenu.jsx b/src/Components/Menu/PozoMenu.jsx index fa56b0d..0290a11 100644 --- a/src/Components/Menu/PozoMenu.jsx +++ b/src/Components/Menu/PozoMenu.jsx @@ -2,12 +2,14 @@ import { useState, useRef, useEffect } from 'react'; import { FaCaretRight } from "react-icons/fa"; import './PozoMenu.scss'; +import { getSession, sessionStore } from '../../Services/Others'; const PozoMenu = ({ items = [], mode = "vertical", style = {}, onClick, collapse = false, selectedKey: propSelectedKey, isBottomMenu = false }) => { const [openKeys, setOpenKeys] = useState([]); const [selectedKey, setSelectedKey] = useState(''); const [dropdownPositions, setDropdownPositions] = useState({}); const [isMobile, setIsMobile] = useState(window.innerWidth <= 768); + const BranchId = getSession("BranchId"); const menuRef = useRef(); // Update selected key when prop changes @@ -203,6 +205,11 @@ const PozoMenu = ({ items = [], mode = "vertical", style = {}, onClick, collapse // Handle menu item click const handleMenuClick = (item, event, parentKeys = []) => { + if (item?.label === "Branch Signin") { + if (BranchId) { + sessionStorage.removeItem("BranchId") + } + } event.stopPropagation(); if (item.children && item.children.length > 0) { @@ -368,7 +375,7 @@ const PozoMenu = ({ items = [], mode = "vertical", style = {}, onClick, collapse } return defaultTop; })(), - left: positions[item.key]?.left + 5 || 0, + left: positions[item.key]?.left + 5 || 0, // width: 220, width: 200, maxHeight: 400, diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx index bd6b9b0..87645b8 100644 --- a/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx @@ -1514,8 +1514,8 @@ const InvoiceTemplate = ({ }} > {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3228,8 +3228,8 @@ const InvoiceTemplate = ({ style={{ textAlign: 'right' }} > {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3265,8 +3265,8 @@ const InvoiceTemplate = ({ style={{ textAlign: 'right' }} > {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx index 5da0f4a..157dbb7 100644 --- a/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx @@ -939,8 +939,8 @@ const PrintA4Style11 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1998,8 +1998,8 @@ const PrintA4Style11 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx index 1e27f96..5aa091a 100644 --- a/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx @@ -912,8 +912,8 @@ const PrintA5Style11 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1887,8 +1887,8 @@ const PrintA5Style11 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx index 2e1c8e3..cc8f6bc 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx @@ -598,9 +598,9 @@ const PrintStyle1 = ({ ? GlobalBilltext : 'Cash' + ' Bill' : BillName || - (PaymentStatusSuccess?.length === 1 - ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' - : ' Bill')} + (PaymentStatusSuccess?.length === 1 + ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' + : ' Bill')} {/* {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode})`} */} @@ -920,7 +920,7 @@ const PrintStyle1 = ({ ); }) : ''} - {(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&& + {(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description) && (
{item.ProductIdentifierDtls?.[0]?.Description}
)} @@ -980,8 +980,8 @@ const PrintStyle1 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1006,7 +1006,7 @@ const PrintStyle1 = ({ {item?.Type !== "C" ? item?.TotalAmt - (item?.OfferAmt ?? 0) - : item?.TotalAmt - (item?.OfferValue ?? 0)} + : item?.TotalAmt - (item?.OfferValue ?? 0)} )} @@ -1218,8 +1218,8 @@ const PrintStyle1 = ({ {' '} {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1244,7 +1244,7 @@ const PrintStyle1 = ({ {item?.Type !== "C" ? item?.TotalAmt - (item?.OfferAmt ?? 0) - : item?.TotalAmt - (item?.OfferValue ?? 0)} + : item?.TotalAmt - (item?.OfferValue ?? 0)} )} @@ -3903,10 +3903,10 @@ const PrintStyle1 = ({ ? GlobalBilltext ? GlobalBilltext : 'Cash' + ' Bill' - : BillName || - (PaymentStatusSuccess?.length === 1 - ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' - : ' Bill')} + : BillName || + (PaymentStatusSuccess?.length === 1 + ? PaymentStatusSuccess?.[0]?.PaymentTypeName + ' Bill' + : ' Bill')} {SalesModePref?.SettingValue == 'Y' && `(${table2Data?.SalesMode})`} @@ -4176,10 +4176,10 @@ const PrintStyle1 = ({ ); }) : ''} - {(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&& - ( -
{item.ProductIdentifierDtls?.[0]?.Description}
- )} + {(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description) && + ( +
{item.ProductIdentifierDtls?.[0]?.Description}
+ )} )} @@ -4235,8 +4235,8 @@ const PrintStyle1 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -4262,7 +4262,7 @@ const PrintStyle1 = ({ {item?.Type !== "C" ? item?.TotalAmt - (item?.OfferAmt ?? 0) - : item?.TotalAmt - (item?.OfferValue ?? 0)} + : item?.TotalAmt - (item?.OfferValue ?? 0)} )} @@ -4454,8 +4454,8 @@ const PrintStyle1 = ({ {' '} {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} @@ -4481,7 +4481,7 @@ const PrintStyle1 = ({ {item?.Type !== "C" ? item?.TotalAmt - (item?.OfferAmt ?? 0) - : item?.TotalAmt - (item?.OfferValue ?? 0)} + : item?.TotalAmt - (item?.OfferValue ?? 0)} )} diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx index b86c3fa..35d6b46 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx @@ -890,8 +890,8 @@ const PrintStyle10 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1186,8 +1186,8 @@ const PrintStyle10 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3500,8 +3500,8 @@ const PrintStyle10 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3757,8 +3757,8 @@ const PrintStyle10 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx index 3a095a5..5fce59c 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx @@ -875,8 +875,8 @@ const PrintStyle11 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1146,8 +1146,8 @@ const PrintStyle11 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3510,8 +3510,8 @@ const PrintStyle11 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3749,8 +3749,8 @@ const PrintStyle11 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx index 94d16a8..fa719c7 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx @@ -1054,8 +1054,8 @@ const Printstyle12 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1273,8 +1273,8 @@ const Printstyle12 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3719,8 +3719,8 @@ const Printstyle12 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3926,8 +3926,8 @@ const Printstyle12 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx index 198c366..db4a9be 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx @@ -942,8 +942,8 @@ const Printstyle2 = ({ > {' '} {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1250,8 +1250,8 @@ const Printstyle2 = ({ > {' '} {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3824,8 +3824,8 @@ const Printstyle2 = ({ > {' '} {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx index 4212984..972b916 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx @@ -428,8 +428,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan {GlobaldummyData ? GlobalRate &&
{item?.Rate}
: Rate &&
{item?.Rate}
} {GlobaldummyData ? GlobalDiscount &&
{item?.discount}
: Discount &&
{item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)}
+ ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} } {GlobaldummyData ? GlobalTax &&
{item?.ProdTaxPercentage || 0}
: (Tax == true && table2Data?.OrderType !== 'E') && (
{item?.ProdTaxPercentage || 0}
)} {GlobaldummyData ? GlobalAmount &&
{item?.TotalAmt}
: Amount &&
@@ -476,8 +476,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan {GlobaldummyData ? GlobalQuantity &&
{item?.SalesQty}
: Quantity &&
{item?.SalesQty}
} {GlobaldummyData ? GlobalRate &&
{item?.Rate}
: Rate &&
{item?.Rate}
} {GlobaldummyData ? GlobalDiscount &&
{item?.discount}
: Discount &&
{item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)}
} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}
} {GlobaldummyData ? GlobalTax &&
{item?.ProdTaxPercentage || 0}
: (Tax == true && table2Data?.OrderType !== 'E') && (
{item?.ProdTaxPercentage || 0}
)} {GlobaldummyData ? GlobalAmount &&
{item?.TotalAmt}
: Amount &&
{item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}
} @@ -1409,8 +1409,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan {GlobaldummyData ? GlobalQuantity &&
{item?.SalesQty}
: Quantity &&
{item?.SalesQty}
} {GlobaldummyData ? GlobalRate &&
{item?.Rate}
: Rate &&
{item?.Rate}
} {GlobaldummyData ? GlobalDiscount &&
{item?.discount}
: Discount &&
{item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)}
} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}} {GlobaldummyData ? GlobalTax &&
{item?.ProdTaxPercentage || 0}
: (Tax == true && table2Data?.OrderType !== 'E') && (
{item?.ProdTaxPercentage || 0}
)} {GlobaldummyData ? GlobalAmount &&
{item?.TotalAmt}
: Amount &&
{item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}
} @@ -1455,8 +1455,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan {GlobaldummyData ? GlobalRate &&
{item?.Rate}
: Rate &&
{item?.Rate}
} {GlobaldummyData ? GlobalDiscount &&
{item?.discount}
: Discount &&
{item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}
} {GlobaldummyData ? GlobalTax &&
{item?.ProdTaxPercentage || 0}
: (Tax == true && table2Data?.OrderType !== 'E') && (
{item?.ProdTaxPercentage || 0}
)} {GlobaldummyData ? GlobalAmount &&
{item?.TotalAmt}
: Amount &&
{item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}
} diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx index 415d771..efe3d1d 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx @@ -966,9 +966,9 @@ const Printstyle4 = ({ : Discount) && ( {item?.Type !== 'C' - ? item?.OfferAmt || item?.DiscountAmt || 0 + ? item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0 : item?.OfferValue || - item?.DiscountAmt || + (item?.DiscountAmt / item?.SalesQty) || 0} )} @@ -1274,10 +1274,10 @@ const Printstyle4 = ({ {item?.Type !== 'C' ? item?.OfferAmt || - item?.DiscountAmt || + (item?.DiscountAmt / item?.SalesQty) || 0 : item?.OfferValue || - item?.DiscountAmt || + (item?.DiscountAmt / item?.SalesQty) || 0} )} @@ -3865,9 +3865,9 @@ const Printstyle4 = ({ : Discount && ( {item?.Type !== 'C' - ? item?.OfferAmt || item?.DiscountAmt || 0 + ? item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0 : item?.OfferValue || - item?.DiscountAmt || + (item?.DiscountAmt / item?.SalesQty) || 0} )} @@ -4151,9 +4151,9 @@ const Printstyle4 = ({ : Discount && ( {item?.Type !== 'C' - ? item?.OfferAmt || item?.DiscountAmt || 0 + ? item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0 : item?.OfferValue || - item?.DiscountAmt || + (item?.DiscountAmt / item?.SalesQty) || 0} )} diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx index 3eddc2b..888cb09 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx @@ -956,8 +956,8 @@ const PrintStyle5 = ({ style={{ width: '100%', textAlign: 'right' }} > {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1279,8 +1279,8 @@ const PrintStyle5 = ({ style={{ width: '100%', textAlign: 'right' }} > {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3273,8 +3273,8 @@ const PrintStyle5 = ({ : Discount && (
{item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}
)} {GlobaldummyData @@ -3564,8 +3564,8 @@ const PrintStyle5 = ({ : Discount && (
{item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}
)} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx index 20906fe..433e93c 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx @@ -965,8 +965,8 @@ const Printstyle6 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1013,7 +1013,7 @@ const Printstyle6 = ({ }} > {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} @@ -1352,8 +1352,8 @@ const Printstyle6 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1400,7 +1400,7 @@ const Printstyle6 = ({ }} > {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} @@ -3781,8 +3781,8 @@ const Printstyle6 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3829,7 +3829,7 @@ const Printstyle6 = ({ }} > {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} @@ -4098,8 +4098,8 @@ const Printstyle6 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -4146,7 +4146,7 @@ const Printstyle6 = ({ }} > {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx index 1020c5c..e2c9f0e 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx @@ -864,8 +864,8 @@ const PrintStyle7 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -889,7 +889,7 @@ const PrintStyle7 = ({ : Amount == true && ( {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} @@ -1129,8 +1129,8 @@ const PrintStyle7 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1154,7 +1154,7 @@ const PrintStyle7 = ({ : Amount == true && ( {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} @@ -3343,8 +3343,8 @@ const PrintStyle7 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3368,7 +3368,7 @@ const PrintStyle7 = ({ : Amount == true && ( {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} @@ -3582,8 +3582,8 @@ const PrintStyle7 = ({ : Discount == true && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3607,7 +3607,7 @@ const PrintStyle7 = ({ : Amount == true && ( {item?.Type !== 'C' - ? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0) + ? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) : item?.TotalAmt - (item?.OfferValue || 0)} )} diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx index aee8d46..867c4e4 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx @@ -952,8 +952,8 @@ const Printstyle8 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1321,8 +1321,8 @@ const Printstyle8 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3694,8 +3694,8 @@ const Printstyle8 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3973,8 +3973,8 @@ const Printstyle8 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx index 102e926..5305b5c 100644 --- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx +++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx @@ -914,8 +914,8 @@ const PrintStyle9 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -1185,8 +1185,8 @@ const PrintStyle9 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData @@ -3588,8 +3588,8 @@ const PrintStyle9 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} @@ -3824,8 +3824,8 @@ const PrintStyle9 = ({ : Discount && ( {item?.Type !== 'C' - ? (item?.OfferAmt || item?.DiscountAmt || 0) - : (item?.OfferValue || item?.DiscountAmt || 0)} + ? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0) + : (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)} )} {GlobaldummyData diff --git a/src/Pages/DashBoard/RetailDashboard.jsx b/src/Pages/DashBoard/RetailDashboard.jsx index f32fcfd..47fe895 100644 --- a/src/Pages/DashBoard/RetailDashboard.jsx +++ b/src/Pages/DashBoard/RetailDashboard.jsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState, lazy } from 'react'; import { useNavigate, useOutletContext } from 'react-router-dom'; import { shallowEqual, useDispatch } from 'react-redux'; import { useSelector } from 'react-redux'; -import { DatePicker, Tooltip } from 'antd'; +import { DatePicker, message, Tooltip } from 'antd'; import dayjs from 'dayjs'; import '../../Styles/DashBoard/RetailDashBoard.scss'; const GraphChart = lazy(() => import('./Chart/GraphChart')); @@ -128,6 +128,7 @@ const RetailDashboard = () => { const CompId = getSession('CompId'); const BranchId = getSession('BranchId'); + console.log(BranchId, "BranchId") const AppId = getSession('AppId'); const UserId = getSession('UserId'); const UserType = getSession('UserType'); @@ -310,7 +311,7 @@ const RetailDashboard = () => { isMountedRef.current = false; }; }, []); -//sri checkin warehouse condition + //sri checkin warehouse condition useEffect(() => { const checkWarehouseorNot = async (e) => { let data = CompBranchData?.find((a) => a?.BrId == e); @@ -318,10 +319,10 @@ const RetailDashboard = () => { sessionStore("Warhouse", true) await dispatch(changeWarehouse(true)); } - else { - sessionStore("Warehouse", false) - await dispatch(changeWarehouse(false)); - } + else { + sessionStore("Warehouse", false) + await dispatch(changeWarehouse(false)); + } } if (CompBranchData?.length > 0 && BranchId) { checkWarehouseorNot(BranchId) @@ -1652,6 +1653,10 @@ const RetailDashboard = () => {
{ + if (!BranchId) { + message.error("Please log in to a branch first."); + return null + } const hasEmpAccess = EmpData?.find( (item) => item.ConfigName === 'Add Product' && @@ -1687,6 +1692,10 @@ const RetailDashboard = () => { {!isCheckSportsApp && (
{ + if (!BranchId) { + message.error("Please log in to a branch first."); + return null + } const hasEmpAccess = EmpData?.find( (item) => item.ConfigName === 'Product Receipt' && @@ -1715,6 +1724,10 @@ const RetailDashboard = () => { )}
{ + if (!BranchId) { + message.error("Please log in to a branch first."); + return null + } const hasEmpAccess = EmpData?.find( (item) => item.ConfigName === 'Daily Sales' && @@ -1741,6 +1754,10 @@ const RetailDashboard = () => {
{ + if (!BranchId) { + message.error("Please log in to a branch first."); + return null + } const hasEmpAccess = EmpData?.find( (item) => item.ConfigName === 'Sales' && item.ReadAccess === 'Y'