Merge pull request '10qr-auto-quantity' (#13) from 10qr-auto-quantity into main
Reviewed-on: Pozomind/pozo-retail-app#13
This commit is contained in:
commit
9c6c362fa4
|
|
@ -127,6 +127,10 @@ export default function BSC1Search(props) {
|
|||
const [QuickAdd, setQuickAdd] = useState(false);
|
||||
const inputRef = useRef(null);
|
||||
const containerRef = useRef(null);
|
||||
// QR code tracking
|
||||
const [lastScannedQr, setLastScannedQr] = useState(null);
|
||||
|
||||
const [currentSessionQr, setCurrentSessionQr] = useState(null);
|
||||
const focusStatusCustMouse = useSelector(GlobalfocusStatusCustMouse);
|
||||
const CompoPaymentIconStatus = useSelector(GlobalCompoPaymentIconStatus);
|
||||
const CompoPreOrderDtlStatus = useSelector(GlobalCompoPreOrderDtlStatus);
|
||||
|
|
@ -143,6 +147,8 @@ export default function BSC1Search(props) {
|
|||
const [onePeiceFlow, setOnePeiceFlow] = useState(false);
|
||||
const [expQtyModel, setExpQtyModel] = useState(false);
|
||||
const [qtyExpData, setQtyExpData] = useState();
|
||||
console.log('h');
|
||||
|
||||
const PreOrderAdditem = useSelector(GlobalPreOrderAdditem);
|
||||
// const [FeatureAddonData, setFeatureAddonData] = useState([]);
|
||||
const [openScanner, setOpenScanner] = useState(false);
|
||||
|
|
@ -432,6 +438,14 @@ export default function BSC1Search(props) {
|
|||
stopScannerFromParent();
|
||||
};
|
||||
|
||||
|
||||
|
||||
// Clear QR tracker function
|
||||
const clearQrTracker = () => {
|
||||
setLastScannedQr(null);
|
||||
setCurrentSessionQr(null);
|
||||
};
|
||||
|
||||
const ProductNameOnChange = (data) => {
|
||||
if (isSelectingRef.current) {
|
||||
isSelectingRef.current = false;
|
||||
|
|
@ -447,8 +461,22 @@ export default function BSC1Search(props) {
|
|||
}
|
||||
|
||||
await dispatch(changeSearchedData(data));
|
||||
|
||||
// If same QR as current session, just add quantity
|
||||
if (currentSessionQr === data) {
|
||||
if (lastScannedQr) {
|
||||
const updatedProduct = {
|
||||
...lastScannedQr,
|
||||
OrderQty: (lastScannedQr.OrderQty || 1) + 1,
|
||||
Quantity: (lastScannedQr.Quantity || 1) + 1
|
||||
};
|
||||
ProductSelected(updatedProduct);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// 🚀 Dispatch API
|
||||
// 🚀 Call API for new session QR code
|
||||
searchPromiseRef.current = dispatch(
|
||||
getProductsearch({
|
||||
CompId,
|
||||
|
|
@ -467,6 +495,9 @@ export default function BSC1Search(props) {
|
|||
ApiSearchData?.QrBasedSearch === 'Y' ||
|
||||
ApiSearchData?.OnePcQRBased === 'Y'
|
||||
) {
|
||||
setCurrentSessionQr(data);
|
||||
setLastScannedQr(ApiSearchData);
|
||||
|
||||
ProductSelected(ApiSearchData);
|
||||
setQuickAdd(false);
|
||||
} else if (!ApiSearchData.ProdId && ApiSearchData?.AppId == 0) {
|
||||
|
|
@ -954,7 +985,7 @@ export default function BSC1Search(props) {
|
|||
<span
|
||||
style={
|
||||
record.StockCount > 0 ||
|
||||
record.StockCount === 'Stock Not Maintained'
|
||||
record.StockCount === 'Stock Not Maintained'
|
||||
? { color: '#000', cursor: 'pointer' }
|
||||
: { color: '#f49898', cursor: 'not-allowed' }
|
||||
}
|
||||
|
|
@ -984,7 +1015,7 @@ export default function BSC1Search(props) {
|
|||
<span
|
||||
style={
|
||||
record.StockCount > 0 ||
|
||||
record.StockCount === 'Stock Not Maintained'
|
||||
record.StockCount === 'Stock Not Maintained'
|
||||
? { color: '#000', cursor: 'pointer' }
|
||||
: { color: '#f49898', cursor: 'not-allowed' }
|
||||
}
|
||||
|
|
@ -1014,7 +1045,7 @@ export default function BSC1Search(props) {
|
|||
<span
|
||||
style={
|
||||
record.StockCount > 0 ||
|
||||
record.StockCount === 'Stock Not Maintained'
|
||||
record.StockCount === 'Stock Not Maintained'
|
||||
? { color: '#000', cursor: 'pointer' }
|
||||
: { color: '#f49898', cursor: 'not-allowed' }
|
||||
}
|
||||
|
|
@ -1193,11 +1224,11 @@ export default function BSC1Search(props) {
|
|||
StockCount:
|
||||
qtydata?.ProductDetail?.[0]?.StockAvailable === 'Y'
|
||||
? returnVariantStock(
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
|
||||
item?.OverAllQty,
|
||||
CartOrderDetails,
|
||||
item?.ProdVariantName
|
||||
)
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdId,
|
||||
item?.OverAllQty,
|
||||
CartOrderDetails,
|
||||
item?.ProdVariantName
|
||||
)
|
||||
: 'Stock Not Maintained',
|
||||
});
|
||||
});
|
||||
|
|
@ -1213,17 +1244,17 @@ export default function BSC1Search(props) {
|
|||
'Batch No': item?.BatchRef,
|
||||
StockCount: onePeiceFlow
|
||||
? returnCountStock(
|
||||
item?.ProdId,
|
||||
item?.BalanceQty,
|
||||
CartOrderDetails,
|
||||
item?.InwardDtlId
|
||||
) * item?.NoOfPcs
|
||||
item?.ProdId,
|
||||
item?.BalanceQty,
|
||||
CartOrderDetails,
|
||||
item?.InwardDtlId
|
||||
) * item?.NoOfPcs
|
||||
: returnCountStock(
|
||||
item?.ProdId,
|
||||
item?.BalanceQty,
|
||||
CartOrderDetails,
|
||||
item?.InwardDtlId
|
||||
),
|
||||
item?.ProdId,
|
||||
item?.BalanceQty,
|
||||
CartOrderDetails,
|
||||
item?.InwardDtlId
|
||||
),
|
||||
'Stock Date': StockDate(item?.InwardDate),
|
||||
Price: onePeiceFlow ? item?.OnePcsPrice : item?.SellPrice,
|
||||
ExpDate:
|
||||
|
|
@ -1277,13 +1308,13 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
cartItem?.OrderRate ===
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
||||
|
|
@ -1292,9 +1323,9 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
|
@ -1336,11 +1367,11 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[0]?.InwardDtlId &&
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[0]?.InwardDtlId &&
|
||||
cartItem?.OrderRate ===
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[0]?.SellPrice &&
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[0]?.SellPrice &&
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
||||
|
|
@ -1349,9 +1380,9 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === item?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
|
@ -1422,13 +1453,13 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
index.key
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
index.key
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
cartItem?.OrderRate ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
index.key
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
index.key
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
||||
|
|
@ -1436,11 +1467,11 @@ export default function BSC1Search(props) {
|
|||
let Isincartonepc = CartOrderDetails?.filter(
|
||||
(cartItem) =>
|
||||
cartItem?.ProdId ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
|
@ -1497,11 +1528,11 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
|
||||
?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
|
||||
?.StockDetails?.[0]?.InwardDtlId &&
|
||||
cartItem?.OrderRate ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
|
||||
?.StockDetails?.[0]?.SellPrice &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[index.key]
|
||||
?.StockDetails?.[0]?.SellPrice &&
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
||||
|
|
@ -1510,9 +1541,9 @@ export default function BSC1Search(props) {
|
|||
(cartItem) =>
|
||||
cartItem?.ProdId === qtydata?.ProductDetail?.[QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[
|
||||
VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
|
@ -1596,15 +1627,15 @@ export default function BSC1Search(props) {
|
|||
let Isincart = CartOrderDetails?.find(
|
||||
(cartItem) =>
|
||||
cartItem?.ProdId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
cartItem?.OrderRate ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
||||
|
|
@ -1612,11 +1643,11 @@ export default function BSC1Search(props) {
|
|||
let Isincartonepc = CartOrderDetails?.filter(
|
||||
(cartItem) =>
|
||||
cartItem?.ProdId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndexs
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndexs
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
|
@ -1694,15 +1725,15 @@ export default function BSC1Search(props) {
|
|||
let Isincart = CartOrderDetails?.find(
|
||||
(cartItem) =>
|
||||
cartItem?.ProdId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
cartItem?.OrderRate ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.SellPrice &&
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
||||
|
|
@ -1710,11 +1741,11 @@ export default function BSC1Search(props) {
|
|||
let Isincartonepc = CartOrderDetails?.filter(
|
||||
(cartItem) =>
|
||||
cartItem?.ProdId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdId &&
|
||||
cartItem?.InwardDtlId ===
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
qtydata?.ProductDetail?.[item?.QtyIndex]?.ProdVariantDetails?.[
|
||||
item?.VarientIndex
|
||||
]?.StockDetails?.[0]?.InwardDtlId &&
|
||||
// (cartItem?.OrderRate === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice)
|
||||
!cartItem?.SalesId
|
||||
);
|
||||
|
|
@ -1827,7 +1858,7 @@ export default function BSC1Search(props) {
|
|||
const isKgsProduct =
|
||||
(a?.ProductDetail?.[QtyIndex]?.UomName?.toLowerCase() === 'kgs' ||
|
||||
a?.ProductDetail?.[QtyIndex]?.UomName?.toLowerCase() ===
|
||||
'kg'?.toLowerCase()) &&
|
||||
'kg'?.toLowerCase()) &&
|
||||
a?.ProductDetail?.[QtyIndex]?.Size === '1';
|
||||
|
||||
if (
|
||||
|
|
@ -1848,11 +1879,11 @@ export default function BSC1Search(props) {
|
|||
parseFloat(
|
||||
onePcs
|
||||
? (a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice /
|
||||
1000) *
|
||||
(parseFloat(WeightScaleWeight) * 1000)
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice /
|
||||
1000) *
|
||||
(parseFloat(WeightScaleWeight) * 1000)
|
||||
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.SellPrice / 1000
|
||||
?.StockDetails?.[stockIndex]?.SellPrice / 1000
|
||||
) *
|
||||
(parseFloat(WeightScaleWeight) * 1000);
|
||||
let data = {
|
||||
|
|
@ -1908,9 +1939,9 @@ export default function BSC1Search(props) {
|
|||
?.StockDetails?.[stockIndex]?.InwardId,
|
||||
MRP: onePcs
|
||||
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.MRP,
|
||||
?.StockDetails?.[stockIndex]?.MRP,
|
||||
OrderRate: parseFloat(TotalOrderRate).toFixed(2),
|
||||
SellingPrice: parseFloat(TotalOrderRate).toFixed(2),
|
||||
SuppId:
|
||||
|
|
@ -2015,19 +2046,19 @@ export default function BSC1Search(props) {
|
|||
?.StockDetails?.[stockIndex]?.InwardId,
|
||||
MRP: onePcs
|
||||
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.MRP,
|
||||
?.StockDetails?.[stockIndex]?.MRP,
|
||||
OrderRate: onePcs
|
||||
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.SellPrice,
|
||||
?.StockDetails?.[stockIndex]?.SellPrice,
|
||||
SellingPrice: onePcs
|
||||
? a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
?.StockDetails?.[stockIndex]?.OnePcsPrice
|
||||
: a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.SellPrice,
|
||||
?.StockDetails?.[stockIndex]?.SellPrice,
|
||||
SuppId:
|
||||
a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]
|
||||
?.StockDetails?.[stockIndex]?.SuppId,
|
||||
|
|
@ -2247,26 +2278,26 @@ export default function BSC1Search(props) {
|
|||
isItemInCart?.StockAvailable !== '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: (
|
||||
// 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),
|
||||
WithoutTaxRate:
|
||||
(isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate -
|
||||
(
|
||||
((isItemInCart?.OrderQty + 1) *
|
||||
isItemInCart?.OrderRate *
|
||||
isItemInCart?.TaxPercentage) /
|
||||
(100 + isItemInCart?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
};
|
||||
};
|
||||
const UpdatedData = addFirst
|
||||
? [UpdatedCartItem, ...OtherorderDataforNormal]
|
||||
: [...OtherorderDataforNormal, UpdatedCartItem];
|
||||
|
|
@ -2398,7 +2429,7 @@ export default function BSC1Search(props) {
|
|||
WithoutTaxRate: (
|
||||
item?.OrderRate -
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
},
|
||||
])
|
||||
|
|
@ -2412,39 +2443,39 @@ export default function BSC1Search(props) {
|
|||
if (item?.OtherProduct === 'Others') {
|
||||
const UpdatedData = addFirst
|
||||
? [
|
||||
{
|
||||
...item,
|
||||
TotalAmt: item?.OrderQty * item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderQty * item?.OrderRate -
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
...CartOrderDetails,
|
||||
]
|
||||
{
|
||||
...item,
|
||||
TotalAmt: item?.OrderQty * item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderQty * item?.OrderRate -
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
...CartOrderDetails,
|
||||
]
|
||||
: [
|
||||
...CartOrderDetails,
|
||||
{
|
||||
...item,
|
||||
TotalAmt: item?.OrderQty * item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderQty * item?.OrderRate -
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
]; // if the item is not in the cart, add the item to the cart
|
||||
...CartOrderDetails,
|
||||
{
|
||||
...item,
|
||||
TotalAmt: item?.OrderQty * item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderQty * item?.OrderRate -
|
||||
(item?.OrderQty * item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
]; // if the item is not in the cart, add the item to the cart
|
||||
// if (OfferCheckedInSetup && preferenceOffer) {
|
||||
// const withoutComboOffer_CardDetail = UpdatedData?.filter(
|
||||
// (item) => item.Type !== 'C'
|
||||
|
|
@ -2467,41 +2498,41 @@ export default function BSC1Search(props) {
|
|||
) {
|
||||
const UpdatedData = addFirst
|
||||
? [
|
||||
{
|
||||
...item,
|
||||
OrderQty: 1,
|
||||
TotalAmt: item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderRate -
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
...CartOrderDetails,
|
||||
]
|
||||
{
|
||||
...item,
|
||||
OrderQty: 1,
|
||||
TotalAmt: item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderRate -
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
...CartOrderDetails,
|
||||
]
|
||||
: [
|
||||
...CartOrderDetails,
|
||||
{
|
||||
...item,
|
||||
OrderQty: 1,
|
||||
TotalAmt: item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderRate -
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
]; // if the item is not in the cart, add the item to the cart
|
||||
...CartOrderDetails,
|
||||
{
|
||||
...item,
|
||||
OrderQty: 1,
|
||||
TotalAmt: item?.OrderRate,
|
||||
TaxAmt: (
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
WithoutTaxRate: (
|
||||
item?.OrderRate -
|
||||
(item?.OrderRate * item?.TaxPercentage) /
|
||||
(100 + item?.TaxPercentage)
|
||||
).toFixed(2),
|
||||
localId: uuidv4(),
|
||||
},
|
||||
]; // if the item is not in the cart, add the item to the cart
|
||||
// if (OfferCheckedInSetup && preferenceOffer) {
|
||||
// await applyOffer(UpdatedData);
|
||||
// } else {
|
||||
|
|
@ -2667,15 +2698,15 @@ export default function BSC1Search(props) {
|
|||
{option.ProductDetail?.filter(
|
||||
(item) => item.OnePcsAvailable == 'Y'
|
||||
).length !== 0 && (
|
||||
<GoTriangleRight
|
||||
style={{
|
||||
fontSize: '25px',
|
||||
}}
|
||||
onClick={() => {
|
||||
setOnePeiceFlow(true);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<GoTriangleRight
|
||||
style={{
|
||||
fontSize: '25px',
|
||||
}}
|
||||
onClick={() => {
|
||||
setOnePeiceFlow(true);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
),
|
||||
|
|
@ -2698,13 +2729,13 @@ export default function BSC1Search(props) {
|
|||
<BiBarcodeReader
|
||||
className="BSC1Search-barcodeicon"
|
||||
onClick={() => handleQrcode()}
|
||||
// onClick={() => OnfocusTrue()}
|
||||
// onClick={() => OnfocusTrue()}
|
||||
/>
|
||||
)}
|
||||
|
||||
<FiSearch
|
||||
className="BSC1Search-searchicon"
|
||||
// onClick={() => OnfocusTrue()}
|
||||
// onClick={() => OnfocusTrue()}
|
||||
/>
|
||||
</div>
|
||||
{ProductSearch?.length > 5 && QuickAdd && (
|
||||
|
|
@ -2850,8 +2881,8 @@ export default function BSC1Search(props) {
|
|||
<img
|
||||
src={
|
||||
item?.ProdLogo &&
|
||||
item?.ProdLogo != null &&
|
||||
item?.ProdLogo != undefined
|
||||
item?.ProdLogo != null &&
|
||||
item?.ProdLogo != undefined
|
||||
? item?.ProdLogo
|
||||
: defaultimage
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue