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

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

@ -71,6 +71,10 @@ import {
GlobalDefaultBookingType,
GlobalSelOption,
GlobalCustId,
GlobalSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import BSEditTotalAmt from '../BSEditTotalAmount/BSEditTotalAmt.jsx';
import BSImeiDetails from '../BSImeiDetails/BSImeiDetails.jsx';
@ -86,6 +90,7 @@ const BSBillingTable1 = () => {
const OfferFreeProduct = useSelector(GlobalFreeProdList);
const BSLayout1Data = useSelector(getTemplateData);
const tableOptions = BSLayout1Data?.BookingBilling?.[1];
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const dispatch = useDispatch();
const applyOffer = useApplyOfferto_CardDetail();
const preferenceDatas = useSelector(PreferenceData);
@ -400,6 +405,13 @@ const BSBillingTable1 = () => {
} else {
dispatch(changeOrderCardDetails([]));
}
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -413,6 +425,7 @@ const BSBillingTable1 = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));
@ -1145,7 +1158,21 @@ const BSBillingTable1 = () => {
e?.Offer > 0 &&
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2015,6 +2042,7 @@ const BSBillingTable1 = () => {
}
}
}
};
// const removeFromCart = async (item) => {
// setPreviousdataLength(tableData?.length);

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

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

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

@ -61,6 +61,10 @@ import {
GlobalDefaultBookingType,
GlobalSelOption,
GlobalCustId,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import '../../../../../Styles/BookingScreen/Components/BSBillingTables/BSBillingTables3/BSBillingTable3.scss';
import {
@ -119,6 +123,7 @@ const BSBillingTable3 = () => {
const UnpaidData = useSelector(GlobalUnpaidData);
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const ReportholdData = useSelector(GlobalReorderHoldDetails);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie);
const [PreviousdataLength, setPreviousdataLength] =
@ -315,7 +320,12 @@ const BSBillingTable3 = () => {
await ClearOfferDetails();
}
dispatch(changeOrderCardDetails([]));
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -329,6 +339,7 @@ const BSBillingTable3 = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));
@ -1087,6 +1098,22 @@ const BSBillingTable3 = () => {
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1956,6 +1983,7 @@ const BSBillingTable3 = () => {
}
}
}
};
// 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 [customerPreviesOrders, setCustomerPreviesOrders] = useState(false);
console.log(OrderCardDetail, 'OrderCardDetail');
console.log(paybtns, 'paybtnspaybtnspaybtnspaybtns', currentOrderNetAmount, previousNetAmount);
//Total calculation
const TotalItems = OrderCardDetail?.length;
const [formattedDate, setFormattedDate] = useState('');

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

@ -46,6 +46,10 @@ import {
PostBlockSlots,
GlobalSelOption,
GlobalCustId,
GlobalSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import {
ChangeTotalAmount,
@ -113,6 +117,7 @@ const BSBillingTable4 = () => {
const UnpaidData = useSelector(GlobalUnpaidData);
const tableData = useSelector(GlobalOrderCardDetails);
console.log(tableData, 'tableDatatableData');
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(GlobalReorderHoldDetails);
const PreviousOrderLength = useSelector(GlobalPreviousOrderLength);
const HoldOrderDtl = useSelector(GlobalHoldOrderDtl);
@ -1169,6 +1174,22 @@ const BSBillingTable4 = () => {
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2062,6 +2083,7 @@ const BSBillingTable4 = () => {
}
}
}
};
const UnblockSlots = async (newCartItem) => {
let BlockPostdata = {
@ -2186,6 +2208,12 @@ const BSBillingTable4 = () => {
if (OrderType === 'Hold') {
AvailableDate && UnblockSlotsAll(tableData);
await dispatch(changeOrderCardDetails([]));
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -2199,6 +2227,7 @@ const BSBillingTable4 = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));

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

@ -47,6 +47,10 @@ import {
GlobalDefaultBookingType,
GlobalSelOption,
GlobalCustId,
changePreviousOrderOfferDetail,
changePreviousOrderPayment,
changeBillEditingMode,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import {
ChangeFullFreeProductList,
@ -92,6 +96,7 @@ const BsBill = () => {
const GlobalOfferAppliedProductsData = useSelector(
GlobalOfferAppliedProducts
);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const OfferFreeProduct = useSelector(GlobalFreeProdList, shallowEqual);
const ReorderProductData = useSelector(GlobalReorderProductDetails);
const SelectedBillColor = useSelector(SelectedGlobalBillingColorDetail);
@ -836,6 +841,23 @@ const BsBill = () => {
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1692,6 +1714,7 @@ const BsBill = () => {
}
}
}
};
// const removeFromCart = async (item) => {
// setPreviousdataLength(TableData?.length);
@ -2015,6 +2038,12 @@ const BsBill = () => {
} else {
await dispatch(changeOrderCardDetails([]));
}
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
console.log(putData, 'putDataputData');
let response = await dispatch(puttinghold(putData)).unwrap();
@ -2029,6 +2058,7 @@ const BsBill = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));

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

@ -47,6 +47,10 @@ import {
GlobalDefaultBookingType,
GlobalSelOption,
GlobalCustId,
GlobalSalesBillEdit,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import {
ChangeFullFreeProductList,
@ -110,6 +114,7 @@ const BSBillingTable6 = () => {
const HoldOrderDtl = useSelector(GlobalHoldOrderDtl);
const UnpaidData = useSelector(GlobalUnpaidData);
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(GlobalReorderHoldDetails);
const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie);
@ -267,7 +272,7 @@ const BSBillingTable6 = () => {
}
// 👉 CTRL shortcuts
if (!event.ctrlKey) return;
if (key === 'q') {
if (key === 'q') {
event.preventDefault();
handleShortcut('qty');
} else if (key === 'e') {
@ -342,6 +347,12 @@ if (key === 'q') {
} else {
dispatch(changeOrderCardDetails([]));
}
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
console.log(putData, 'putDataputData');
let response = await dispatch(puttinghold(putData)).unwrap();
@ -356,6 +367,7 @@ if (key === 'q') {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));
@ -1069,6 +1081,22 @@ if (key === 'q') {
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1937,6 +1965,7 @@ if (key === 'q') {
}
}
}
};
// const removeFromCart = async (item) => {
// setPreviousdataLength(tableData?.length);

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

@ -38,6 +38,9 @@ import {
GlobalDefaultBookingType,
GlobalCustId,
GlobalSelOption,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import {
ChangeFullFreeProductList,
@ -958,7 +961,21 @@ const BSBillingTable7 = () => {
e?.Offer > 0 &&
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -1828,6 +1845,7 @@ const BSBillingTable7 = () => {
}
}
}
};
// const removeFromCart = async (item) => {
// setPreviousdataLength(tableData?.length);

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

@ -60,6 +60,10 @@ import {
GlobalDefaultBookingType,
GlobalCustId,
GlobalSelOption,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import {
ChangeOfferAppliedProducts,
@ -119,6 +123,7 @@ const ComboSalesBillTable = () => {
const HoldOrderDtl = useSelector(GlobalHoldOrderDtl);
const UnpaidData = useSelector(GlobalUnpaidData);
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(GlobalReorderHoldDetails);
const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie);
@ -504,7 +509,12 @@ const ComboSalesBillTable = () => {
await ClearOfferDetails();
}
dispatch(changeOrderCardDetails([]));
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -518,6 +528,7 @@ const ComboSalesBillTable = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));
@ -1257,7 +1268,21 @@ const ComboSalesBillTable = () => {
e?.Offer > 0 &&
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2111,6 +2136,7 @@ const ComboSalesBillTable = () => {
}
}
}
};
useEffect(() => {
@ -2562,8 +2588,7 @@ const ComboSalesBillTable = () => {
}}
key={`qty-${index}`}
tabIndex={0}
className={`${
EditQtyCombo && row?.localId === Index
className={`${EditQtyCombo && row?.localId === Index
? 'EditQTYcomboTD'
: 'qtyTd'
} ${isActiveCell ? 'active-cell' : ''}`}

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

@ -68,6 +68,7 @@ import {
changePreviousOrderOfferDetail,
GlobalCustId,
GlobalSelOption,
GlobalSalesBillEdit,
} from '../../../../../Features/BookingScreen/BookingData/BookingData';
import './StandardTable.scss';
import { IoClose } from 'react-icons/io5';
@ -130,6 +131,7 @@ const StandardTable = () => {
const GlobProdwisedata = useSelector(GlobalSelProdWiseEst);
const GlobEstBooking = useSelector(GlobalEstimateBooking);
const ReportholdData = useSelector(GlobalReorderHoldDetails);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const prodCat = useSelector(GlobalProductCategorie);
const ProdSubCat = useSelector(GlobalProductSubCategorie);
const [PreviousdataLength, setPreviousdataLength] =
@ -446,6 +448,12 @@ const StandardTable = () => {
} else {
dispatch(changeOrderCardDetails([]));
}
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -459,6 +467,7 @@ const StandardTable = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));
@ -1205,7 +1214,21 @@ const StandardTable = () => {
e?.Offer > 0 &&
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) {
//check is Buyxgetx Or something
// let ischeck= GlobalOfferAppliedProductsData?.some((e)=>e?.FreeProductsList?.[0]??.
@ -2079,6 +2102,7 @@ const StandardTable = () => {
}
}
}
};
// const removeFromCart = async (item) => {
// setPreviousdataLength(OrderCardDetail?.length);

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

@ -22,6 +22,10 @@ import {
changeSelProdWiseEst,
GlobalDefaultBookingType,
PostBlockSlots,
changeBillEditingMode,
changePreviousOrderPayment,
changePreviousOrderOfferDetail,
GlobalSalesBillEdit,
} from '../../../../Features/BookingScreen/BookingData/BookingData';
import {
changeholddata,
@ -64,6 +68,7 @@ export const useRemoveFromCart = () => {
GlobalOfferAppliedProducts
);
const defaultBookingType = useSelector(GlobalDefaultBookingType);
const salesBillEdit = useSelector(GlobalSalesBillEdit);
const ReportholdData = useSelector(
(state) => state.BookingData.ReorderHoldDetails
);
@ -176,6 +181,9 @@ export const useRemoveFromCart = () => {
await dispatch(ChangeOverAllDiscEstimate(null));
await dispatch(changeSelProdWiseEst([]));
await dispatch(ChangeTotalAmount([]));
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
const customerDisplayWindow = getCustomerDisplayWindow();
if (customerDisplayWindow && !customerDisplayWindow.closed) {
@ -299,6 +307,12 @@ export const useRemoveFromCart = () => {
// For Hold orders, additional cleanup
if (OrderType === 'Hold' && OrderCardDetail?.length <= 1) {
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -312,6 +326,7 @@ export const useRemoveFromCart = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));
}
@ -370,6 +385,12 @@ export const useRemoveFromCart = () => {
} else {
dispatch(changeOrderCardDetails([]));
}
if (salesBillEdit) {
getstockbadge();
dispatch(changeBillEditingMode(false));
await dispatch(changePreviousOrderPayment([]));
await dispatch(changePreviousOrderOfferDetail([]));
} else {
let putData = { OrderId: [ReportholdData?.OrderId] };
let response = await dispatch(puttinghold(putData)).unwrap();
if (response?.data?.statusCode == 1) {
@ -383,6 +404,7 @@ export const useRemoveFromCart = () => {
dispatch(changeholddata([]));
}
}
}
await dispatch(ChangeTotalAmount([]));
await dispatch(changeOrderType(null));
await dispatch(changeReorderHoldDetails({}));