fixed conflicts
This commit is contained in:
parent
ac6172cdb4
commit
15bb895eeb
|
|
@ -2100,40 +2100,6 @@ const BSItemCard = (props) => {
|
||||||
setMessageType('warning');
|
setMessageType('warning');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else if (itemWiseLimitPreferenece) {
|
|
||||||
|
|
||||||
const inwardQtyMap = CartOrderDetails.reduce((acc, curr) => {
|
|
||||||
const inwardId = curr?.InwardDtlId;
|
|
||||||
const qty = Number(curr?.OrderQty) || 0;
|
|
||||||
|
|
||||||
if (acc[inwardId]) {
|
|
||||||
acc[inwardId] += qty;
|
|
||||||
} else {
|
|
||||||
acc[inwardId] = qty;
|
|
||||||
}
|
|
||||||
|
|
||||||
return acc;
|
|
||||||
}, {});
|
|
||||||
|
|
||||||
const currentInwardId = item?.InwardDtlId;
|
|
||||||
const addQty = Qty || 1;
|
|
||||||
|
|
||||||
if (inwardQtyMap[currentInwardId]) {
|
|
||||||
inwardQtyMap[currentInwardId] += addQty;
|
|
||||||
} else {
|
|
||||||
inwardQtyMap[currentInwardId] = addQty;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log("Final InwardDtlId Qty Map:", inwardQtyMap);
|
|
||||||
const isExceeded = Object.values(inwardQtyMap).some(
|
|
||||||
(qty) => qty > maxQtyLimit
|
|
||||||
);
|
|
||||||
|
|
||||||
if (isExceeded) {
|
|
||||||
setMessageData(`Item Quantity Limit Exceeds than ${maxQtyLimit}`);
|
|
||||||
setMessageType('warning');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -6110,14 +6076,17 @@ const BSItemCard = (props) => {
|
||||||
zIndex: '12',
|
zIndex: '12',
|
||||||
top:
|
top:
|
||||||
templateData?.BookingNavbar?.[0] === 'Navbar3' &&
|
templateData?.BookingNavbar?.[0] === 'Navbar3' &&
|
||||||
[
|
templateData?.BookingLayout?.[0] === 'Layout3'
|
||||||
'Layout1',
|
? '1rem'
|
||||||
'Layout2',
|
: templateData?.BookingNavbar?.[0] === 'Navbar3' &&
|
||||||
'Layout3',
|
['Layout1', 'Layout2'].includes(
|
||||||
'Layout4',
|
templateData?.BookingLayout?.[0]
|
||||||
'Layout5',
|
)
|
||||||
'Layout6',
|
? '13px'
|
||||||
].includes(templateData?.BookingLayout?.[0])
|
: templateData?.BookingNavbar?.[0] === 'Navbar3' &&
|
||||||
|
['Layout4', 'Layout5', 'Layout6'].includes(
|
||||||
|
templateData?.BookingLayout?.[0]
|
||||||
|
)
|
||||||
? '4.4rem'
|
? '4.4rem'
|
||||||
: ['Layout4', 'Layout5', 'Layout6'].includes(
|
: ['Layout4', 'Layout5', 'Layout6'].includes(
|
||||||
templateData?.BookingLayout?.[0]
|
templateData?.BookingLayout?.[0]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue