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

Merge pull request 'sales bill edit fix' (#155) from temp/sales-bill-edit-fix into main 

Reviewed-on: Pozomind/pozo-retail-app#155
This commit is contained in:
karthikalakshmi 2026-02-18 19:50:09 +05:30
parent be3b62f79c b621347228
commit 6e22db34c8
11 changed files with 528 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable1/BSBillingTable1.jsx
View File

@ -71,6 +71,10 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalSelOption, GlobalSelOption,
GlobalCustId, GlobalCustId,
GlobalSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import BSEditTotalAmt from '../BSEditTotalAmount/BSEditTotalAmt.jsx'; import BSEditTotalAmt from '../BSEditTotalAmount/BSEditTotalAmt.jsx';
import BSImeiDetails from '../BSImeiDetails/BSImeiDetails.jsx'; import BSImeiDetails from '../BSImeiDetails/BSImeiDetails.jsx';
@ -86,6 +90,7 @@ const BSBillingTable1 = () => {
const OfferFreeProduct = useSelector(GlobalFreeProdList); const OfferFreeProduct = useSelector(GlobalFreeProdList);
const BSLayout1Data = useSelector(getTemplateData); const BSLayout1Data = useSelector(getTemplateData);
const tableOptions = BSLayout1Data?.BookingBilling?.[1]; const tableOptions = BSLayout1Data?.BookingBilling?.[1];
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const dispatch = useDispatch(); const dispatch = useDispatch();
const applyOffer = useApplyOfferto_CardDetail(); const applyOffer = useApplyOfferto_CardDetail();
const preferenceDatas = useSelector(PreferenceData); const preferenceDatas = useSelector(PreferenceData);
@ -290,19 +295,19 @@ const BSBillingTable1 = () => {
// } // }
// }; // };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P → Open Edit Total Amount // 👉 ALT + P → Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (tableData?.length > 0) { if (tableData?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; // 👉 CTRL shortcuts
} if (!event.ctrlKey) return;
// 👉 CTRL shortcuts
if (!event.ctrlKey) return;
if (key === 'q') { if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} else if (key === 'e') { } else if (key === 'e') {
@ -316,7 +321,7 @@ const BSBillingTable1 = () => {
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
return () => { return () => {
@ -400,17 +405,25 @@ const BSBillingTable1 = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap(); if (salesBillEdit) {
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata([])); if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1145,7 +1158,21 @@ const BSBillingTable1 = () => {
e?.Offer > 0 && e?.Offer > 0 &&
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (tableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2015,6 +2042,7 @@ const BSBillingTable1 = () => {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {
// setPreviousdataLength(tableData?.length); // setPreviousdataLength(tableData?.length);

27
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable2/BsBill2.jsx
View File

@ -33,6 +33,9 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalSelOption, GlobalSelOption,
GlobalCustId, GlobalCustId,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
getTemplateData, getTemplateData,
@ -980,13 +983,6 @@ const BsBill2 = () => {
!cartItem?.SalesId !cartItem?.SalesId
) )
); );
if (OfferCheckedInSetup && preferenceOffer) {
await applyOffer(UpdatedData);
} else {
dispatch(changeOrderCardDetails(UpdatedData));
}
// if the quantity of the item is 1, remove the item from the cart // if the quantity of the item is 1, remove the item from the cart
if (CartOrderDetails?.length <= 1) { if (CartOrderDetails?.length <= 1) {
await dispatch(changeReorderHoldDetails({})); await dispatch(changeReorderHoldDetails({}));
@ -997,7 +993,18 @@ const BsBill2 = () => {
await dispatch(changeAllProductTokenAvailable(false)); await dispatch(changeAllProductTokenAvailable(false));
await dispatch(changeSelProdWiseEst([])); await dispatch(changeSelProdWiseEst([]));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} }
if (OfferCheckedInSetup && preferenceOffer) {
await applyOffer(UpdatedData);
} else {
dispatch(changeOrderCardDetails(UpdatedData));
}
} else if ( } else if (
item?.BookingTypeName !== 'Dine In' && item?.BookingTypeName !== 'Dine In' &&
OrderType === 'Hold' OrderType === 'Hold'
@ -1027,6 +1034,9 @@ const BsBill2 = () => {
await dispatch(changeAllProductTokenAvailable(false)); await dispatch(changeAllProductTokenAvailable(false));
await dispatch(changeSelProdWiseEst([])); await dispatch(changeSelProdWiseEst([]));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} }
} else if (item?.BookingTypeName === 'Dine In') { } else if (item?.BookingTypeName === 'Dine In') {
const UpdatedData = CartOrderDetails?.filter( const UpdatedData = CartOrderDetails?.filter(
@ -1055,6 +1065,9 @@ const BsBill2 = () => {
await dispatch(changeAllProductTokenAvailable(false)); await dispatch(changeAllProductTokenAvailable(false));
await dispatch(changeSelProdWiseEst([])); await dispatch(changeSelProdWiseEst([]));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} }
} }
} }

76
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3.jsx
View File

@ -61,6 +61,10 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalSelOption, GlobalSelOption,
GlobalCustId, GlobalCustId,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss'; import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss';
import { import {
@ -119,6 +123,7 @@ const BSBillingTable3 = () => {
const UnpaidData = useSelector(GlobalUnpaidData); const UnpaidData = useSelector(GlobalUnpaidData);
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst); const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const ReportholdData = useSelector(GlobalReorderHoldDetails); const ReportholdData = useSelector(GlobalReorderHoldDetails);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const prodCat = useSelector(GlobalProductCategorie); const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie); const ProdSubCat = useSelector(GlobalProductSubCategorie);
const [PreviousdataLength, setPreviousdataLength] = const [PreviousdataLength, setPreviousdataLength] =
@ -228,20 +233,20 @@ const BSBillingTable3 = () => {
handleEditQuantity(item); handleEditQuantity(item);
setshortKeyMethod(method); setshortKeyMethod(method);
}; };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P → Open Edit Total Amount // 👉 ALT + P → Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (tableData?.length > 0) { if (tableData?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; // 👉 CTRL shortcuts
} if (!event.ctrlKey) return;
// 👉 CTRL shortcuts
if (!event.ctrlKey) return;
if (key === 'q') { if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} else if (key === 'e') { } else if (key === 'e') {
@ -255,7 +260,7 @@ const BSBillingTable3 = () => {
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
return () => { return () => {
@ -315,18 +320,24 @@ const BSBillingTable3 = () => {
await ClearOfferDetails(); await ClearOfferDetails();
} }
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
if (salesBillEdit) {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata([])); if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1087,6 +1098,22 @@ const BSBillingTable3 = () => {
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (tableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1956,6 +1983,7 @@ const BSBillingTable3 = () => {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {

2
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable3/BSBillingTable3pay.jsx
View File

@ -355,7 +355,7 @@ const BSBillingTable3Pay = () => {
const OrderCardDetail = useSelector(GlobalOrderCardDetails); const OrderCardDetail = useSelector(GlobalOrderCardDetails);
const [customerPreviesOrders, setCustomerPreviesOrders] = useState(false); const [customerPreviesOrders, setCustomerPreviesOrders] = useState(false);
console.log(OrderCardDetail, 'OrderCardDetail'); console.log(paybtns, 'paybtnspaybtnspaybtnspaybtns', currentOrderNetAmount, previousNetAmount);
//Total calculation //Total calculation
const TotalItems = OrderCardDetail?.length; const TotalItems = OrderCardDetail?.length;
const [formattedDate, setFormattedDate] = useState(''); const [formattedDate, setFormattedDate] = useState('');

75
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable4/BSBillingTable4.jsx
View File

@ -46,6 +46,10 @@ import {
PostBlockSlots, PostBlockSlots,
GlobalSelOption, GlobalSelOption,
GlobalCustId, GlobalCustId,
GlobalSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
ChangeTotalAmount, ChangeTotalAmount,
@ -113,6 +117,7 @@ const BSBillingTable4 = () => {
const UnpaidData = useSelector(GlobalUnpaidData); const UnpaidData = useSelector(GlobalUnpaidData);
const tableData = useSelector(GlobalOrderCardDetails); const tableData = useSelector(GlobalOrderCardDetails);
console.log(tableData, 'tableDatatableData'); console.log(tableData, 'tableDatatableData');
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(GlobalReorderHoldDetails); const ReportholdData = useSelector(GlobalReorderHoldDetails);
const PreviousOrderLength = useSelector(GlobalPreviousOrderLength); const PreviousOrderLength = useSelector(GlobalPreviousOrderLength);
const HoldOrderDtl = useSelector(GlobalHoldOrderDtl); const HoldOrderDtl = useSelector(GlobalHoldOrderDtl);
@ -281,20 +286,20 @@ const BSBillingTable4 = () => {
setshortKeyMethod(method); setshortKeyMethod(method);
}; };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P → Open Edit Total Amount // 👉 ALT + P → Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (tableData?.length > 0) { if (tableData?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; // 👉 CTRL shortcuts
} if (!event.ctrlKey) return;
// 👉 CTRL shortcuts
if (!event.ctrlKey) return;
if (key === 'q') { if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} else if (key === 'e') { } else if (key === 'e') {
@ -308,7 +313,7 @@ const BSBillingTable4 = () => {
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
@ -1169,6 +1174,22 @@ const BSBillingTable4 = () => {
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (tableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2062,6 +2083,7 @@ const BSBillingTable4 = () => {
} }
} }
} }
}; };
const UnblockSlots = async (newCartItem) => { const UnblockSlots = async (newCartItem) => {
let BlockPostdata = { let BlockPostdata = {
@ -2186,17 +2208,24 @@ const BSBillingTable4 = () => {
if (OrderType === 'Hold') { if (OrderType === 'Hold') {
AvailableDate && UnblockSlotsAll(tableData); AvailableDate && UnblockSlotsAll(tableData);
await dispatch(changeOrderCardDetails([])); await dispatch(changeOrderCardDetails([]));
let putData = { OrderId: [ReportholdData?.OrderId] }; if (salesBillEdit) {
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata([])); if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));

78
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable5/BsBill.jsx
View File

@ -47,6 +47,10 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalSelOption, GlobalSelOption,
GlobalCustId, GlobalCustId,
changePreviousOrderOfferDetail,
changePreviousOrderPayment,
changeBillEditingMode,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
ChangeFullFreeProductList, ChangeFullFreeProductList,
@ -92,6 +96,7 @@ const BsBill = () => {
const GlobalOfferAppliedProductsData = useSelector( const GlobalOfferAppliedProductsData = useSelector(
GlobalOfferAppliedProducts GlobalOfferAppliedProducts
); );
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const OfferFreeProduct = useSelector(GlobalFreeProdList, shallowEqual); const OfferFreeProduct = useSelector(GlobalFreeProdList, shallowEqual);
const ReorderProductData = useSelector(GlobalReorderProductDetails); const ReorderProductData = useSelector(GlobalReorderProductDetails);
const SelectedBillColor = useSelector(SelectedGlobalBillingColorDetail); const SelectedBillColor = useSelector(SelectedGlobalBillingColorDetail);
@ -836,6 +841,23 @@ const BsBill = () => {
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (TableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1692,6 +1714,7 @@ const BsBill = () => {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {
// setPreviousdataLength(TableData?.length); // setPreviousdataLength(TableData?.length);
@ -1927,20 +1950,20 @@ const BsBill = () => {
setshortKeyMethod(method); setshortKeyMethod(method);
}; };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P → Open Edit Total Amount // 👉 ALT + P → Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (TableData?.length > 0) { if (TableData?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; // 👉 CTRL shortcuts
} if (!event.ctrlKey) return;
// 👉 CTRL shortcuts
if (!event.ctrlKey) return;
if (key === 'q') { if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} else if (key === 'e') { } else if (key === 'e') {
@ -1954,7 +1977,7 @@ const BsBill = () => {
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
return () => { return () => {
@ -2015,18 +2038,25 @@ const BsBill = () => {
} else { } else {
await dispatch(changeOrderCardDetails([])); await dispatch(changeOrderCardDetails([]));
} }
let putData = { OrderId: [ReportholdData?.OrderId] }; if (salesBillEdit) {
console.log(putData, 'putDataputData');
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { console.log(putData, 'putDataputData');
dispatch(changeholddata([])); let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));

77
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable6/BSBillingTable6.jsx
View File

@ -47,6 +47,10 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalSelOption, GlobalSelOption,
GlobalCustId, GlobalCustId,
GlobalSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
ChangeFullFreeProductList, ChangeFullFreeProductList,
@ -110,6 +114,7 @@ const BSBillingTable6 = () => {
const HoldOrderDtl = useSelector(GlobalHoldOrderDtl); const HoldOrderDtl = useSelector(GlobalHoldOrderDtl);
const UnpaidData = useSelector(GlobalUnpaidData); const UnpaidData = useSelector(GlobalUnpaidData);
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst); const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(GlobalReorderHoldDetails); const ReportholdData = useSelector(GlobalReorderHoldDetails);
const prodCat = useSelector(GlobalProductCategorie); const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie); const ProdSubCat = useSelector(GlobalProductSubCategorie);
@ -255,19 +260,19 @@ const BSBillingTable6 = () => {
setshortKeyMethod(method); setshortKeyMethod(method);
}; };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P → Open Edit Total Amount // 👉 ALT + P → Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (tableData?.length > 0) { if (tableData?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; // 👉 CTRL shortcuts
} if (!event.ctrlKey) return;
// 👉 CTRL shortcuts if (key === 'q') {
if (!event.ctrlKey) return;
if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} else if (key === 'e') { } else if (key === 'e') {
@ -281,7 +286,7 @@ if (key === 'q') {
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
return () => { return () => {
@ -342,18 +347,25 @@ if (key === 'q') {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
let putData = { OrderId: [ReportholdData?.OrderId] }; if (salesBillEdit) {
console.log(putData, 'putDataputData');
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { console.log(putData, 'putDataputData');
dispatch(changeholddata([])); let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1069,6 +1081,22 @@ if (key === 'q') {
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (tableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1937,6 +1965,7 @@ if (key === 'q') {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {
// setPreviousdataLength(tableData?.length); // setPreviousdataLength(tableData?.length);

42
src/Pages/BookingScreen/Components/BSBillingTables/BSBillingTable7/BSBillingTable7.jsx
View File

@ -38,6 +38,9 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalCustId, GlobalCustId,
GlobalSelOption, GlobalSelOption,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
ChangeFullFreeProductList, ChangeFullFreeProductList,
@ -250,17 +253,17 @@ const BSBillingTable7 = () => {
}; };
const handleKeyDown = (event) => { const handleKeyDown = (event) => {
const key = event.key.toLowerCase(); const key = event.key.toLowerCase();
// 👉 ALT + P → Open Edit Total Amount // 👉 ALT + P → Open Edit Total Amount
if (event.altKey && key === 'p') { if (event.altKey && key === 'p') {
event.preventDefault(); event.preventDefault();
if (tableData?.length > 0) { if (tableData?.length > 0) {
OpenEditTotalAmount(); OpenEditTotalAmount();
}
return;
} }
return; if (!event.ctrlKey) return;
} if (key === 'q') {
if (!event.ctrlKey) return;
if (key === 'q') {
event.preventDefault(); event.preventDefault();
handleShortcut('qty'); handleShortcut('qty');
} else if (key === 'e') { } else if (key === 'e') {
@ -274,7 +277,7 @@ const BSBillingTable7 = () => {
handleShortcut('weightAmount'); handleShortcut('weightAmount');
} }
}; };
window.addEventListener('keydown', handleKeyDown); window.addEventListener('keydown', handleKeyDown);
return () => { return () => {
@ -958,7 +961,21 @@ const BSBillingTable7 = () => {
e?.Offer > 0 && e?.Offer > 0 &&
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (tableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1828,6 +1845,7 @@ const BSBillingTable7 = () => {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {
// setPreviousdataLength(tableData?.length); // setPreviousdataLength(tableData?.length);

179
src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
View File

@ -60,6 +60,10 @@ import {
GlobalDefaultBookingType, GlobalDefaultBookingType,
GlobalCustId, GlobalCustId,
GlobalSelOption, GlobalSelOption,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
ChangeOfferAppliedProducts, ChangeOfferAppliedProducts,
@ -119,6 +123,7 @@ const ComboSalesBillTable = () => {
const HoldOrderDtl = useSelector(GlobalHoldOrderDtl); const HoldOrderDtl = useSelector(GlobalHoldOrderDtl);
const UnpaidData = useSelector(GlobalUnpaidData); const UnpaidData = useSelector(GlobalUnpaidData);
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst); const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(GlobalReorderHoldDetails); const ReportholdData = useSelector(GlobalReorderHoldDetails);
const prodCat = useSelector(GlobalProductCategorie); const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie); const ProdSubCat = useSelector(GlobalProductSubCategorie);
@ -147,13 +152,13 @@ const ComboSalesBillTable = () => {
OrderType === 'Hold' OrderType === 'Hold'
? tableData?.filter((a, b) => a.BookingTypeName === 'TakeAway') ? tableData?.filter((a, b) => a.BookingTypeName === 'TakeAway')
: tableData?.filter( : tableData?.filter(
(a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId (a, b) => a.BookingTypeName === 'TakeAway' && !a?.SalesId
); );
const OldtableDataTakeAway = const OldtableDataTakeAway =
OrderType != 'Hold' OrderType != 'Hold'
? tableData?.filter( ? tableData?.filter(
(a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId (a, b) => a.BookingTypeName === 'TakeAway' && a?.SalesId
) )
: []; : [];
const [EditQuantity, setEditQuantity] = useState(false); const [EditQuantity, setEditQuantity] = useState(false);
@ -236,7 +241,7 @@ const ComboSalesBillTable = () => {
} }
}, [tableOptions]); }, [tableOptions]);
// Merge same items in hold order // Merge same items in hold order
useEffect(() => { useEffect(() => {
if (OrderType === 'Hold' && tableData?.length > 0) { if (OrderType === 'Hold' && tableData?.length > 0) {
const mergedData = []; const mergedData = [];
@ -388,7 +393,7 @@ const ComboSalesBillTable = () => {
if (OtherServicesglobal && value.Type == 'OS' && value.ServiceType == 'I') { if (OtherServicesglobal && value.Type == 'OS' && value.ServiceType == 'I') {
setEditQuantity(false); setEditQuantity(false);
} else { } else {
if (value?.SalesId && OrderType !== 'Hold') { if (value?.SalesId && OrderType !== 'Hold') {
setEditQuantity(false); setEditQuantity(false);
} else { } else {
setEditQuantity(true); setEditQuantity(true);
@ -504,18 +509,24 @@ const ComboSalesBillTable = () => {
await ClearOfferDetails(); await ClearOfferDetails();
} }
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
if (salesBillEdit) {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata([])); if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1218,9 +1229,9 @@ const ComboSalesBillTable = () => {
)?.map((item, idx) => )?.map((item, idx) =>
idx === 0 idx === 0
? { ? {
...item, ...item,
FreeQty, FreeQty,
} }
: item : item
), ),
}; };
@ -1257,7 +1268,21 @@ const ComboSalesBillTable = () => {
e?.Offer > 0 && e?.Offer > 0 &&
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (tableData?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2111,6 +2136,7 @@ const ComboSalesBillTable = () => {
} }
} }
} }
}; };
useEffect(() => { useEffect(() => {
@ -2442,20 +2468,20 @@ const ComboSalesBillTable = () => {
tableDataDinein?.length >= PreviousdataLength tableDataDinein?.length >= PreviousdataLength
? 'wheat' ? 'wheat'
: BookingType !== 'Dine In' && : BookingType !== 'Dine In' &&
triggerAnimation && triggerAnimation &&
OldtableDataTakeAway?.length + index === 0 && OldtableDataTakeAway?.length + index === 0 &&
tableDataDinein?.length >= PreviousdataLength && tableDataDinein?.length >= PreviousdataLength &&
!HoldOrderDtl && !HoldOrderDtl &&
!UnpaidData !UnpaidData
? 'wheat' ? 'wheat'
: 'inherit' : 'inherit'
: 'none', : 'none',
background: row?.SalesId && OrderType !== 'Hold' background: row?.SalesId && OrderType !== 'Hold'
? 'rgb(243, 248, 213)' ? 'rgb(243, 248, 213)'
: GlobEstBooking === 'ParEst' && : GlobEstBooking === 'ParEst' &&
GlobProdwisedata?.includes( GlobProdwisedata?.includes(
row?.InwardDtlId + ' ' + row?.BookingTypeName row?.InwardDtlId + ' ' + row?.BookingTypeName
) )
? '#b2d1f7' ? '#b2d1f7'
: (OldtableDataTakeAway?.length + index) % 2 === 0 : (OldtableDataTakeAway?.length + index) % 2 === 0
? 'white' ? 'white'
@ -2498,44 +2524,44 @@ const ComboSalesBillTable = () => {
{/* Product Name / Item */} {/* Product Name / Item */}
{(item.OptionName === 'Item' || {(item.OptionName === 'Item' ||
item.OptionName === 'Product Name') && ( item.OptionName === 'Product Name') && (
<td <td
key={`prod-${index}`} key={`prod-${index}`}
className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`} className={`productNameTd ${isActiveCell ? 'active-cell' : ''}`}
onClick={() => onClick={() =>
row.FullProductIdentifierDtls?.length > 0 || row.FullProductIdentifierDtls?.length > 0 ||
row.ProductIdentifierDtls?.length > 0 row.ProductIdentifierDtls?.length > 0
? handleImeiDetails(row) ? handleImeiDetails(row)
: editField && handleEditQuantity(row) : editField && handleEditQuantity(row)
} }
> >
{row?.Type !== 'OS' ? row.ProdName : row.ServiceName} {row?.Type !== 'OS' ? row.ProdName : row.ServiceName}
{row?.BrandName ? ` ${row.BrandName}` : ''} {row?.BrandName ? ` ${row.BrandName}` : ''}
{row?.Type !== 'C' && ( {row?.Type !== 'C' && (
<p <p
// className="Tbl3-Variant" // className="Tbl3-Variant"
className={ className={
isActiveCell isActiveCell
? 'Tbl3VariantActve' ? 'Tbl3VariantActve'
: 'Tbl3-Variant' : 'Tbl3-Variant'
} }
> >
{/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */} {/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */}
( (
{!row?.ProdVariantName?.toLowerCase()?.includes( {!row?.ProdVariantName?.toLowerCase()?.includes(
'variant' 'variant'
) && <span>{row?.ProdVariantName} </span>} ) && <span>{row?.ProdVariantName} </span>}
{row?.Size} {row?.Size}
{row?.SinglePc == 'Y' ? 'PCS' : row?.UomName}) {row?.SinglePc == 'Y' ? 'PCS' : row?.UomName})
</p>
)}
{row?.Type === 'C' &&
row.ProdDetail?.map((prod, idx) => (
<p key={idx}>
{prod.ProdName} - {prod.Size} {prod.UomName}
</p> </p>
))} )}
</td> {row?.Type === 'C' &&
)} row.ProdDetail?.map((prod, idx) => (
<p key={idx}>
{prod.ProdName} - {prod.Size} {prod.UomName}
</p>
))}
</td>
)}
{/* Barcode */} {/* Barcode */}
{item.OptionName === 'Barcode' && ( {item.OptionName === 'Barcode' && (
@ -2562,11 +2588,10 @@ const ComboSalesBillTable = () => {
}} }}
key={`qty-${index}`} key={`qty-${index}`}
tabIndex={0} tabIndex={0}
className={`${ className={`${EditQtyCombo && row?.localId === Index
EditQtyCombo && row?.localId === Index ? 'EditQTYcomboTD'
? 'EditQTYcomboTD' : 'qtyTd'
: 'qtyTd' } ${isActiveCell ? 'active-cell' : ''}`}
} ${isActiveCell ? 'active-cell' : ''}`}
onClick={() => onClick={() =>
editField && handleEditQuantityCombo(row) editField && handleEditQuantityCombo(row)
} }
@ -2629,9 +2654,9 @@ const ComboSalesBillTable = () => {
> >
{row?.Offer > 0 {row?.Offer > 0
? `${( ? `${(
(row.Offer / (row?.OrderQty * row?.OrderRate)) * (row.Offer / (row?.OrderQty * row?.OrderRate)) *
100 100
).toFixed(2)}%` ).toFixed(2)}%`
: '-'} : '-'}
</td> </td>
)} )}
@ -2663,8 +2688,8 @@ const ComboSalesBillTable = () => {
> >
{allowDecimal {allowDecimal
? Number(row.TotalAmt - (row?.Offer || 0)).toFixed( ? Number(row.TotalAmt - (row?.Offer || 0)).toFixed(
2 2
) )
: Number(row.TotalAmt - (row?.Offer || 0))} : Number(row.TotalAmt - (row?.Offer || 0))}
</td> </td>
)} )}
@ -2707,7 +2732,7 @@ const ComboSalesBillTable = () => {
<td <td
key={`delete-${index}`} key={`delete-${index}`}
className={`deleteTd ${isActiveCell ? 'active-cell' : ''}`} className={`deleteTd ${isActiveCell ? 'active-cell' : ''}`}
// className="" // className=""
> >
<AiOutlineClose <AiOutlineClose
onClick={() => removeFromCart(row)} onClick={() => removeFromCart(row)}

46
src/Pages/BookingScreen/Components/BSBillingTables/StandardTable/StandardTable.jsx
View File

@ -68,6 +68,7 @@ import {
changePreviousOrderOfferDetail, changePreviousOrderOfferDetail,
GlobalCustId, GlobalCustId,
GlobalSelOption, GlobalSelOption,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../../Features/BookingScreen/BookingData/BookingData';
import './StandardTable.scss'; import './StandardTable.scss';
import { IoClose } from 'react-icons/io5'; import { IoClose } from 'react-icons/io5';
@ -130,6 +131,7 @@ const StandardTable = () => {
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst); const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const GlobEstBooking = useSelector(GlobalEstimateBooking); const GlobEstBooking = useSelector(GlobalEstimateBooking);
const ReportholdData = useSelector(GlobalReorderHoldDetails); const ReportholdData = useSelector(GlobalReorderHoldDetails);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const prodCat = useSelector(GlobalProductCategorie); const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie); const ProdSubCat = useSelector(GlobalProductSubCategorie);
const [PreviousdataLength, setPreviousdataLength] = const [PreviousdataLength, setPreviousdataLength] =
@ -446,17 +448,24 @@ const StandardTable = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
let putData = { OrderId: [ReportholdData?.OrderId] }; if (salesBillEdit) {
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
getstockbadge(); getstockbadge();
let holdingData = await dispatch( dispatch(changeBillEditingMode(false));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) await dispatch(changePreviousOrderPayment([]));
).unwrap(); await dispatch(changePreviousOrderOfferDetail([]));
if (holdingData?.data?.statusCode === 1) { } else {
dispatch(changeholddata(holdingData?.data?.data)); let putData = { OrderId: [ReportholdData?.OrderId] };
} else { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata([])); if (response?.data?.statusCode == 1) {
getstockbadge();
let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
@ -1205,7 +1214,21 @@ const StandardTable = () => {
e?.Offer > 0 && e?.Offer > 0 &&
e?.BookingTypeName != item?.BookingTypeName e?.BookingTypeName != item?.BookingTypeName
); );
if (OrderCardDetail?.length <= 1) {
await dispatch(changeReorderHoldDetails({}));
await dispatch(changeReorderProductDetails([]));
await dispatch(changeUnpaidData(false));
await dispatch(changeBookingType('TakeAway'));
await dispatch(changeTokenOnly(false));
await dispatch(ChangeTotalAmount([]));
await dispatch(changeAllProductTokenAvailable(false));
await dispatch(ChangeOverAllDiscSales(null));
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
}
if (item?.Offer > 0) { if (item?.Offer > 0) {
//check is Buyxgetx Or something //check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??. // let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2079,6 +2102,7 @@ const StandardTable = () => {
} }
} }
} }
}; };
// const removeFromCart = async (item) => { // const removeFromCart = async (item) => {
// setPreviousdataLength(OrderCardDetail?.length); // setPreviousdataLength(OrderCardDetail?.length);

114
src/Pages/BookingScreen/Components/BSItemCards/RemoveFromCartFunction.jsx
View File

@ -22,6 +22,10 @@ import {
changeSelProdWiseEst, changeSelProdWiseEst,
GlobalDefaultBookingType, GlobalDefaultBookingType,
PostBlockSlots, PostBlockSlots,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalSalesBillEdit,
} from '../../../../Features/BookingScreen/BookingData/BookingData'; } from '../../../../Features/BookingScreen/BookingData/BookingData';
import { import {
changeholddata, changeholddata,
@ -64,6 +68,7 @@ export const useRemoveFromCart = () => {
GlobalOfferAppliedProducts GlobalOfferAppliedProducts
); );
const defaultBookingType = useSelector(GlobalDefaultBookingType); const defaultBookingType = useSelector(GlobalDefaultBookingType);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector( const ReportholdData = useSelector(
(state) => state.BookingData.ReorderHoldDetails (state) => state.BookingData.ReorderHoldDetails
); );
@ -176,6 +181,9 @@ export const useRemoveFromCart = () => {
await dispatch(ChangeOverAllDiscEstimate(null)); await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([])); await dispatch(changeSelProdWiseEst([]));
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
const customerDisplayWindow = getCustomerDisplayWindow(); const customerDisplayWindow = getCustomerDisplayWindow();
if (customerDisplayWindow && !customerDisplayWindow.closed) { if (customerDisplayWindow && !customerDisplayWindow.closed) {
@ -215,9 +223,9 @@ export const useRemoveFromCart = () => {
AppId: AppId, AppId: AppId,
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
await dispatch(getSelectedFavItems(data)).unwrap(); await dispatch(getSelectedFavItems(data)).unwrap();
@ -229,9 +237,9 @@ export const useRemoveFromCart = () => {
ProdSubCat: useSelector((state) => state.BookingData.ProductSubCategorie), ProdSubCat: useSelector((state) => state.BookingData.ProductSubCategorie),
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -242,9 +250,9 @@ export const useRemoveFromCart = () => {
prodCat: useSelector((state) => state.BookingData.ProductCategorie), prodCat: useSelector((state) => state.BookingData.ProductCategorie),
...(AvailableDate && selectedDate ...(AvailableDate && selectedDate
? { ? {
fromDate: selectedDate?.[0], fromDate: selectedDate?.[0],
toDate: selectedDate?.[1], toDate: selectedDate?.[1],
} }
: {}), : {}),
}; };
@ -299,17 +307,24 @@ export const useRemoveFromCart = () => {
// For Hold orders, additional cleanup // For Hold orders, additional cleanup
if (OrderType === 'Hold' && OrderCardDetail?.length <= 1) { if (OrderType === 'Hold' && OrderCardDetail?.length <= 1) {
let putData = { OrderId: [ReportholdData?.OrderId] }; if (salesBillEdit) {
let response = await dispatch(puttinghold(putData)).unwrap(); getstockbadge();
if (response?.data?.statusCode == 1) { dispatch(changeBillEditingMode(false));
await getstockbadge(); await dispatch(changePreviousOrderPayment([]));
let holdingData = await dispatch( await dispatch(changePreviousOrderOfferDetail([]));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) } else {
).unwrap(); let putData = { OrderId: [ReportholdData?.OrderId] };
if (holdingData?.data?.statusCode === 1) { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata(holdingData?.data?.data)); if (response?.data?.statusCode == 1) {
} else { await getstockbadge();
dispatch(changeholddata([])); let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(changeOrderType(null)); await dispatch(changeOrderType(null));
@ -330,26 +345,26 @@ export const useRemoveFromCart = () => {
console.log('isItemInCart', isItemInCart); console.log('isItemInCart', isItemInCart);
if (isItemInCart?.OrderQty > 1) { if (isItemInCart?.OrderQty > 1) {
const UpdatedCartItem = const UpdatedCartItem =
// if the item is already in the cart, increase the quantity of the item // if the item is already in the cart, increase the quantity of the item
{ {
...isItemInCart, ...isItemInCart,
OrderQty: isItemInCart?.OrderQty - 1, OrderQty: isItemInCart?.OrderQty - 1,
TotalAmt: (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate, TotalAmt: (isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate,
TaxAmt: ( TaxAmt: (
((isItemInCart?.OrderQty - 1) *
isItemInCart?.OrderRate *
isItemInCart?.TaxPercentage) /
(100 + isItemInCart?.TaxPercentage)
).toFixed(2),
WithoutTaxRate:
(isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate -
(
((isItemInCart?.OrderQty - 1) * ((isItemInCart?.OrderQty - 1) *
isItemInCart?.OrderRate * isItemInCart?.OrderRate *
isItemInCart?.TaxPercentage) / isItemInCart?.TaxPercentage) /
(100 + isItemInCart?.TaxPercentage) (100 + isItemInCart?.TaxPercentage)
).toFixed(2), ).toFixed(2),
WithoutTaxRate: };
(isItemInCart?.OrderQty - 1) * isItemInCart?.OrderRate -
(
((isItemInCart?.OrderQty - 1) *
isItemInCart?.OrderRate *
isItemInCart?.TaxPercentage) /
(100 + isItemInCart?.TaxPercentage)
).toFixed(2),
};
const UpdatedcardData = [UpdatedCartItem, ...UpdatedData]; const UpdatedcardData = [UpdatedCartItem, ...UpdatedData];
if (OfferCheckedInSetup && preferenceOffer) { if (OfferCheckedInSetup && preferenceOffer) {
@ -370,17 +385,24 @@ export const useRemoveFromCart = () => {
} else { } else {
dispatch(changeOrderCardDetails([])); dispatch(changeOrderCardDetails([]));
} }
let putData = { OrderId: [ReportholdData?.OrderId] }; if (salesBillEdit) {
let response = await dispatch(puttinghold(putData)).unwrap(); getstockbadge();
if (response?.data?.statusCode == 1) { dispatch(changeBillEditingMode(false));
await getstockbadge(); await dispatch(changePreviousOrderPayment([]));
let holdingData = await dispatch( await dispatch(changePreviousOrderOfferDetail([]));
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId }) } else {
).unwrap(); let putData = { OrderId: [ReportholdData?.OrderId] };
if (holdingData?.data?.statusCode === 1) { let response = await dispatch(puttinghold(putData)).unwrap();
dispatch(changeholddata(holdingData?.data?.data)); if (response?.data?.statusCode == 1) {
} else { await getstockbadge();
dispatch(changeholddata([])); let holdingData = await dispatch(
gettinghold({ CompId: CompId, BranchId: BranchId, AppId: AppId })
).unwrap();
if (holdingData?.data?.statusCode === 1) {
dispatch(changeholddata(holdingData?.data?.data));
} else {
dispatch(changeholddata([]));
}
} }
} }
await dispatch(ChangeTotalAmount([])); await dispatch(ChangeTotalAmount([]));