karthikalakshmi
/
Android_Retail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'branchlogin issueand discount print' (#272) from branchloginissueandprint into main 

Reviewed-on: Pozomind/pozo-retail-app#272
This commit is contained in:
karthikalakshmi 2026-03-10 16:51:31 +05:30
parent a9092e27bb b956ffa978
commit e03283b8dd
17 changed files with 163 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Components/Menu/PozoMenu.jsx
View File

@ -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,

12
src/Pages/BookingScreen/PrintTemplates/A4/A4Standard.jsx
View File

@ -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)}
</td>
)}
{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)}
</td>
)}
{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)}
</td>
)}
</tr>

8
src/Pages/BookingScreen/PrintTemplates/A4/PrintA4Style11.jsx
View File

@ -939,8 +939,8 @@ const PrintA4Style11 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1998,8 +1998,8 @@ const PrintA4Style11 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData

8
src/Pages/BookingScreen/PrintTemplates/A4/PrintStyleA5.jsx
View File

@ -912,8 +912,8 @@ const PrintA5Style11 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1887,8 +1887,8 @@ const PrintA5Style11 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData

48
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle1.jsx
View File

@ -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})`} */}
</div>
@ -920,7 +920,7 @@ const PrintStyle1 = ({
);
})
: ''}
{(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&&
{(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description) &&
(
<div>{item.ProductIdentifierDtls?.[0]?.Description}</div>
)}
@ -980,8 +980,8 @@ const PrintStyle1 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1006,7 +1006,7 @@ const PrintStyle1 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>
@ -1218,8 +1218,8 @@ const PrintStyle1 = ({
<td>
{' '}
{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)}
</td>
)}
{GlobaldummyData
@ -1244,7 +1244,7 @@ const PrintStyle1 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>
@ -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})`}
</div>
@ -4176,10 +4176,10 @@ const PrintStyle1 = ({
);
})
: ''}
{(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description)&&
(
<div>{item.ProductIdentifierDtls?.[0]?.Description}</div>
)}
{(item?.ProductIdentifierDtls?.length > 0 && item.ProductIdentifierDtls?.[0]?.Description) &&
(
<div>{item.ProductIdentifierDtls?.[0]?.Description}</div>
)}
</div>
</td>
)}
@ -4235,8 +4235,8 @@ const PrintStyle1 = ({
: Discount == true && (
<td 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)}
</td>
)}
{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)}
</td>
)}
</tr>
@ -4454,8 +4454,8 @@ const PrintStyle1 = ({
<td>
{' '}
{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)}
</td>
)}
@ -4481,7 +4481,7 @@ const PrintStyle1 = ({
<td style={{ textAlign: "right" }}>
{item?.Type !== "C"
? item?.TotalAmt - (item?.OfferAmt ?? 0)
: item?.TotalAmt - (item?.OfferValue ?? 0)}
: item?.TotalAmt - (item?.OfferValue ?? 0)}
</td>
)}
</tr>

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
View File

@ -890,8 +890,8 @@ const PrintStyle10 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1186,8 +1186,8 @@ const PrintStyle10 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3500,8 +3500,8 @@ const PrintStyle10 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3757,8 +3757,8 @@ const PrintStyle10 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle11.jsx
View File

@ -875,8 +875,8 @@ const PrintStyle11 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1146,8 +1146,8 @@ const PrintStyle11 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3510,8 +3510,8 @@ const PrintStyle11 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3749,8 +3749,8 @@ const PrintStyle11 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle12.jsx
View File

@ -1054,8 +1054,8 @@ const Printstyle12 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1273,8 +1273,8 @@ const Printstyle12 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3719,8 +3719,8 @@ const Printstyle12 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3926,8 +3926,8 @@ const Printstyle12 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData

12
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle2.jsx
View File

@ -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)}
</td>
)}
{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)}
</td>
)}
{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)}
</td>
)}
{GlobaldummyData

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle3.jsx
View File

@ -428,8 +428,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>
{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}</div>
? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}</div>
}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} >
@ -476,8 +476,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'right' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}</div>}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}</div>}
</div>
@ -1409,8 +1409,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalQuantity && <div style={{ width: '100%', textAlign: 'center' }}>{item?.SalesQty}</div> : Quantity && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.SalesQty}</div>}
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Type !== 'C'
? (item?.OfferAmt || item?.DiscountAmt || 0)
: (item?.OfferValue || item?.DiscountAmt || 0)}</div>}
? (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: (item?.OfferValue || (item?.DiscountAmt / item?.SalesQty) || 0)}</div>}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}</div>}
</div>
@ -1455,8 +1455,8 @@ const PrintStyle3 = ({ index, totalQuantityFilter, Date1, CashierName, totalQuan
{GlobaldummyData ? GlobalRate && <div style={{ width: '100%', textAlign: 'right' }}>{item?.Rate}</div> : Rate && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.Rate}</div>}
{GlobaldummyData ? GlobalDiscount && <div style={{ width: '100%', textAlign: 'right' }}>{item?.discount}</div> : Discount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>
{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)}
</div>}
{GlobaldummyData ? GlobalTax && <div style={{ width: '100%', textAlign: 'right' }}>{item?.ProdTaxPercentage || 0}</div> : (Tax == true && table2Data?.OrderType !== 'E') && (<div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }}>{item?.ProdTaxPercentage || 0}</div>)}
{GlobaldummyData ? GlobalAmount && <div style={{ width: '100%', textAlign: 'right' }} >{item?.TotalAmt}</div> : Amount && <div style={{ width: '100%', textAlign: 'right', fontWeight: 600 }} > {item?.Type !== 'C' ? item?.TotalAmt - (item?.OfferAmt || 0) : item?.TotalAmt - (item?.OfferValue || 0)}</div>}

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle4.jsx
View File

@ -966,9 +966,9 @@ const Printstyle4 = ({
: Discount) && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.OfferAmt || item?.DiscountAmt || 0
? item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0
: item?.OfferValue ||
item?.DiscountAmt ||
(item?.DiscountAmt / item?.SalesQty) ||
0}
</td>
)}
@ -1274,10 +1274,10 @@ const Printstyle4 = ({
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.OfferAmt ||
item?.DiscountAmt ||
(item?.DiscountAmt / item?.SalesQty) ||
0
: item?.OfferValue ||
item?.DiscountAmt ||
(item?.DiscountAmt / item?.SalesQty) ||
0}
</td>
)}
@ -3865,9 +3865,9 @@ const Printstyle4 = ({
: Discount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.OfferAmt || item?.DiscountAmt || 0
? item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0
: item?.OfferValue ||
item?.DiscountAmt ||
(item?.DiscountAmt / item?.SalesQty) ||
0}
</td>
)}
@ -4151,9 +4151,9 @@ const Printstyle4 = ({
: Discount && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.OfferAmt || item?.DiscountAmt || 0
? item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0
: item?.OfferValue ||
item?.DiscountAmt ||
(item?.DiscountAmt / item?.SalesQty) ||
0}
</td>
)}

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle5.jsx
View File

@ -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)}
</div>
)}
{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)}
</div>
)}
{GlobaldummyData
@ -3273,8 +3273,8 @@ const PrintStyle5 = ({
: Discount && (
<div 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)}
</div>
)}
{GlobaldummyData
@ -3564,8 +3564,8 @@ const PrintStyle5 = ({
: Discount && (
<div 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)}
</div>
)}
{GlobaldummyData

24
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle6.jsx
View File

@ -965,8 +965,8 @@ const Printstyle6 = ({
: Discount && (
<td 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)}
</td>
)}
{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)}
</td>
)}
@ -1352,8 +1352,8 @@ const Printstyle6 = ({
: Discount && (
<td 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)}
</td>
)}
{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)}
</td>
)}
@ -3781,8 +3781,8 @@ const Printstyle6 = ({
: Discount && (
<td 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)}
</td>
)}
{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)}
</td>
)}
@ -4098,8 +4098,8 @@ const Printstyle6 = ({
: Discount && (
<td 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)}
</td>
)}
{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)}
</td>
)}

24
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle7.jsx
View File

@ -864,8 +864,8 @@ const PrintStyle7 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -889,7 +889,7 @@ const PrintStyle7 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
@ -1129,8 +1129,8 @@ const PrintStyle7 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1154,7 +1154,7 @@ const PrintStyle7 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
@ -3343,8 +3343,8 @@ const PrintStyle7 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3368,7 +3368,7 @@ const PrintStyle7 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}
@ -3582,8 +3582,8 @@ const PrintStyle7 = ({
: Discount == true && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3607,7 +3607,7 @@ const PrintStyle7 = ({
: Amount == true && (
<td style={{ textAlign: 'right' }}>
{item?.Type !== 'C'
? item?.TotalAmt - (item?.OfferAmt || item?.DiscountAmt || 0)
? item?.TotalAmt - (item?.OfferAmt || (item?.DiscountAmt / item?.SalesQty) || 0)
: item?.TotalAmt - (item?.OfferValue || 0)}
</td>
)}

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle8.jsx
View File

@ -952,8 +952,8 @@ const Printstyle8 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1321,8 +1321,8 @@ const Printstyle8 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3694,8 +3694,8 @@ const Printstyle8 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3973,8 +3973,8 @@ const Printstyle8 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData

16
src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle9.jsx
View File

@ -914,8 +914,8 @@ const PrintStyle9 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -1185,8 +1185,8 @@ const PrintStyle9 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData
@ -3588,8 +3588,8 @@ const PrintStyle9 = ({
: Discount && (
<td 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)}
</td>
)}
@ -3824,8 +3824,8 @@ const PrintStyle9 = ({
: Discount && (
<td 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)}
</td>
)}
{GlobaldummyData

29
src/Pages/DashBoard/RetailDashboard.jsx
View File

@ -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 = () => {
<div className="quickActionsRow">
<div
onClick={() => {
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 && (
<div
onClick={() => {
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 = () => {
)}
<div
onClick={() => {
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 = () => {
<div
className="quickActionBox"
onClick={() => {
if (!BranchId) {
message.error("Please log in to a branch first.");
return null
}
const hasEmpAccess = EmpData?.find(
(item) =>
item.ConfigName === 'Sales' && item.ReadAccess === 'Y'