diff --git a/src/Features/BookingScreen/BookingData/BookingData.js b/src/Features/BookingScreen/BookingData/BookingData.js index 23a4dab..8626441 100644 --- a/src/Features/BookingScreen/BookingData/BookingData.js +++ b/src/Features/BookingScreen/BookingData/BookingData.js @@ -1609,6 +1609,7 @@ const initialState = { salesBillEdit: false, previousOrderPayment: [], previousOrderOfferDetails: [], + getmultipleSearchDatas: [] }; const BookingData = createSlice({ @@ -2110,6 +2111,13 @@ const BookingData = createSlice({ state.AllCustomers = []; } }); + builder.addCase(getmultipleSearch.fulfilled, (state, action) => { + if (action?.payload?.data?.statusCode === 1) { + state.getmultipleSearchDatas = action?.payload?.data?.data[0]?.SearchTermDtl?.map((e) => e?.SearchTerm) || []; + } else { + state.getmultipleSearchDatas = []; + } + }); }, }); @@ -2387,5 +2395,7 @@ export const GlobalPreviousOrderPayment = (state) => state?.BookingData?.previousOrderPayment; export const GlobalPreviousOrderOfferDetails = (state) => state?.BookingData?.previousOrderOfferDetails; +export const GlobalGetmultipleSearchDatas = (state) => + state?.BookingData?.getmultipleSearchDatas; export default BookingData.reducer; diff --git a/src/Pages/BookingScreen/Components/BSItemCards/BSComboItemCard.jsx b/src/Pages/BookingScreen/Components/BSItemCards/BSComboItemCard.jsx index cf7743e..3cd763d 100644 --- a/src/Pages/BookingScreen/Components/BSItemCards/BSComboItemCard.jsx +++ b/src/Pages/BookingScreen/Components/BSItemCards/BSComboItemCard.jsx @@ -59,6 +59,8 @@ import { changeCardData, GlobaldraggingComponent, GlobalCombocarddata, + GlobalGetmultipleSearchDatas, + getmultipleSearch, } from '../../../../Features/BookingScreen/BookingData/BookingData'; import { GlobalPreOrderAdditem, @@ -223,6 +225,7 @@ const BSComboItemCard = (props) => { SelectedGlobalCardColorDetail, shallowEqual ); + const GetmultipleSearchDatas = useSelector(GlobalGetmultipleSearchDatas, shallowEqual) const SelectedCardFont = useSelector(SelectedGlobalCardFont, shallowEqual); const CartOrderDetails = useSelector(GlobalOrderCardDetails, shallowEqual); const SelectedDatas = useSelector(GlobalSelectedDatas, shallowEqual); @@ -244,7 +247,7 @@ const BSComboItemCard = (props) => { const paymentloader = useSelector(GlobalPayementloader, shallowEqual); const SessionData = useSelector(StoredSessionData, shallowEqual); const GlobalCombocarddatas = useSelector(GlobalCombocarddata); -console.log(GlobalCombocarddatas, 'GlobalCombocarddatas combo card'); + console.log(GlobalCombocarddatas, 'GlobalCombocarddatas combo card'); const [messageType, setMessageType] = useState(null); const [messageData, setMessageData] = useState(null); const [repeatedModel, setRepeatedModel] = useState(false); @@ -297,7 +300,7 @@ console.log(GlobalCombocarddatas, 'GlobalCombocarddatas combo card'); : GlobalCombocarddatas : ''; // -console.log(cardData, 'cardData combo card'); + console.log(cardData, 'cardData combo card'); useEffect(() => { // fetchedit(); getPreferenceStock(); @@ -307,10 +310,25 @@ console.log(cardData, 'cardData combo card'); useEffect(() => { if (AppId && CompId && BranchId) { fetchedit(); + GetmultipleSearchData() } // dispatch(changepreOrder(false)); Commented to Add Normal Produts After Adding the Combo Pack !!!!!! Dont Touch Without Shifayath Permission }, [AppId, CompId, BranchId]); + const GetmultipleSearchData = async () => { + const data = { + AppId, + CompId, + BranchId, + }; + + try { + const response = await dispatch(getmultipleSearch(data)) + + } catch (error) { + console.error("Get Search Terms Error:", error); + } + }; useEffect(() => { setPreOrderSelectedProdNames([]); @@ -328,10 +346,13 @@ console.log(cardData, 'cardData combo card'); if (noSubcatCardData) { setNoSubcatCardData(); } - if (ProductSearch?.length > 5) { + + if (ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" +)) { setQuickAdd(true); } - }, [ProductSearch]); + }, [ProductSearch,GetmultipleSearchDatas]); // useEffect(() => { // if ( @@ -4620,7 +4641,9 @@ console.log(cardData, 'cardData combo card'); - ) : ProductSearch?.length > 5 && + ) : ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" +) && (cardData?.length == 0 || cardData == undefined) ? (
{/* cardData mohan 18-04-2025 */} @@ -4632,7 +4655,7 @@ console.log(cardData, 'cardData combo card'); cardData={cardDataForNewPrd} />
- ) : ( + ) : ( <>
{ SelectedGlobalCardColorDetail, shallowEqual ); + const GetmultipleSearchDatas = useSelector(GlobalGetmultipleSearchDatas, shallowEqual) const SelectedCardFont = useSelector(SelectedGlobalCardFont, shallowEqual); const CartOrderDetails = useSelector(GlobalOrderCardDetails, shallowEqual); const SelectedDatas = useSelector(GlobalSelectedDatas, shallowEqual); @@ -251,6 +254,7 @@ const BSItemCard = (props) => { const WSProductdata = useSelector(GlobalWSProduct, shallowEqual); const NewQrProductData = useSelector(GlobalNewQrProduct, shallowEqual); const ReportholdData = useSelector(GlobalReorderHoldDetails, shallowEqual); + console.log(GetmultipleSearchDatas, "GetmultipleSearchDatas") const ReorderProductData = useSelector( GlobalReorderProductDetails, shallowEqual @@ -1025,10 +1029,27 @@ const BSItemCard = (props) => { useEffect(() => { if (AppId && CompId && BranchId) { fetchedit(); + GetmultipleSearchData() } // dispatch(changepreOrder(false)); Commented to Add Normal Produts After Adding the Combo Pack !!!!!! Dont Touch Without Shifayath Permission }, [AppId, CompId, BranchId]); + + const GetmultipleSearchData = async () => { + const data = { + AppId, + CompId, + BranchId, + }; + + try { + const response = await dispatch(getmultipleSearch(data)) + + } catch (error) { + console.error("Get Search Terms Error:", error); + } + }; + useEffect(() => { setPreOrderSelectedProdNames([]); // dispatch(changePreOrderAdditem(null)); @@ -1043,10 +1064,14 @@ const BSItemCard = (props) => { if (noSubcatCardData) { setNoSubcatCardData(); } - if (ProductSearch?.length > 5) { + + if (ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" + )) { setQuickAdd(true); } - }, [ProductSearch]); + }, [ProductSearch, GetmultipleSearchDatas]); + useEffect(() => { if ( !initialRun && @@ -7433,45 +7458,50 @@ const BSItemCard = (props) => { - ) : ProductSearch?.length > 5 && - (cardData?.length == 0 || cardData == undefined) ? ( -
- {/* cardData mohan 18-04-2025 */} - -
- ) : ( - <> -
-
-
-
-
 
-
-
-
 
-
-
-
 
-
-
-
 
+ ) + + + : ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" + ) && + (cardData?.length == 0 || cardData == undefined) ? ( +
+ {/* cardData mohan 18-04-2025 */} + +
+ ) : ( + <> +
+
+
+
+
 
+
+
+
 
+
+
+
 
+
+
+
 
+
-
- - )} + + )} {paymentloader === true && (
diff --git a/src/Pages/BookingScreen/Components/BSItemCards/BSOtherServiceItemCard.jsx b/src/Pages/BookingScreen/Components/BSItemCards/BSOtherServiceItemCard.jsx index 1a103f7..b2b0f12 100644 --- a/src/Pages/BookingScreen/Components/BSItemCards/BSOtherServiceItemCard.jsx +++ b/src/Pages/BookingScreen/Components/BSItemCards/BSOtherServiceItemCard.jsx @@ -59,6 +59,8 @@ import { changeCardData, GlobaldraggingComponent, GlobalCombocarddata, + GlobalGetmultipleSearchDatas, + getmultipleSearch, } from '../../../../Features/BookingScreen/BookingData/BookingData'; import { GlobalPreOrderAdditem, @@ -92,7 +94,7 @@ import { import { useSortable } from '@dnd-kit/sortable'; import { CSS } from '@dnd-kit/utilities'; import { getCombolist } from '../../../../Features/ComboMaster/ComboMaster.js'; -import {GlobalOtherServicesdata, OtherServicesCardlistdata} from '../../../../Features/OtherServices/OtherServices.js'; +import { GlobalOtherServicesdata, OtherServicesCardlistdata } from '../../../../Features/OtherServices/OtherServices.js'; export function SortableCard({ id, children, item }) { @@ -124,7 +126,7 @@ export function SortableCard({ id, children, item }) { } const BSOtherServiceItemCard = (props) => { - const cardFunction = props.cardFunctionality; + const cardFunction = props.cardFunctionality; const applyOffer = useApplyOfferto_CardDetail(); const preferenceDatas = useSelector(PreferenceData, shallowEqual); @@ -183,9 +185,10 @@ const BSOtherServiceItemCard = (props) => { SelectedGlobalCardColorDetail, shallowEqual ); + const GetmultipleSearchDatas = useSelector(GlobalGetmultipleSearchDatas, shallowEqual) const SelectedCardFont = useSelector(SelectedGlobalCardFont, shallowEqual); const CartOrderDetails = useSelector(GlobalOrderCardDetails, shallowEqual); - console.log(CartOrderDetails,"CartOrderDetailsOTHERSERVICESITEMCARD"); + console.log(CartOrderDetails, "CartOrderDetailsOTHERSERVICESITEMCARD"); const SelectedDatas = useSelector(GlobalSelectedDatas, shallowEqual); const otherscarddata = useSelector(Globalothersdata, shallowEqual); const WSProductdata = useSelector(GlobalWSProduct, shallowEqual); @@ -247,7 +250,7 @@ const BSOtherServiceItemCard = (props) => { ? [] : SelectedDatas : ItemCard?.length == 0 || - (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0) + (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0) ? noSubcatCardData : ItemCard : ''; @@ -269,11 +272,25 @@ const BSOtherServiceItemCard = (props) => { useEffect(() => { if (AppId && CompId && BranchId) { fetchedit(); + GetmultipleSearchData() } // dispatch(changepreOrder(false)); Commented to Add Normal Produts After Adding the Combo Pack !!!!!! Dont Touch Without Shifayath Permission }, [AppId, CompId, BranchId]); + const GetmultipleSearchData = async () => { + const data = { + AppId, + CompId, + BranchId, + }; + try { + const response = await dispatch(getmultipleSearch(data)) + + } catch (error) { + console.error("Get Search Terms Error:", error); + } + }; useEffect(() => { setPreOrderSelectedProdNames([]); // dispatch(changePreOrderAdditem(null)); @@ -290,10 +307,13 @@ const BSOtherServiceItemCard = (props) => { if (noSubcatCardData) { setNoSubcatCardData(); } - if (ProductSearch?.length > 5) { + if (ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" + )) { setQuickAdd(true); } - }, [ProductSearch]); + + }, [ProductSearch, GetmultipleSearchDatas]); useEffect(() => { if ( @@ -402,103 +422,103 @@ const BSOtherServiceItemCard = (props) => { } }; -let Otherservicedata = [ - { - "CompId": 1, - "BranchId": 101, - "AppId": 2025, - "ConfigTypeId": 10, - "ConfigTypeIdName": "Other Services", - "ServiceCategories": [ - { - "ServiceCategory": 1, - "ServiceCategoryName": "Parking", - "ServiceDetails": [ - { - "ServiceId": "PK2W", - "ServiceCategory": 1, - "ServiceCategoryName": "Parking", - "ServiceName": "2-Wheeler Parking", - "ServiceShortName": "2W", - "TaxId": "T1", - "TaxName": "GST 5%", - "TaxAmt": 1.50, - "Rate": 30.00, - "TotalAmt": 31.50, - "ActiveStatus": "Active" - }, - { - "ServiceId": "PK4W", - "ServiceCategory": 1, - "ServiceCategoryName": "Parking", - "ServiceName": "4-Wheeler Parking", - "ServiceShortName": "4W", - "TaxId": "T1", - "TaxName": "GST 5%", - "TaxAmt": 2.50, - "Rate": 50.00, - "TotalAmt": 52.50, - "ActiveStatus": "Active" - } - ] - }, - { - "ServiceCategory": 2, - "ServiceCategoryName": "Entrance", - "ServiceDetails": [ - { - "ServiceId": "ENAD", - "ServiceCategory": 2, - "ServiceCategoryName": "Entrance", - "ServiceName": "Adult Entry", - "ServiceShortName": "Adult", - "TaxId": "T2", - "TaxName": "GST 12%", - "TaxAmt": 6.00, - "Rate": 50.00, - "TotalAmt": 56.00, - "ActiveStatus": "Active" - }, - { - "ServiceId": "ENCH", - "ServiceCategory": 2, - "ServiceCategoryName": "Entrance", - "ServiceName": "Child Entry", - "ServiceShortName": "Child", - "TaxId": "T2", - "TaxName": "GST 12%", - "TaxAmt": 3.00, - "Rate": 25.00, - "TotalAmt": 28.00, - "ActiveStatus": "Active" - } - ] - } - ] - } - ] + let Otherservicedata = [ + { + "CompId": 1, + "BranchId": 101, + "AppId": 2025, + "ConfigTypeId": 10, + "ConfigTypeIdName": "Other Services", + "ServiceCategories": [ + { + "ServiceCategory": 1, + "ServiceCategoryName": "Parking", + "ServiceDetails": [ + { + "ServiceId": "PK2W", + "ServiceCategory": 1, + "ServiceCategoryName": "Parking", + "ServiceName": "2-Wheeler Parking", + "ServiceShortName": "2W", + "TaxId": "T1", + "TaxName": "GST 5%", + "TaxAmt": 1.50, + "Rate": 30.00, + "TotalAmt": 31.50, + "ActiveStatus": "Active" + }, + { + "ServiceId": "PK4W", + "ServiceCategory": 1, + "ServiceCategoryName": "Parking", + "ServiceName": "4-Wheeler Parking", + "ServiceShortName": "4W", + "TaxId": "T1", + "TaxName": "GST 5%", + "TaxAmt": 2.50, + "Rate": 50.00, + "TotalAmt": 52.50, + "ActiveStatus": "Active" + } + ] + }, + { + "ServiceCategory": 2, + "ServiceCategoryName": "Entrance", + "ServiceDetails": [ + { + "ServiceId": "ENAD", + "ServiceCategory": 2, + "ServiceCategoryName": "Entrance", + "ServiceName": "Adult Entry", + "ServiceShortName": "Adult", + "TaxId": "T2", + "TaxName": "GST 12%", + "TaxAmt": 6.00, + "Rate": 50.00, + "TotalAmt": 56.00, + "ActiveStatus": "Active" + }, + { + "ServiceId": "ENCH", + "ServiceCategory": 2, + "ServiceCategoryName": "Entrance", + "ServiceName": "Child Entry", + "ServiceShortName": "Child", + "TaxId": "T2", + "TaxName": "GST 12%", + "TaxAmt": 3.00, + "Rate": 25.00, + "TotalAmt": 28.00, + "ActiveStatus": "Active" + } + ] + } + ] + } + ] -const processGlobalComboData = () => { + const processGlobalComboData = () => { - const serviceCategories = GlobalOtherServicescarddatas?.[0]?.ServiceDetails; + const serviceCategories = GlobalOtherServicescarddatas?.[0]?.ServiceDetails; - if (!Array.isArray(serviceCategories)) return []; + if (!Array.isArray(serviceCategories)) return []; - // Flatten all ServiceDetails into a single array - const allServiceDetails = serviceCategories.map((category) => category.ServiceDetails || []); + // Flatten all ServiceDetails into a single array + const allServiceDetails = serviceCategories.map((category) => category.ServiceDetails || []); - const comboList = serviceCategories.map((item, index) => ({ - ...item, - id: `${item.ServiceName}-${index}`, - ProdName: item.ServiceName, - ServiceName: item.ServiceName, - })); + const comboList = serviceCategories.map((item, index) => ({ + ...item, + id: `${item.ServiceName}-${index}`, + ProdName: item.ServiceName, + ServiceName: item.ServiceName, + })); - return comboList; -}; + return comboList; + }; -const comboList = processGlobalComboData() || []; + const comboList = processGlobalComboData() || []; useEffect(() => { @@ -661,13 +681,13 @@ const comboList = processGlobalComboData() || []; (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 ); @@ -676,9 +696,9 @@ const comboList = processGlobalComboData() || []; (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 ); @@ -720,11 +740,11 @@ const comboList = processGlobalComboData() || []; (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 ); @@ -733,9 +753,9 @@ const comboList = processGlobalComboData() || []; (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 ); @@ -809,13 +829,13 @@ const comboList = processGlobalComboData() || []; (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 ); @@ -823,11 +843,11 @@ const comboList = processGlobalComboData() || []; let Isincartonepc = CartOrderDetails?.filter( (cartItem) => cartItem?.ProdId === - qtydata?.ProductDetail?.[QtyIndex]?.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 === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice) !cartItem?.SalesId ); @@ -897,11 +917,11 @@ const comboList = processGlobalComboData() || []; (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 ); if (onePeiceFlow) { @@ -909,9 +929,9 @@ const comboList = processGlobalComboData() || []; (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 === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice) !cartItem?.SalesId ); @@ -1006,15 +1026,15 @@ const comboList = processGlobalComboData() || []; 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 ); @@ -1022,11 +1042,11 @@ const comboList = processGlobalComboData() || []; 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 ); @@ -1104,15 +1124,15 @@ const comboList = processGlobalComboData() || []; 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 ); @@ -1120,11 +1140,11 @@ const comboList = processGlobalComboData() || []; 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 ); @@ -1555,7 +1575,7 @@ const comboList = processGlobalComboData() || []; 0 || - record.StockCount === 'Stock Not Maintained' + record.StockCount === 'Stock Not Maintained' ? { color: '#000', cursor: 'pointer' } : { color: '#f49898', cursor: 'not-allowed' } } @@ -1585,7 +1605,7 @@ const comboList = processGlobalComboData() || []; 0 || - record.StockCount === 'Stock Not Maintained' + record.StockCount === 'Stock Not Maintained' ? { color: '#000', cursor: 'pointer' } : { color: '#f49898', cursor: 'not-allowed' } } @@ -1615,7 +1635,7 @@ const comboList = processGlobalComboData() || []; 0 || - record.StockCount === 'Stock Not Maintained' + record.StockCount === 'Stock Not Maintained' ? { color: '#000', cursor: 'pointer' } : { color: '#f49898', cursor: 'not-allowed' } } @@ -1659,17 +1679,17 @@ const comboList = processGlobalComboData() || []; qtydata?.ProductDetail?.[QtyIndex]?.StockAvailable === 'Y' ? onePeiceFlow ? returnVariantStock( - qtydata?.ProductDetail?.[QtyIndex]?.ProdId, - item?.OverAllPcs, - CartOrderDetails, - item?.ProdVariantName - ) + qtydata?.ProductDetail?.[QtyIndex]?.ProdId, + item?.OverAllPcs, + CartOrderDetails, + item?.ProdVariantName + ) : returnVariantStock( - qtydata?.ProductDetail?.[QtyIndex]?.ProdId, - item?.OverAllQty, - CartOrderDetails, - item?.ProdVariantName - ) + qtydata?.ProductDetail?.[QtyIndex]?.ProdId, + item?.OverAllQty, + CartOrderDetails, + item?.ProdVariantName + ) : 'Stock Not Maintained', }); }); @@ -1678,7 +1698,7 @@ const comboList = processGlobalComboData() || []; if (WeightScalePort === true) { if ( a?.ProductDetail?.[QtyIndex]?.UomName?.toLowerCase() === - 'KGS'?.toLowerCase() && + 'KGS'?.toLowerCase() && a?.ProductDetail?.[QtyIndex]?.Size == '1' ) { if (WeightScaleWeight > 0 && WeightScaleWeight !== null) { @@ -1686,13 +1706,13 @@ const comboList = processGlobalComboData() || []; parseFloat( onePcs ? (a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[ - VarientIndex - ]?.StockDetails?.[stockIndex]?.OnePcsPrice / - 1000) * - (parseFloat(WeightScaleWeight) * 1000) + VarientIndex + ]?.StockDetails?.[stockIndex]?.OnePcsPrice / + 1000) * + (parseFloat(WeightScaleWeight) * 1000) : a?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[ - VarientIndex - ]?.StockDetails?.[stockIndex]?.SellPrice / 1000 + VarientIndex + ]?.StockDetails?.[stockIndex]?.SellPrice / 1000 ) * (parseFloat(WeightScaleWeight) * 1000); let data = { @@ -1755,9 +1775,9 @@ const comboList = processGlobalComboData() || []; ?.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: @@ -1869,19 +1889,19 @@ const comboList = processGlobalComboData() || []; ?.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, @@ -2802,8 +2822,8 @@ const comboList = processGlobalComboData() || []; // setModelstock(true); // // form.resetFields(['ProdName']); // } else { - onAutocompleteChange(selectedOption); - // form.resetFields(['ProdName']); + onAutocompleteChange(selectedOption); + // form.resetFields(['ProdName']); // } }; @@ -2885,7 +2905,7 @@ const comboList = processGlobalComboData() || []; const onAutocompleteChange = async (selectedOption) => { -console.log(selectedOption,"selectedOptionselectedOption"); + console.log(selectedOption, "selectedOptionselectedOption"); let data = { @@ -2913,9 +2933,9 @@ console.log(selectedOption,"selectedOptionselectedOption"); TotalSellPrice: selectedOption?.TotalAmt, Price: selectedOption.TotalAmt, - TaxAmt:selectedOption?.TaxAmt, - TaxId:selectedOption?.TaxId, - TaxName:selectedOption?.TaxName, + TaxAmt: selectedOption?.TaxAmt, + TaxId: selectedOption?.TaxId, + TaxName: selectedOption?.TaxName, TaxPercentage: selectedOption?.TaxPercentage, QRCode: selectedOption?.ComboInwardDetails?.[0]?.QRCode, @@ -2927,23 +2947,23 @@ console.log(selectedOption,"selectedOptionselectedOption"); BookingTypeName: BookingType, StockAvailable: 'N', - - // Size: 1, - // UomName: 'PCS', - // OfferPrice: selectedOption?.ComboInwardDetails?.[0]?.OfferPrice, - // OfferValue: - // selectedOption?.ComboInwardDetails?.[0]?.OfferType === 'F' - // ? selectedOption?.ComboInwardDetails?.[0]?.OfferPrice - // : (OrderRate * selectedOption?.ComboInwardDetails?.[0]?.OfferPrice) / - // 100, - // SinglePc: 'N', + + // Size: 1, + // UomName: 'PCS', + // OfferPrice: selectedOption?.ComboInwardDetails?.[0]?.OfferPrice, + // OfferValue: + // selectedOption?.ComboInwardDetails?.[0]?.OfferType === 'F' + // ? selectedOption?.ComboInwardDetails?.[0]?.OfferPrice + // : (OrderRate * selectedOption?.ComboInwardDetails?.[0]?.OfferPrice) / + // 100, + // SinglePc: 'N', }; await AddOrderDetails(data); }; const AddOrderDetails = async (item) => { -console.log("AddOrderDetails item",item) + console.log("AddOrderDetails item", item) if (preOrder) { let Response = await dispatch( getConfigType({ TypeName: 'Booking Type' }) @@ -2963,7 +2983,7 @@ console.log("AddOrderDetails item",item) if (Condition !== undefined && Condition === true) { setMessageData('Dublicate Data'); setMessageType('error'); - } + } else { let OfferPri = item?.OfferType === 'F' @@ -3030,7 +3050,7 @@ console.log("AddOrderDetails item",item) dispatch(changepreOrderList(Data)); } } - } + } else { dispatch(changeHoldOrderDtl(false)); @@ -3099,45 +3119,45 @@ console.log("AddOrderDetails item",item) ); const BookingTypeProd = item?.BookingTypeName; - if (isItemInCart && BookingTypeProd != 'Dine In' && OrderType != 'Hold' ) { + if (isItemInCart && BookingTypeProd != 'Dine In' && OrderType != 'Hold') { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: - isItemInCart?.OfferPrice > 0 - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - (isItemInCart?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.OfferPrice) / - 100) - : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - // TotalAmt: ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate), - OfferValue: - item?.OfferType === 'F' + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: + isItemInCart?.OfferPrice > 0 + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + (isItemInCart?.OfferType === 'F' ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : isItemInCart?.OfferPrice, + : ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.OfferPrice) / + 100) + : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + // TotalAmt: ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate), + OfferValue: + item?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : isItemInCart?.OfferPrice, - TaxAmt: ( + 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), - }; + }; dispatch( changeOrderCardDetails([ @@ -3145,12 +3165,12 @@ console.log("AddOrderDetails item",item) ...OtherorderDataforNormal, ]) ); - } + } else { - const isGroupService = isItemInCart?.ServiceType == 'G'; - if (isGroupService) { - const UpdatedCartItem = + const isGroupService = isItemInCart?.ServiceType == 'G'; + if (isGroupService) { + const UpdatedCartItem = // if the item is already in the cart, increase the quantity of the item { ...isItemInCart, @@ -3158,20 +3178,20 @@ console.log("AddOrderDetails item",item) TotalAmt: isItemInCart?.OfferPrice > 0 ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - (isItemInCart?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.OfferPrice) / - 100) + (isItemInCart?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.OfferPrice) / + 100) : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, OfferValue: item?.OfferType === 'F' ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice : ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.OfferPrice) / - 100, + isItemInCart?.OrderRate * + isItemInCart?.OfferPrice) / + 100, // TotalAmt: ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate), TaxAmt: ( ((isItemInCart?.OrderQty + 1) * @@ -3189,59 +3209,59 @@ console.log("AddOrderDetails item",item) ).toFixed(2), }; - dispatch( - changeOrderCardDetails([ - ...OtherorderDataforNormal, - UpdatedCartItem, - ]) - ); - } else { - // ❌ Not a group service - setMessageType('error'); - setMessageData("Service Already Exist") - } + dispatch( + changeOrderCardDetails([ + ...OtherorderDataforNormal, + UpdatedCartItem, + ]) + ); + } else { + // ❌ Not a group service + setMessageType('error'); + setMessageData("Service Already Exist") + } -} + } } else if (isItemInCart && BookingTypeProd === 'Dine In' && OrderType != 'Hold') { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: - isItemInCart?.OfferPrice > 0 - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - (isItemInCart?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.OfferPrice) / - 100) - : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - OfferValue: - item?.OfferType === 'F' + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: + isItemInCart?.OfferPrice > 0 + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + (isItemInCart?.OfferType === 'F' ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : isItemInCart?.OfferPrice, + : ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.OfferPrice) / + 100) + : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + OfferValue: + item?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : isItemInCart?.OfferPrice, - // TotalAmt: ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate), - TaxAmt: ( + // 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), - }; + }; dispatch( changeOrderCardDetails([ @@ -3249,44 +3269,44 @@ console.log("AddOrderDetails item",item) ...OtherorderDataforNormal, ]) ); - } + } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCart, - OrderQty: isItemInCart?.OrderQty + 1, - TotalAmt: - isItemInCart?.OfferPrice > 0 - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - - (isItemInCart?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemInCart?.OrderQty + 1) * - isItemInCart?.OrderRate * - isItemInCart?.OfferPrice) / - 100) - : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, - OfferValue: - item?.OfferType === 'F' + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCart, + OrderQty: isItemInCart?.OrderQty + 1, + TotalAmt: + isItemInCart?.OfferPrice > 0 + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate - + (isItemInCart?.OfferType === 'F' ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : isItemInCart?.OfferPrice, + : ((isItemInCart?.OrderQty + 1) * + isItemInCart?.OrderRate * + isItemInCart?.OfferPrice) / + 100) + : (isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate, + OfferValue: + item?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : isItemInCart?.OfferPrice, - // TotalAmt: ((isItemInCart?.OrderQty + 1) * isItemInCart?.OrderRate), - TaxAmt: ( + // 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), - }; + }; dispatch( changeOrderCardDetails([ @@ -3295,48 +3315,48 @@ console.log("AddOrderDetails item",item) ]) ); } - } + } else if (isItemInCartHold && OrderType === 'Hold') { if (BillOrderPre === 'Y') { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCartHold, - OrderQty: isItemInCartHold?.OrderQty + 1, - TotalAmt: - isItemInCartHold?.OfferPrice > 0 - ? (isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate - - (isItemInCartHold?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.OfferPrice) / - 100) - : (isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate, - OfferValue: - item?.OfferType === 'F' + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCartHold, + OrderQty: isItemInCartHold?.OrderQty + 1, + TotalAmt: + isItemInCartHold?.OfferPrice > 0 + ? (isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate - + (isItemInCartHold?.OfferType === 'F' ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : isItemInCart?.OfferPrice, + : ((isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.OfferPrice) / + 100) + : (isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate, + OfferValue: + item?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : isItemInCart?.OfferPrice, - // TotalAmt: ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate), - TaxAmt: ( + // TotalAmt: ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate), + TaxAmt: ( + ((isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.TaxPercentage) / + (100 + isItemInCartHold?.TaxPercentage) + ).toFixed(2), + WithoutTaxRate: + (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - + ( ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate * isItemInCartHold?.TaxPercentage) / (100 + isItemInCartHold?.TaxPercentage) ).toFixed(2), - WithoutTaxRate: - (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - - ( - ((isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.TaxPercentage) / - (100 + isItemInCartHold?.TaxPercentage) - ).toFixed(2), - }; + }; dispatch( changeOrderCardDetails([ @@ -3344,46 +3364,46 @@ console.log("AddOrderDetails item",item) ...OtherorderDataforNormalWithoutSalesId, ]) ); - } + } else { const UpdatedCartItem = - // if the item is already in the cart, increase the quantity of the item - { - ...isItemInCartHold, - OrderQty: isItemInCartHold?.OrderQty + 1, - TotalAmt: - isItemInCartHold?.OfferPrice > 0 - ? (isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate - - (isItemInCartHold?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.OfferPrice) / - 100) - : (isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate, - OfferValue: - item?.OfferType === 'F' + // if the item is already in the cart, increase the quantity of the item + { + ...isItemInCartHold, + OrderQty: isItemInCartHold?.OrderQty + 1, + TotalAmt: + isItemInCartHold?.OfferPrice > 0 + ? (isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate - + (isItemInCartHold?.OfferType === 'F' ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : isItemInCart?.OfferPrice, + : ((isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.OfferPrice) / + 100) + : (isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate, + OfferValue: + item?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : isItemInCart?.OfferPrice, - // TotalAmt: ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate), - TaxAmt: ( + // TotalAmt: ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate), + TaxAmt: ( + ((isItemInCartHold?.OrderQty + 1) * + isItemInCartHold?.OrderRate * + isItemInCartHold?.TaxPercentage) / + (100 + isItemInCartHold?.TaxPercentage) + ).toFixed(2), + WithoutTaxRate: + (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - + ( ((isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate * isItemInCartHold?.TaxPercentage) / (100 + isItemInCartHold?.TaxPercentage) ).toFixed(2), - WithoutTaxRate: - (isItemInCartHold?.OrderQty + 1) * isItemInCartHold?.OrderRate - - ( - ((isItemInCartHold?.OrderQty + 1) * - isItemInCartHold?.OrderRate * - isItemInCartHold?.TaxPercentage) / - (100 + isItemInCartHold?.TaxPercentage) - ).toFixed(2), - }; + }; dispatch( changeOrderCardDetails([ @@ -3392,7 +3412,7 @@ console.log("AddOrderDetails item",item) ]) ); } - } + } else if (isItemNotInDine && BookingTypeProd == 'Dine In' && OrderType != 'Hold') { if (BillOrderPre === 'Y') { @@ -3402,12 +3422,12 @@ console.log("AddOrderDetails item",item) TotalAmt: isItemNotInDine?.OfferPrice > 0 ? (isItemNotInDine?.OrderQty + 1) * isItemNotInDine?.OrderRate - - (isItemNotInDine?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemNotInDine?.OrderQty + 1) * - isItemNotInDine?.OrderRate * - isItemNotInDine?.OfferPrice) / - 100) + (isItemNotInDine?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : ((isItemNotInDine?.OrderQty + 1) * + isItemNotInDine?.OrderRate * + isItemNotInDine?.OfferPrice) / + 100) : (isItemNotInDine?.OrderQty + 1) * isItemNotInDine?.OrderRate, OfferValue: item?.OfferType === 'F' @@ -3438,7 +3458,7 @@ console.log("AddOrderDetails item",item) ...OtherOrderDatawithsales, ]) ); - } + } else { const UpdatedCartItem = { ...isItemNotInDine, @@ -3446,12 +3466,12 @@ console.log("AddOrderDetails item",item) TotalAmt: isItemNotInDine?.OfferPrice > 0 ? (isItemNotInDine?.OrderQty + 1) * isItemNotInDine?.OrderRate - - (isItemNotInDine?.OfferType === 'F' - ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice - : ((isItemNotInDine?.OrderQty + 1) * - isItemNotInDine?.OrderRate * - isItemNotInDine?.OfferPrice) / - 100) + (isItemNotInDine?.OfferType === 'F' + ? (isItemInCart?.OrderQty + 1) * isItemInCart?.OfferPrice + : ((isItemNotInDine?.OrderQty + 1) * + isItemNotInDine?.OrderRate * + isItemNotInDine?.OfferPrice) / + 100) : (isItemNotInDine?.OrderQty + 1) * isItemNotInDine?.OrderRate, OfferValue: item?.OfferType === 'F' @@ -3489,137 +3509,137 @@ console.log("AddOrderDetails item",item) if (item?.OtherProduct === 'Others') { BillOrderPre === 'Y' ? dispatch( - changeOrderCardDetails([ - { - ...item, - // TotalAmt: (((item?.OrderQty + 1) * item?.OrderRate)- (item?.OfferType === "F" ?item?.OfferPrice :(((item?.OrderQty + 1) * item?.OrderRate) * item?.OfferPrice)/100)), + changeOrderCardDetails([ + { + ...item, + // TotalAmt: (((item?.OrderQty + 1) * item?.OrderRate)- (item?.OfferType === "F" ?item?.OfferPrice :(((item?.OrderQty + 1) * item?.OrderRate) * item?.OfferPrice)/100)), - 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), - }, - ...CartOrderDetails, - ]) - ) // if the item is not in the cart, add the item to the cart - : dispatch( - changeOrderCardDetails([ - ...CartOrderDetails, - { - ...item, - TotalAmt: item?.OrderQty * item?.OrderRate, - - // TotalAmt: (((item?.OrderQty + 1) * item?.OrderRate)- (item?.OfferType === "F" ?item?.OfferPrice :(((item?.OrderQty + 1) * item?.OrderRate) * item?.OfferPrice)/100)), - 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), - }, - ]) - ); - } - -// else { -// const baseItem = { -// ...item, -// OrderQty: 1, -// OfferPrice: item?.OfferPrice, -// TotalAmt: -// item?.OfferPrice > 0 -// ? item?.OrderRate - -// (item?.OfferType === 'F' -// ? item?.OfferPrice -// : (item?.OrderRate * item?.OfferPrice) / 100) -// : item?.OrderRate, -// TaxAmt: ( -// (item?.OrderRate * item?.TaxPercentage) / -// (100 + item?.TaxPercentage) -// ).toFixed(2), -// WithoutTaxRate: ( -// item?.OrderRate - -// (item?.OrderRate * item?.TaxPercentage) / -// (100 + item?.TaxPercentage) -// ).toFixed(2), -// }; - -// if (item?.ServiceType == 'I') { -// // Always add as a separate entry (individual) -// dispatch(changeOrderCardDetails([ -// ...CartOrderDetails, -// baseItem, -// ])); -// } else { - -// // Use your existing logic with BillOrderPre check -// BillOrderPre === 'Y' -// ? dispatch(changeOrderCardDetails([ -// baseItem, -// ...CartOrderDetails, -// ])) -// : dispatch(changeOrderCardDetails([ -// ...CartOrderDetails, -// baseItem, -// ])); -// } -// } - - else { - const baseItem = { - ...item, - OrderQty: 1, - OfferPrice: item?.OfferPrice, - TotalAmt: - item?.OfferPrice > 0 - ? item?.OrderRate - - (item?.OfferType === 'F' - ? item?.OfferPrice - : (item?.OrderRate * item?.OfferPrice) / 100) - : item?.OrderRate, - TaxAmt: ( - (item?.OrderRate * item?.TaxPercentage) / - (100 + item?.TaxPercentage) - ).toFixed(2), - WithoutTaxRate: ( - item?.OrderRate - - (item?.OrderRate * item?.TaxPercentage) / + TotalAmt: item?.OrderQty * item?.OrderRate, + TaxAmt: ( + (item?.OrderQty * item?.OrderRate * item?.TaxPercentage) / (100 + item?.TaxPercentage) - ).toFixed(2), - }; + ).toFixed(2), + WithoutTaxRate: ( + item?.OrderQty * item?.OrderRate - + (item?.OrderQty * item?.OrderRate * item?.TaxPercentage) / + (100 + item?.TaxPercentage) + ).toFixed(2), + }, + ...CartOrderDetails, + ]) + ) // if the item is not in the cart, add the item to the cart + : dispatch( + changeOrderCardDetails([ + ...CartOrderDetails, + { + ...item, + TotalAmt: item?.OrderQty * item?.OrderRate, - if (item?.ServiceType === 'I') { + // TotalAmt: (((item?.OrderQty + 1) * item?.OrderRate)- (item?.OfferType === "F" ?item?.OfferPrice :(((item?.OrderQty + 1) * item?.OrderRate) * item?.OfferPrice)/100)), + 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), + }, + ]) + ); + } - // Add the item and include a __index to track vehicle number uniquely - const updatedCart = [...CartOrderDetails, baseItem].map((itm, idx) => ({ - ...itm, - __index: idx, // Temporary index used for vehicle number assignment - })); + // else { + // const baseItem = { + // ...item, + // OrderQty: 1, + // OfferPrice: item?.OfferPrice, + // TotalAmt: + // item?.OfferPrice > 0 + // ? item?.OrderRate - + // (item?.OfferType === 'F' + // ? item?.OfferPrice + // : (item?.OrderRate * item?.OfferPrice) / 100) + // : item?.OrderRate, + // TaxAmt: ( + // (item?.OrderRate * item?.TaxPercentage) / + // (100 + item?.TaxPercentage) + // ).toFixed(2), + // WithoutTaxRate: ( + // item?.OrderRate - + // (item?.OrderRate * item?.TaxPercentage) / + // (100 + item?.TaxPercentage) + // ).toFixed(2), + // }; - dispatch(changeOrderCardDetails(updatedCart)); - } else { + // if (item?.ServiceType == 'I') { + // // Always add as a separate entry (individual) + // dispatch(changeOrderCardDetails([ + // ...CartOrderDetails, + // baseItem, + // ])); + // } else { - // Use existing flow with optional BillOrderPre control - // const updatedCart = - // BillOrderPre === 'Y' - // ? [baseItem, ...CartOrderDetails] - // : [...CartOrderDetails, baseItem]; - const updatedCart = [...CartOrderDetails, baseItem].map((itm, idx) => ({ - ...itm, - __index: idx, // Temporary index used for vehicle number assignment - })); - dispatch(changeOrderCardDetails(updatedCart)); - } - } + // // Use your existing logic with BillOrderPre check + // BillOrderPre === 'Y' + // ? dispatch(changeOrderCardDetails([ + // baseItem, + // ...CartOrderDetails, + // ])) + // : dispatch(changeOrderCardDetails([ + // ...CartOrderDetails, + // baseItem, + // ])); + // } + // } + + else { + const baseItem = { + ...item, + OrderQty: 1, + OfferPrice: item?.OfferPrice, + TotalAmt: + item?.OfferPrice > 0 + ? item?.OrderRate - + (item?.OfferType === 'F' + ? item?.OfferPrice + : (item?.OrderRate * item?.OfferPrice) / 100) + : item?.OrderRate, + TaxAmt: ( + (item?.OrderRate * item?.TaxPercentage) / + (100 + item?.TaxPercentage) + ).toFixed(2), + WithoutTaxRate: ( + item?.OrderRate - + (item?.OrderRate * item?.TaxPercentage) / + (100 + item?.TaxPercentage) + ).toFixed(2), + }; + + if (item?.ServiceType === 'I') { + + // Add the item and include a __index to track vehicle number uniquely + const updatedCart = [...CartOrderDetails, baseItem].map((itm, idx) => ({ + ...itm, + __index: idx, // Temporary index used for vehicle number assignment + })); + + dispatch(changeOrderCardDetails(updatedCart)); + } else { + + // Use existing flow with optional BillOrderPre control + // const updatedCart = + // BillOrderPre === 'Y' + // ? [baseItem, ...CartOrderDetails] + // : [...CartOrderDetails, baseItem]; + const updatedCart = [...CartOrderDetails, baseItem].map((itm, idx) => ({ + ...itm, + __index: idx, // Temporary index used for vehicle number assignment + })); + dispatch(changeOrderCardDetails(updatedCart)); + } + } } @@ -3747,8 +3767,8 @@ console.log("AddOrderDetails item",item) Cartdata?.[0]?.OfferType === 'F' ? Cartdata?.[0]?.OfferPrice : (qtydata?.[0]?.ComboInwardDetails?.[0]?.TotalSellPrice * - Cartdata?.[0]?.OfferPrice) / - 100, + Cartdata?.[0]?.OfferPrice) / + 100, OfferPrice: Cartdata?.[0]?.OfferPrice, SinglePc: 'N', }; @@ -3790,9 +3810,9 @@ console.log("AddOrderDetails item",item) return DropDown && Array.isArray(DropDown) ? DropDown.map((item) => ({ - label: `${item.ComboName}`, // Display the combo name - value: `${item.ComboId}`, // Use combo ID as the value - })) + label: `${item.ComboName}`, // Display the combo name + value: `${item.ComboId}`, // Use combo ID as the value + })) : []; // }); }; @@ -3919,38 +3939,38 @@ console.log("AddOrderDetails item",item) cardFunction?.Background && (SelectedCardColor ? SelectedCardColor?.[ - 'BackgroundColor' - ] + 'BackgroundColor' + ] : ''), padding: !cardFunction?.ImageUp && - !cardFunction?.ImageDown + !cardFunction?.ImageDown ? cardFunction?.SmallImage && - '5px 9px' + '5px 9px' : '8px 2px', flexDirection: cardFunction?.ImageRight && - 'row-reverse' + 'row-reverse' ? cardFunction?.ImageRight && - 'row-reverse' + 'row-reverse' : cardFunction?.ImageUp && 'column' ? cardFunction?.ImageUp && 'column' : cardFunction?.ImageDown && - 'column-reverse' + 'column-reverse' ? cardFunction?.ImageDown && - 'column-reverse' + 'column-reverse' : cardFunction?.ImageLeft && - 'row', + 'row', borderRadius: cardFunction?.EdgeCurve && '6px', width: !cardFunction?.ImageUp && - !cardFunction?.ImageDown && - !cardFunction?.BigImage && - !cardFunction?.ImageRight && - cardFunction?.SmallImage && - (cardFunction?.ImageUp || - cardFunction?.ImageDown) + !cardFunction?.ImageDown && + !cardFunction?.BigImage && + !cardFunction?.ImageRight && + cardFunction?.SmallImage && + (cardFunction?.ImageUp || + cardFunction?.ImageDown) ? '6rem' : cardFunction?.BigImage && '9rem', height: @@ -3965,56 +3985,56 @@ console.log("AddOrderDetails item",item) : 'BSItemCard-container' } onClick={(e) => { - // if ( - // !( - // ( - // item?.OverallQuantity !== - // undefined && - // returnCount( - // item?.ComboName, - // item?.OverallQuantity, - // CartOrderDetails - // ) > 0 - // ) - // // || - // // item?.OverallQuantity > 0 - // ) - // ) { - // e.stopPropagation(); - // } else { - CardOnclick(item); - // } + // if ( + // !( + // ( + // item?.OverallQuantity !== + // undefined && + // returnCount( + // item?.ComboName, + // item?.OverallQuantity, + // CartOrderDetails + // ) > 0 + // ) + // // || + // // item?.OverallQuantity > 0 + // ) + // ) { + // e.stopPropagation(); + // } else { + CardOnclick(item); + // } }} data-aos="zoom-in" data-aos-duration="600" > {(cardFunction?.BigImage || cardFunction?.SmallImage) && ( - - )} + cardFunction?.ImageLeft || + cardFunction?.ImageUp || + cardFunction?.ImageDown + ? '3rem' + : cardFunction?.BigImage && '7rem' + : '5rem', + }} + className={ + cardFunction?.SmallImage + ? 'BSItemCard-image-smallimage' + : 'BSItemCard-image' + } + src={item?.ImageUrl === null ? defaultimage : item?.ImageUrl ? item?.ImageUrl + : defaultimage + } + alt="" + /> + )}
)} */}

- { cardFunction?.Price && ( -

- ₹{' '} - { - item?.TotalAmt - } -   - {/* {item?.TotalAmt}  */} - {/* {ItemSellingPrice(item)} */} - {/* + {cardFunction?.Price && ( +

+ ₹{' '} + { + item?.TotalAmt + } +   + {/* {item?.TotalAmt}  */} + {/* {ItemSellingPrice(item)} */} + {/* {'(1 Combo Pack)'} */} -

- ) - } +

+ ) + }
{cardFunction?.StockCount && @@ -4186,213 +4206,213 @@ console.log("AddOrderDetails item",item) )}
- ) : + ) : - ( - <> - {globaldata && ( - pickData(e, item)} - style={{ - position: 'absolute', - zIndex: 1, - transform: 'scale(1.5)', - cursor: 'pointer', - }} - checked={( - globalAllItemdata || EditfavItems - )?.some( - // (a) => a?.ProdName === item?.ProdName - (a) => - a?.ProdName === item?.ProdName && - a?.ProdCat === item?.ProdCat - )} - /> - )} - -
{ - // if ( - // !( - // item?.OverallQuantity !== undefined && - // returnCount( - // item?.ComboName, - // item?.OverallQuantity, - // CartOrderDetails - // ) > 0 - // ) - // ) { - // e.stopPropagation(); - // } else { - CardOnclick(item); - // } - }} - // data-aos="zoom-in" data-aos-duration="600" - > - {(cardFunction?.BigImage || - cardFunction?.SmallImage) && ( - + {globaldata && ( + pickData(e, item)} style={{ - objectFit: - cardFunction?.BigImage && '', - height: !cardFunction?.BigImage - ? (!cardFunction?.BigImage && - cardFunction?.SmallImage) || - cardFunction?.ImageLeft || - cardFunction?.ImageUp || - cardFunction?.ImageDown - ? '3rem' - : cardFunction?.BigImage && '7rem' - : '4rem', + position: 'absolute', + zIndex: 1, + transform: 'scale(1.5)', + cursor: 'pointer', }} - className={ - cardFunction?.SmallImage - ? 'BSItemCard-image-smallimage' - : 'BSItemCard-image' - } - src={ - item?.ProductDetail?.[0]?.ProdLogo === - '' - ? defaultimage - : item?.ProductDetail?.[0]?.ProdLogo - ? item?.ProductDetail?.[0] - ?.ProdLogo - : defaultimage - } - alt="" + checked={( + globalAllItemdata || EditfavItems + )?.some( + // (a) => a?.ProdName === item?.ProdName + (a) => + a?.ProdName === item?.ProdName && + a?.ProdCat === item?.ProdCat + )} /> )} +
{ + // if ( + // !( + // item?.OverallQuantity !== undefined && + // returnCount( + // item?.ComboName, + // item?.OverallQuantity, + // CartOrderDetails + // ) > 0 + // ) + // ) { + // e.stopPropagation(); + // } else { + CardOnclick(item); + // } + }} + // data-aos="zoom-in" data-aos-duration="600" > -

+ )} +

+

- {item?.ProdName}{' '} - {/* {(item?.OverallQuantity !== undefined && + // Width: cardFunction?.BigImage && "70px", + fontSize: + !cardFunction?.BigImage && + !cardFunction?.SmallImage && + '12px', //naresh27 + whiteSpace: + !cardFunction?.BigImage && + 'pre-wrap', + margin: 'auto', + fontFamily: SelectedCardFont + ? SelectedCardFont + : '', + color: SelectedCardColor + ? SelectedCardColor?.['FontColor'] + : '', + textOverflow: 'ellipsis', + }} + className="BSItemCard-itemName" + > + {item?.ProdName}{' '} + {/* {(item?.OverallQuantity !== undefined && returnCount( item?.ComboName, item?.OverallQuantity, @@ -4412,80 +4432,80 @@ console.log("AddOrderDetails item",item) No Stock

)} */} -

- {cardFunction?.Price && - ((item?.OverallQuantity !== undefined && - item?.OverallQuantity !== 0 && - item?.OverallQuantity !== null) || - item?.ProductDetail?.some( - (item) => - item?.StockAvailable !== 'Y' - )) && ( -

+ {cardFunction?.Price && + ((item?.OverallQuantity !== undefined && + item?.OverallQuantity !== 0 && + item?.OverallQuantity !== null) || + item?.ProductDetail?.some( + (item) => + item?.StockAvailable !== 'Y' + )) && ( +

+ ₹ {ItemSellingPrice(item)}  + {/* {item?.ProductDetail?.[0]?.ProdVariantDetails?.[0]?.StockDetails?.[0]?.SellPrice}  */} + {/* {ItemSellingPrice(item)} */} + + ({ItemSize(item)} + {ItemUomName(item)}) + +

+ )} +
+ + {cardFunction?.StockCount && + item?.OverallQuantity !== undefined && + item?.OverallQuantity !== 0 && ( +
- ₹ {ItemSellingPrice(item)}  - {/* {item?.ProductDetail?.[0]?.ProdVariantDetails?.[0]?.StockDetails?.[0]?.SellPrice}  */} - {/* {ItemSellingPrice(item)} */} - - ({ItemSize(item)} - {ItemUomName(item)}) - -

+ {item?.OverallQuantity !== null && ( + + )} +
)}
- - {cardFunction?.StockCount && - item?.OverallQuantity !== undefined && - item?.OverallQuantity !== 0 && ( -
- {item?.OverallQuantity !== null && ( - - )} -
- )} -
- - ) - } + + ) + }
))} @@ -4493,7 +4513,9 @@ console.log("AddOrderDetails item",item) - ) : ProductSearch?.length > 5 && + ) : ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" + ) && (cardData?.length == 0 || cardData == undefined) ? (
{/* cardData mohan 18-04-2025 */} @@ -4821,16 +4843,16 @@ console.log("AddOrderDetails item",item) ]?.ProdVariantName?.toLowerCase()?.includes( 'variant' ) && ( - - ( - { - qtydata?.ProductDetail?.[QtyIndex] - ?.ProdVariantDetails?.[VarientIndex] - ?.ProdVariantName - } - ){' '} - - )} + + ( + { + qtydata?.ProductDetail?.[QtyIndex] + ?.ProdVariantDetails?.[VarientIndex] + ?.ProdVariantName + } + ){' '} + + )}

diff --git a/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx b/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx index 9c5b35c..cd14777 100644 --- a/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx +++ b/src/Pages/BookingScreen/Components/BSItemCards/BsBookingitemCard.jsx @@ -69,6 +69,8 @@ import { slotTimeStatus, changeAddBookingDetailsTrigger, GlobalAddBookingDetailsTrigger, + GlobalGetmultipleSearchDatas, + getmultipleSearch, } from '../../../../Features/BookingScreen/BookingData/BookingData'; import { GlobalPreOrderAdditem, @@ -216,6 +218,7 @@ const BsBookingitemCard = (props) => { shallowEqual ); // const SelectedCust = useSelector(GlobalSelOption, shallowEqual); + const GetmultipleSearchDatas = useSelector(GlobalGetmultipleSearchDatas, shallowEqual) const RetailWSSalesType = useSelector(GlobalRetailWSSalesType, shallowEqual); // const CustDetails = SelectedCust ? SelectedCust : AddCustomerDetails?.[0]; const BookingTypeBoth = useSelector(GlobalBookingTypeBoth); @@ -446,9 +449,9 @@ const BsBookingitemCard = (props) => { AppId: AppId, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; await dispatch(getSelectedFavItems(data)).unwrap(); @@ -681,9 +684,9 @@ const BsBookingitemCard = (props) => { AppId: AppId, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; await dispatch(getSelectedFavItems(data)).unwrap(); @@ -775,9 +778,9 @@ const BsBookingitemCard = (props) => { AppId: AppId, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; await dispatch(getSelectedFavItems(data)).unwrap(); @@ -1022,7 +1025,7 @@ const BsBookingitemCard = (props) => { ? [] : SelectedDatas : ItemCard?.length == 0 || - (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0) + (ItemCard?.[0]?.AppId === 0 && ItemCard?.[0]?.CompId === 0) ? noSubcatCardData : ItemCard : ''; @@ -1090,10 +1093,25 @@ const BsBookingitemCard = (props) => { useEffect(() => { if (AppId && CompId && BranchId) { fetchedit(); + GetmultipleSearchData() } // dispatch(changepreOrder(false)); Commented to Add Normal Produts After Adding the Combo Pack !!!!!! Dont Touch Without Shifayath Permission }, [AppId, CompId, BranchId]); + const GetmultipleSearchData = async () => { + const data = { + AppId, + CompId, + BranchId, + }; + + try { + const response = await dispatch(getmultipleSearch(data)) + + } catch (error) { + console.error("Get Search Terms Error:", error); + } + }; useEffect(() => { setPreOrderSelectedProdNames([]); // dispatch(changePreOrderAdditem(null)); @@ -1112,9 +1130,9 @@ const BsBookingitemCard = (props) => { AppId: AppId, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; dispatch(getSelectedFavItems(data)).unwrap(); @@ -1126,10 +1144,12 @@ const BsBookingitemCard = (props) => { if (noSubcatCardData) { setNoSubcatCardData(); } - if (ProductSearch?.length > 5) { + if (ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" + )) { setQuickAdd(true); } - }, [ProductSearch]); + }, [ProductSearch, GetmultipleSearchDatas]); useEffect(() => { if ( !initialRun && @@ -1173,9 +1193,9 @@ const BsBookingitemCard = (props) => { ProdSubCat: currentProdSubCat, ...(AvailableDate && currentDateRef ? { - fromDate: currentDateRef?.[0], - toDate: currentDateRef?.[1], - } + fromDate: currentDateRef?.[0], + toDate: currentDateRef?.[1], + } : {}), }; //mohan @@ -1196,9 +1216,9 @@ const BsBookingitemCard = (props) => { prodCat: currentProdCat, ...(AvailableDate && currentDateRef ? { - fromDate: currentDateRef?.[0], - toDate: currentDateRef?.[1], - } + fromDate: currentDateRef?.[0], + toDate: currentDateRef?.[1], + } : {}), }; @@ -1222,9 +1242,9 @@ const BsBookingitemCard = (props) => { prodCat: currentProdCat, ...(AvailableDate && currentDateRef ? { - fromDate: currentDateRef?.[0], - toDate: currentDateRef?.[1], - } + fromDate: currentDateRef?.[0], + toDate: currentDateRef?.[1], + } : {}), }; @@ -1280,9 +1300,9 @@ const BsBookingitemCard = (props) => { AppId: AppId, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; let res = await dispatch(getEditFavItems(data)).unwrap(); @@ -1488,13 +1508,13 @@ const BsBookingitemCard = (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 ); @@ -1502,11 +1522,11 @@ const BsBookingitemCard = (props) => { let Isincartonepc = CartOrderDetails?.filter( (cartItem) => cartItem?.ProdId === - qtydata?.ProductDetail?.[QtyIndex]?.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 === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice) !cartItem?.SalesId ); @@ -1599,13 +1619,13 @@ const BsBookingitemCard = (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 ); @@ -1614,9 +1634,9 @@ const BsBookingitemCard = (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 === item?.ProductDetail?.[QtyIndex]?.ProdVariantDetails?.[VarientIndex]?.StockDetails?.[0]?.SellPrice) !cartItem?.SalesId ); @@ -1764,15 +1784,15 @@ const BsBookingitemCard = (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 ); @@ -1780,11 +1800,11 @@ const BsBookingitemCard = (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 ); @@ -1863,15 +1883,15 @@ const BsBookingitemCard = (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 ); @@ -1879,11 +1899,11 @@ const BsBookingitemCard = (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 ); @@ -2318,7 +2338,7 @@ const BsBookingitemCard = (props) => { parseInt(totalSelectedProductQty || 0) + parseInt(reorderComboConsumed || 0); } - } catch (_) {} + } catch (_) { } let getCurrentProdDtl = orderDetails?.filter( (a) => a?.ProdName === ProdName ); @@ -2519,7 +2539,7 @@ const BsBookingitemCard = (props) => { parseInt(totalSelectedProductQty || 0) + parseInt(reorderComboConsumed || 0); } - } catch (_) {} + } catch (_) { } let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { return ( @@ -2555,7 +2575,7 @@ const BsBookingitemCard = (props) => { }, 0); totalOrderQty = parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); - } catch (_) {} + } catch (_) { } let OverallProdQty = totalOrderQty - totalSelectedProductQty; if ( parseInt(ItemQuantity) > @@ -2641,7 +2661,7 @@ const BsBookingitemCard = (props) => { parseInt(totalSelectedProductQty || 0) + parseInt(reorderComboConsumed || 0); } - } catch (_) {} + } catch (_) { } let getCurrentProdDtl = orderDetails?.filter((a) => a?.ProdId === ProdId); let totalOrderQty = getCurrentProdDtl?.reduce((accumulator, card) => { return ( @@ -2680,7 +2700,7 @@ const BsBookingitemCard = (props) => { }, 0); totalOrderQty = parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); - } catch (_) {} + } catch (_) { } let OverallProdQty = totalOrderQty - totalSelectedProductQty; if ( parseInt(ItemQuantity) > @@ -2772,7 +2792,7 @@ const BsBookingitemCard = (props) => { parseInt(totalSelectedProductQty || 0) + parseInt(reorderComboConsumed || 0); } - } catch (_) {} + } catch (_) { } let getCurrentProdDtl = orderDetails?.filter( (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId ); @@ -2815,7 +2835,7 @@ const BsBookingitemCard = (props) => { }, 0); totalOrderQty = parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); - } catch (_) {} + } catch (_) { } let OverallProdQty = totalOrderQty - totalSelectedProductQty; if ( @@ -2899,7 +2919,7 @@ const BsBookingitemCard = (props) => { parseInt(totalSelectedProductQty || 0) + parseInt(reorderComboConsumed || 0); } - } catch (_) {} + } catch (_) { } let getCurrentProdDtl = orderDetails?.filter( (a) => a?.ProdId === ProdId && a?.InwardDtlId === InwardDtlId ); @@ -2946,7 +2966,7 @@ const BsBookingitemCard = (props) => { }, 0); totalOrderQty = parseInt(totalOrderQty || 0) + parseInt(comboConsumed || 0); - } catch (_) {} + } catch (_) { } let OverallProdQty = totalOrderQty - totalSelectedProductQty; if ( @@ -2985,7 +3005,7 @@ const BsBookingitemCard = (props) => { const same = item?.InwardDtlId === data?.InwardDtlId && item?.ProdVariantName?.toLowerCase() === - data?.VarientName?.toLowerCase() && + data?.VarientName?.toLowerCase() && item?.VariantAvailableFrom === data?.VariantAvailableFrom && item?.VariantAvailableTo === data?.VariantAvailableTo && item?.BookedDate && @@ -3010,7 +3030,7 @@ const BsBookingitemCard = (props) => { 0 || - record.StockCount === 'Stock Not Maintained' + record.StockCount === 'Stock Not Maintained' ? { color: '#000', cursor: 'pointer' } : { color: '#f49898', cursor: 'not-allowed' } } @@ -3040,7 +3060,7 @@ const BsBookingitemCard = (props) => { 0 || - record.StockCount === 'Stock Not Maintained' + record.StockCount === 'Stock Not Maintained' ? { color: '#000', cursor: 'pointer' } : { color: '#f49898', cursor: 'not-allowed' } } @@ -3070,7 +3090,7 @@ const BsBookingitemCard = (props) => { 0 || - record.StockCount === 'Stock Not Maintained' + record.StockCount === 'Stock Not Maintained' ? { color: '#000', cursor: 'pointer' } : { color: '#f49898', cursor: 'not-allowed' } } @@ -3324,20 +3344,20 @@ const BsBookingitemCard = (props) => { 'Batch No': item?.BatchRef, StockCount: onePeiceFlow ? returnCountStock( - item?.ProdId, - item?.OverAllPcs, - CartOrderDetails, - item?.InwardDtlId, - 'Y' - ) + item?.ProdId, + item?.OverAllPcs, + CartOrderDetails, + item?.InwardDtlId, + 'Y' + ) : returnCountStock( - item?.ProdId, - item?.BalanceQty, - CartOrderDetails, - item?.InwardDtlId, - 'N', - item?.OverAllPcs - ), + item?.ProdId, + item?.BalanceQty, + CartOrderDetails, + item?.InwardDtlId, + 'N', + item?.OverAllPcs + ), 'Stock Date': ExtractDateFormate(item?.InwardDate), Price: onePeiceFlow ? item?.OnePcsPrice : item?.SellPrice, ExpDate: @@ -3641,9 +3661,9 @@ const BsBookingitemCard = (props) => { AppId, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; @@ -3675,9 +3695,9 @@ const BsBookingitemCard = (props) => { prodCat: ProdCat, ...(AvailableDate && selectedDate ? { - fromDate: selectedDate?.[0], - toDate: selectedDate?.[1], - } + fromDate: selectedDate?.[0], + toDate: selectedDate?.[1], + } : {}), }; @@ -4503,9 +4523,9 @@ const BsBookingitemCard = (props) => { allProducts.forEach((product) => { const brandName = product.BrandName && - product.BrandName !== 'null' && - product.BrandName !== 'undefined' && - product.BrandName.trim() !== '' + product.BrandName !== 'null' && + product.BrandName !== 'undefined' && + product.BrandName.trim() !== '' ? product.BrandName : 'Others'; @@ -4539,13 +4559,13 @@ const BsBookingitemCard = (props) => { const result = prodname ? (cardData || [])?.filter( - (item) => - normalize(item.ProdName).includes(normalize(prodname)) || - normalize(item.ProdCatName).includes(normalize(prodname)) || - item.ProductDetail?.some((detail) => - normalize(detail.ProdName).includes(normalize(prodname)) - ) - ) + (item) => + normalize(item.ProdName).includes(normalize(prodname)) || + normalize(item.ProdCatName).includes(normalize(prodname)) || + item.ProductDetail?.some((detail) => + normalize(detail.ProdName).includes(normalize(prodname)) + ) + ) : cardData; const getDatePickerValue = (selectedDate) => { @@ -4602,8 +4622,8 @@ const BsBookingitemCard = (props) => { zIndex: '12', top: templateData?.BookingLayout?.[0] === 'Layout5' || - templateData?.BookingLayout?.[0] === 'Layout4' || - templateData?.BookingLayout?.[0] === 'Layout6' + templateData?.BookingLayout?.[0] === 'Layout4' || + templateData?.BookingLayout?.[0] === 'Layout6' ? '2.5rem' : '', }} @@ -4715,39 +4735,39 @@ const BsBookingitemCard = (props) => { cardFunction?.Background && (SelectedCardColor ? SelectedCardColor?.[ - 'BackgroundColor' - ] + 'BackgroundColor' + ] : ''), padding: !cardFunction?.ImageUp && - !cardFunction?.ImageDown + !cardFunction?.ImageDown ? cardFunction?.SmallImage && - '5px 9px' + '5px 9px' : '8px 2px', flexDirection: cardFunction?.ImageRight && - 'row-reverse' + 'row-reverse' ? cardFunction?.ImageRight && - 'row-reverse' + 'row-reverse' : cardFunction?.ImageUp && 'column' ? cardFunction?.ImageUp && - 'column' + 'column' : cardFunction?.ImageDown && - 'column-reverse' + 'column-reverse' ? cardFunction?.ImageDown && - 'column-reverse' + 'column-reverse' : cardFunction?.ImageLeft && - 'row', + 'row', borderRadius: cardFunction?.EdgeCurve && '6px', width: !cardFunction?.ImageUp && - !cardFunction?.ImageDown && - !cardFunction?.BigImage && - !cardFunction?.ImageRight && - cardFunction?.SmallImage && - (cardFunction?.ImageUp || - cardFunction?.ImageDown) + !cardFunction?.ImageDown && + !cardFunction?.BigImage && + !cardFunction?.ImageRight && + cardFunction?.SmallImage && + (cardFunction?.ImageUp || + cardFunction?.ImageDown) ? '6rem' : cardFunction?.BigImage && '9rem', height: @@ -4769,39 +4789,39 @@ const BsBookingitemCard = (props) => { > {(cardFunction?.BigImage || cardFunction?.SmallImage) && ( - - )} + : defaultimage + } + alt="" + /> + )}
{ cardFunction?.Background && (SelectedCardColor ? SelectedCardColor?.[ - 'BackgroundColor' - ] + 'BackgroundColor' + ] : ''), position: !cardFunction?.BigImage @@ -4835,7 +4855,7 @@ const BsBookingitemCard = (props) => { height: cardFunction?.SmallImage ? '5.5rem' : !cardFunction?.BigImage && - '5.5rem', + '5.5rem', alignItems: !cardFunction?.BigImage && !cardFunction?.SmallImage && @@ -4858,11 +4878,11 @@ const BsBookingitemCard = (props) => { 'uppercase', width: !cardFunction?.SmallImage ? cardFunction?.BigImage && - '120px' + '120px' : cardFunction?.SmallImage && - !cardFunction?.ImageUp && - !cardFunction?.ImageDown && - '85px', + !cardFunction?.ImageUp && + !cardFunction?.ImageDown && + '85px', // Width: cardFunction?.BigImage && "70px", fontSize: !cardFunction?.BigImage && @@ -4883,7 +4903,7 @@ const BsBookingitemCard = (props) => { className="BSItemCard-itemName" > {item?.ProdName} - {} + { }

{cardFunction?.Price && (

{ fontSize: !cardFunction?.SmallImage ? cardFunction?.BigImage && - '12px' + '12px' : '12px', textAlign: 'center', lineHeight: '2', @@ -4901,8 +4921,8 @@ const BsBookingitemCard = (props) => { : '', color: SelectedCardColor ? SelectedCardColor?.[ - 'FontColor' - ] + 'FontColor' + ] : '', }} > @@ -4988,39 +5008,39 @@ const BsBookingitemCard = (props) => { cardFunction?.Background && (SelectedCardColor ? SelectedCardColor?.[ - 'BackgroundColor' - ] + 'BackgroundColor' + ] : ''), padding: !cardFunction?.ImageUp && - !cardFunction?.ImageDown + !cardFunction?.ImageDown ? cardFunction?.SmallImage && - '5px 9px' + '5px 9px' : '8px 2px', flexDirection: cardFunction?.ImageRight && - 'row-reverse' + 'row-reverse' ? cardFunction?.ImageRight && - 'row-reverse' + 'row-reverse' : cardFunction?.ImageUp && 'column' ? cardFunction?.ImageUp && - 'column' + 'column' : cardFunction?.ImageDown && - 'column-reverse' + 'column-reverse' ? cardFunction?.ImageDown && - 'column-reverse' + 'column-reverse' : cardFunction?.ImageLeft && - 'row', + 'row', borderRadius: cardFunction?.EdgeCurve && '6px', width: !cardFunction?.ImageUp && - !cardFunction?.ImageDown && - !cardFunction?.BigImage && - !cardFunction?.ImageRight && - cardFunction?.SmallImage && - (cardFunction?.ImageUp || - cardFunction?.ImageDown) + !cardFunction?.ImageDown && + !cardFunction?.BigImage && + !cardFunction?.ImageRight && + cardFunction?.SmallImage && + (cardFunction?.ImageUp || + cardFunction?.ImageDown) ? '6rem' : cardFunction?.BigImage && '9rem', height: @@ -5037,43 +5057,43 @@ const BsBookingitemCard = (props) => { onClick={(e) => { CardOnclick(item, index); }} - // data-aos="zoom-in" data-aos-duration="600" + // data-aos="zoom-in" data-aos-duration="600" > {(cardFunction?.BigImage || cardFunction?.SmallImage) && ( - - )} + : defaultimage + } + alt="" + /> + )}

{ cardFunction?.Background && (SelectedCardColor ? SelectedCardColor?.[ - 'BackgroundColor' - ] + 'BackgroundColor' + ] : ''), position: !cardFunction?.BigImage @@ -5107,7 +5127,7 @@ const BsBookingitemCard = (props) => { height: cardFunction?.SmallImage ? '5.5rem' : !cardFunction?.BigImage && - '4.5rem', + '4.5rem', alignItems: !cardFunction?.BigImage && !cardFunction?.SmallImage && @@ -5127,11 +5147,11 @@ const BsBookingitemCard = (props) => { 'uppercase', width: !cardFunction?.SmallImage ? cardFunction?.BigImage && - '120px' + '120px' : cardFunction?.SmallImage && - !cardFunction?.ImageUp && - !cardFunction?.ImageDown && - '85px', + !cardFunction?.ImageUp && + !cardFunction?.ImageDown && + '85px', // Width: cardFunction?.BigImage && "70px", fontSize: !cardFunction?.BigImage && @@ -5167,7 +5187,7 @@ const BsBookingitemCard = (props) => { fontSize: !cardFunction?.SmallImage ? cardFunction?.BigImage && - '12px' + '12px' : '12px', textAlign: 'center', lineHeight: '2', @@ -5176,8 +5196,8 @@ const BsBookingitemCard = (props) => { : '', color: SelectedCardColor ? SelectedCardColor?.[ - 'FontColor' - ] + 'FontColor' + ] : '', }} > @@ -5276,7 +5296,7 @@ const BsBookingitemCard = (props) => { height={60} src={ item?.ProductDetail?.[0]?.ProdLogo === - '' + '' ? defaultimage : item?.ProductDetail?.[0]?.ProdLogo ? item?.ProductDetail?.[0]?.ProdLogo @@ -5293,15 +5313,15 @@ const BsBookingitemCard = (props) => {
{item?.ProductDetail?.[0]?.ProdVariantDetails ?.length > 0 && ( -
-
- ₹ {ItemSellingPrice(item)} +
+
+ ₹ {ItemSellingPrice(item)} +
+
+ {ItemSize(item)} {ItemUomName(item)} +
-
- {ItemSize(item)} {ItemUomName(item)} -
-
- )} + )}
{/* Stock Count Badge */} @@ -5340,7 +5360,9 @@ const BsBookingitemCard = (props) => { - ) : ProductSearch?.length > 5 && + ) : ProductSearch?.length > 5 && GetmultipleSearchDatas.some( + e => e.toLowerCase() === "qrcode" + ) && (cardData?.length == 0 || cardData == undefined) ? (
{/* cardData mohan 18-04-2025 */} @@ -5991,30 +6013,30 @@ const BsBookingitemCard = (props) => { {slots.map((timeSlot, idx) => { const isBooked = timeSlot?.SlotStatus?.toLowerCase() == - 'booked' || false; + 'booked' || false; const isBlocked = timeSlot?.SlotStatus?.toLowerCase() == - 'blocked' || false; + 'blocked' || false; const isPartiallyBooked = timeSlot?.SlotStatus?.toLowerCase() === - 'partially booked' || false; + 'partially booked' || false; const isPartiallyBlocked = timeSlot?.SlotStatus?.toLowerCase() === - 'partially blocked' || false; + 'partially blocked' || false; const isSelected = CartOrderDetails?.some( (selected) => selected.ProdId === - timeSlot?.ProdId && + timeSlot?.ProdId && selected.InwardDtlId === - timeSlot?.InwardDtlId && + timeSlot?.InwardDtlId && selected.VariantAvailableFrom === - timeSlot?.VariantAvailableFrom && + timeSlot?.VariantAvailableFrom && selected.VariantAvailableTo === - timeSlot?.VariantAvailableTo && + timeSlot?.VariantAvailableTo && selected.BookedDate === - timeSlot?.BookedDate + timeSlot?.BookedDate ); const isAlreadyAdded = @@ -6022,25 +6044,25 @@ const BsBookingitemCard = (props) => { const itemDate = item?.BookedDate ? new Date( - item?.BookedDate - ).toLocaleDateString() + item?.BookedDate + ).toLocaleDateString() : null; return ( item?.InwardDtlId === - timeSlot?.InwardDtlId && + timeSlot?.InwardDtlId && item?.VariantAvailableFrom === - timeSlot?.VariantAvailableFrom && + timeSlot?.VariantAvailableFrom && item?.VariantAvailableTo === - timeSlot?.VariantAvailableTo && + timeSlot?.VariantAvailableTo && item?.ProdVariantName?.toLowerCase() === - timeSlot?.VarientName?.toLowerCase() && + timeSlot?.VarientName?.toLowerCase() && itemDate === dataDate && (item?.SinglePc === 'Y' ? returnVariantStock( - data, - CartOrderDetails - ) === 0 + data, + CartOrderDetails + ) === 0 : true) ); }); @@ -6053,13 +6075,13 @@ const BsBookingitemCard = (props) => { selectedSlots?.some( (selected) => selected.InwardDtlId === - timeSlot?.InwardDtlId && + timeSlot?.InwardDtlId && selected.VariantAvailableFrom === - timeSlot?.VariantAvailableFrom && + timeSlot?.VariantAvailableFrom && selected.VariantAvailableTo === - timeSlot?.VariantAvailableTo && + timeSlot?.VariantAvailableTo && selected.TempDate === - timeSlot?.BookedDate + timeSlot?.BookedDate ); const isDisabled = isBooked || @@ -6072,26 +6094,25 @@ const BsBookingitemCard = (props) => { return (
{ @@ -6110,7 +6131,7 @@ const BsBookingitemCard = (props) => { timeSlot, product, onePeiceFlow || - isPartiallyBooked, + isPartiallyBooked, !slotEnded ); } @@ -6128,7 +6149,7 @@ const BsBookingitemCard = (props) => {
₹ {onePeiceFlow || - isPartiallyBooked + isPartiallyBooked ? timeSlot?.OnePcsPrice : timeSlot?.SellPrice || 0}
@@ -6154,15 +6175,15 @@ const BsBookingitemCard = (props) => { !CartOrderDetails?.some( (selected) => selected.ProdId === - timeSlot.ProdId && + timeSlot.ProdId && selected.InwardDtlId === - timeSlot.InwardDtlId && + timeSlot.InwardDtlId && selected.VariantAvailableFrom === - timeSlot.VariantAvailableFrom && + timeSlot.VariantAvailableFrom && selected.VariantAvailableTo === - timeSlot.VariantAvailableTo && + timeSlot.VariantAvailableTo && selected.BookedDate === - timeSlot.BookedDate + timeSlot.BookedDate ) } icon={ @@ -6227,7 +6248,7 @@ const BsBookingitemCard = (props) => { (timeSlot?.SlotStatus === 'Partially Booked' || timeSlot?.SlotStatus === - 'Booked') && ( + 'Booked') && (
{ e.stopPropagation(); @@ -6413,7 +6434,7 @@ const BsBookingitemCard = (props) => { {customer.CustMobile || 'N/A'} {customer?.CustBookDetails?.length > - 1 ? ( + 1 ? ( ) : customer?.CustBookDetails - ?.length === 1 ? ( + ?.length === 1 ? ( <>