From 3903a725d206b79722f507ba798a6bc264cecd5c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Mar 2026 09:29:20 +0530 Subject: [PATCH] kiosk dine-in bug fix --- src/Features/BrachLogin/BranchLogin.js | 24 +++++++++---------- src/Pages/Kiosk/InitialPage/InitialPage1.jsx | 10 ++++++-- src/Pages/Kiosk/InitialPage/InitialPage2.jsx | 10 +++++++- src/Pages/Kiosk/InitialPage/InitialPage3.jsx | 10 +++++++- .../InitialPage/SelfBookingIntialPage.jsx | 10 +++++++- 5 files changed, 47 insertions(+), 17 deletions(-) diff --git a/src/Features/BrachLogin/BranchLogin.js b/src/Features/BrachLogin/BranchLogin.js index 9b415cd..2c1d3c6 100644 --- a/src/Features/BrachLogin/BranchLogin.js +++ b/src/Features/BrachLogin/BranchLogin.js @@ -192,14 +192,14 @@ export const getLoginuser = createAsyncThunk( export const getCommonAppPreference = createAsyncThunk( '/getAppPreference', async (AppId) => { - if ( - AppId != null && - AppId != undefined - ){ - return await axiosCommonInstanceData.get( - `/ApplicationPreferenceMapping?AppId=${AppId}` - ); - } + if ( + AppId != null && + AppId != undefined + ) { + return await axiosCommonInstanceData.get( + `/ApplicationPreferenceMapping?AppId=${AppId}` + ); + } } ); @@ -209,7 +209,7 @@ const initialState = { SadminUserPin: [], SadminUserData: [], AppPreferences: [], - isWarehouse:false, + isWarehouse: false, }; const BranchLogin = createSlice({ @@ -219,8 +219,8 @@ const BranchLogin = createSlice({ changeSelectedBranchId: (state, action) => { state.SelectedBrachId = action?.payload; }, - changeWarehouse:(state,action)=>{ - state.isWarehouse=action?.payload + changeWarehouse: (state, action) => { + state.isWarehouse = action?.payload } }, @@ -257,7 +257,7 @@ const BranchLogin = createSlice({ }); }, }); -export const { changeSelectedBranchId ,changeWarehouse} = BranchLogin.actions; +export const { changeSelectedBranchId, changeWarehouse } = BranchLogin.actions; export const GlobalSelectedBranchId = (state) => state?.BranchLogin?.SelectedBrachId; export const GlobalCompBranchData = (state) => diff --git a/src/Pages/Kiosk/InitialPage/InitialPage1.jsx b/src/Pages/Kiosk/InitialPage/InitialPage1.jsx index f69c9b4..ad6e35d 100644 --- a/src/Pages/Kiosk/InitialPage/InitialPage1.jsx +++ b/src/Pages/Kiosk/InitialPage/InitialPage1.jsx @@ -12,6 +12,8 @@ import { changeBookingType } from '../../../Features/BookingScreen/BookingData/K import initialBg from '../../../Images/InitialPage1bgImg.png'; import { useEffect, useRef } from 'react'; import { isMobile } from 'react-device-detect'; +import { PreferenceData } from '../../../Features/BookingScreen/BookingData/BookingData'; +import { ApplicationPreferences } from '../../../Features/BrachLogin/BranchLogin'; const InitialPage1 = (props) => { const actionContainerRef = useRef(null); @@ -20,7 +22,11 @@ const InitialPage1 = (props) => { const getKioskCompLogodata = useSelector(getKioskCompLogo); const getKioskBackgroundimgdata = useSelector(getKioskBackgroundimg); const SalesType = useSelector(globalSalesType); - console.log(getKioskCompLogodata, 'getKioskCompLogodata'); + const preferences = useSelector(PreferenceData); + const appPreferences = useSelector(ApplicationPreferences); + const bookingTypePref = appPreferences?.find(pref => pref?.PreferredCatName?.toLowerCase() === 'booking type'); + const dineInPreference = preferences?.[0]?.SettingDtlDetails?.find((item) => (item.SettingIdName)?.toLowerCase() === 'dinein')?.SettingValue === 'Y'; + const dineInAppPreference = bookingTypePref?.PreferenceCatDetails?.find((item) => item.PreferredSubCatName?.toLowerCase() === 'dine in')?.PreferredStatus === 'Y'; const FlowChange = async (event, eventName) => { await dispatch(changeKioskPageName(event)); await dispatch(changeBookingType(eventName)); @@ -96,7 +102,7 @@ const InitialPage1 = (props) => {

- {(SalesType === 'D' || SalesType === 'B') && ( + {((SalesType === 'D' || SalesType === 'B') && dineInPreference && dineInAppPreference) && (
{ FlowChange('categoryPage', 'Dine In'); diff --git a/src/Pages/Kiosk/InitialPage/InitialPage2.jsx b/src/Pages/Kiosk/InitialPage/InitialPage2.jsx index f94b28e..27fe999 100644 --- a/src/Pages/Kiosk/InitialPage/InitialPage2.jsx +++ b/src/Pages/Kiosk/InitialPage/InitialPage2.jsx @@ -10,6 +10,8 @@ import { import '../../../Styles/Kiosk/InitialPage/InitialPage2.scss'; import { changeBookingType } from '../../../Features/BookingScreen/BookingData/KioskBookingData'; import initialBg from '../../../Images/theme3bgimg.png'; +import { PreferenceData } from '../../../Features/BookingScreen/BookingData/BookingData'; +import { ApplicationPreferences } from '../../../Features/BrachLogin/BranchLogin'; const InitialPage2 = (props) => { const dispatch = useDispatch(); @@ -17,6 +19,12 @@ const InitialPage2 = (props) => { const getKioskBranchNamedata = useSelector(getKioskBranchName); const getKioskBackgroundimgdata = useSelector(getKioskBackgroundimg); const SalesType = useSelector(globalSalesType); + const preferences = useSelector(PreferenceData); + const appPreferences = useSelector(ApplicationPreferences); + const bookingTypePref = appPreferences?.find(pref => pref?.PreferredCatName?.toLowerCase() === 'booking type'); + const dineInPreference = preferences?.[0]?.SettingDtlDetails?.find((item) => (item.SettingIdName)?.toLowerCase() === 'dinein')?.SettingValue === 'Y'; + const dineInAppPreference = bookingTypePref?.PreferenceCatDetails?.find((item) => item.PreferredSubCatName?.toLowerCase() === 'dine in')?.PreferredStatus === 'Y'; + const FlowChange = async (event, eventName) => { await dispatch(changeKioskPageName(event)); await dispatch(changeBookingType(eventName)); @@ -78,7 +86,7 @@ const InitialPage2 = (props) => {

- {(SalesType === 'D' || SalesType === 'B') && ( + {((SalesType === 'D' || SalesType === 'B') && dineInPreference && dineInAppPreference) && (
{ FlowChange('categoryPage', 'Dine In'); diff --git a/src/Pages/Kiosk/InitialPage/InitialPage3.jsx b/src/Pages/Kiosk/InitialPage/InitialPage3.jsx index 67d72a5..9cabc5d 100644 --- a/src/Pages/Kiosk/InitialPage/InitialPage3.jsx +++ b/src/Pages/Kiosk/InitialPage/InitialPage3.jsx @@ -26,6 +26,8 @@ import { getKioskOfferType, } from '../../../Features/Kiosk/kiosk'; import { changeBookingType } from '../../../Features/BookingScreen/BookingData/KioskBookingData'; +import { PreferenceData } from '../../../Features/BookingScreen/BookingData/BookingData'; +import { ApplicationPreferences } from '../../../Features/BrachLogin/BranchLogin'; const InitialPage3 = (props) => { const dispatch = useDispatch(); @@ -40,6 +42,12 @@ const InitialPage3 = (props) => { const getKioskOfferContent3Data = useSelector(getKioskOfferContent3); const getKioskOfferValueData = useSelector(getKioskOfferValue); const getKioskOfferTypeData = useSelector(getKioskOfferType); + const preferences = useSelector(PreferenceData); + const appPreferences = useSelector(ApplicationPreferences); + const bookingTypePref = appPreferences?.find(pref => pref?.PreferredCatName?.toLowerCase() === 'booking type'); + const dineInPreference = preferences?.[0]?.SettingDtlDetails?.find((item) => (item.SettingIdName)?.toLowerCase() === 'dinein')?.SettingValue === 'Y'; + const dineInAppPreference = bookingTypePref?.PreferenceCatDetails?.find((item) => item.PreferredSubCatName?.toLowerCase() === 'dine in')?.PreferredStatus === 'Y'; + const FlowChange = async (event, eventName) => { await dispatch(changeKioskPageName(event)); @@ -424,7 +432,7 @@ const InitialPage3 = (props) => { {/*

ORDER HERE

*/}
Skip the Queue line & order now for instant service!
- {(SalesType === 'D' || SalesType === 'B') && ( + {((SalesType === 'D' || SalesType === 'B') && dineInPreference && dineInAppPreference) && (
- {(SalesType === 'D' || SalesType === 'B') && ( + {((SalesType === 'D' || SalesType === 'B') && dineInPreference && dineInAppPreference) && (
{ FlowChange('categoryPage', 'Dine In');