diff --git a/src/Features/BookingScreen/BookingData/BookingData.js b/src/Features/BookingScreen/BookingData/BookingData.js
index 1e5ec99..9fe6271 100644
--- a/src/Features/BookingScreen/BookingData/BookingData.js
+++ b/src/Features/BookingScreen/BookingData/BookingData.js
@@ -748,17 +748,20 @@ export const UserDataBasedOnBranchId = createAsyncThunk(
 
 export const getPreferenceData = createAsyncThunk(
   'BookingData/getPreferenceData',
-  async ({ CompId, BranchId, AppId }) => {
+  async ({ CompId, BranchId, AppId, UserId }) => {
+    // debugger
     if (
       CompId != null &&
       CompId != undefined &&
       BranchId != null &&
       BranchId != undefined &&
       AppId != null &&
-      AppId != undefined
+      AppId != undefined &&
+      UserId != null &&
+      UserId != undefined
     ) {
       return await axiosRetailInstanceData.get(
-        `/Settings?branchId=${BranchId}&compId=${CompId}&appId=${AppId}`
+        `/Settings?branchId=${BranchId}&compId=${CompId}&appId=${AppId}&userId=${UserId}`
       );
     }
   }
diff --git a/src/Features/PreferenceMaster/PreferenceMaster.js b/src/Features/PreferenceMaster/PreferenceMaster.js
index eb8072a..653ed8b 100644
--- a/src/Features/PreferenceMaster/PreferenceMaster.js
+++ b/src/Features/PreferenceMaster/PreferenceMaster.js
@@ -31,7 +31,7 @@ export const postPreferenceAppNames = createAsyncThunk(
 );
 
 export const gettableData = createAsyncThunk(
-  'settings/ gettableData',
+  'settings/gettableData',
   async (data) => {
     if (
       data?.AppId != null &&
@@ -39,7 +39,9 @@ export const gettableData = createAsyncThunk(
       data?.CompId != null &&
       data?.CompId != undefined &&
       data?.BranchId != null &&
-      data?.BranchId != undefined
+      data?.BranchId != undefined &&
+      data?.UserId != null &&
+      data?.UserId != undefined
     ) {
       return await axiosRetailInstanceData.get(
         `/Settings?appId=${data?.AppId}&compId=${data?.CompId}&branchId=${data?.BranchId}&userId=${data?.UserId}`
diff --git a/src/Pages/AppPage/AppPage.jsx b/src/Pages/AppPage/AppPage.jsx
index 265f8e9..80dd710 100644
--- a/src/Pages/AppPage/AppPage.jsx
+++ b/src/Pages/AppPage/AppPage.jsx
@@ -249,6 +249,7 @@ const AppPage = () => {
         AppId: AppId,
         CompId: CompId,
         BranchId: BranchId,
+        UserId:UserId
       };
       const response = await dispatch(getPreferenceData(DineinData)).unwrap();
       if (response?.data?.statusCode === 1) {
diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
index d0be917..47dab91 100644
--- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
+++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
@@ -371,7 +371,7 @@ const BSNavbar1 = (props, BookingNavbar) => {
     }).format(d);
     setFormattedDate(formatted);
     dispatch(
-      getPreferenceData({ CompId: CompId, AppId: AppId, BranchId: BranchId })
+      getPreferenceData({ CompId: CompId, AppId: AppId, BranchId: BranchId,UserId:UserId })
     );
     dispatch(getUserProfile({ UserId: UserId, ActiveStatus: 'A' })).unwrap();
     fetchBranchData();
diff --git a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx
index e7bf7eb..fafd80f 100644
--- a/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx
+++ b/src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx
@@ -296,7 +296,7 @@ const BSNavbar2 = () => {
   useEffect(() => {
     // fetchEditFavItems();
     dispatch(
-      getPreferenceData({ CompId: CompId, AppId: AppId, BranchId: BranchId })
+      getPreferenceData({ CompId: CompId, AppId: AppId, BranchId: BranchId,UserId:UserId })
     );
     fetchBranchData();
     dispatch(getUserProfile({ UserId: UserId, ActiveStatus: 'A' })).unwrap();
diff --git a/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx b/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
index 93e25fd..cc0b68e 100644
--- a/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
+++ b/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
@@ -598,7 +598,7 @@ const SelectionComponent = forwardRef((props, ref) => {
 
   const GetPreferenceDetails = async () => {
     let Preference = await dispatch(
-      getPreferenceData({ CompId: CompId, BranchId: BranchId, AppId: AppId })
+      getPreferenceData({ CompId: CompId, BranchId: BranchId, AppId: AppId, UserId:UserId })
     ).unwrap();
     if (Preference?.data?.statusCode === 1) {
       let Prefencedata = Preference?.data?.data?.[0]?.[
diff --git a/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx b/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
index d314239..89c0b0a 100644
--- a/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
+++ b/src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
@@ -36,7 +36,7 @@ const SelectPrintMode = ({ closeModel }) => {
 
   const fetchTableData = async () => {
     const response = await dispatch(
-      gettableData({ CompId, BranchId, AppId })
+      gettableData({ CompId, BranchId, AppId,UserId })
     ).unwrap();
 
     const data = response?.data?.data?.[0]?.SettingDtlDetails || [];
@@ -79,7 +79,7 @@ const SelectPrintMode = ({ closeModel }) => {
   const handleSave = async () => {
     const allowed = ['whatsapp', 'sms', 'print', 'email'];
 
-    const updatedSettings = modes.map((item) => {
+    const updatedSettings = modes?.map((item) => {
       const name = item.SettingIdName?.trim()?.toLowerCase();
 
       if (allowed?.includes(name)) {
@@ -98,6 +98,7 @@ const SelectPrintMode = ({ closeModel }) => {
       CreatedBy: UserId,
       AppId,
       SettingDtlDetails: updatedSettings,
+      UserId:UserId
     };
 
     console.log(payload, 'payload to send');
@@ -123,7 +124,7 @@ const SelectPrintMode = ({ closeModel }) => {
   };
 
   const updatePreference = async () => {
-    await dispatch(getPreferenceData({ CompId, BranchId, AppId }));
+    await dispatch(getPreferenceData({ CompId, BranchId, AppId ,UserId}));
   };
 
   return (
diff --git a/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponentPrinterInc.jsx b/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponentPrinterInc.jsx
index 052c19f..60c824a 100644
--- a/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponentPrinterInc.jsx
+++ b/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponentPrinterInc.jsx
@@ -228,7 +228,7 @@ const SelectionComponent = (props) => {
 
   const getSizePreferenceDetails = async () => {
     let Preference = await dispatch(
-      getPreferenceData({ CompId: CompId, BranchId: BranchId, AppId: AppId })
+      getPreferenceData({ CompId: CompId, BranchId: BranchId, AppId: AppId,UserId : UserId })
     ).unwrap();
     if (Preference?.data?.statusCode === 1) {
       const filteredData =
diff --git a/src/Pages/BookingScreen/Components/ThemeCreation/ThemeSelection.jsx b/src/Pages/BookingScreen/Components/ThemeCreation/ThemeSelection.jsx
index 18e3e16..742530f 100644
--- a/src/Pages/BookingScreen/Components/ThemeCreation/ThemeSelection.jsx
+++ b/src/Pages/BookingScreen/Components/ThemeCreation/ThemeSelection.jsx
@@ -381,7 +381,7 @@ const ThemeSelection = () => {
 
   const GetPreferenceDetails = async () => {
     let Preference = await dispatch(
-      getPreferenceData({ CompId: CompId, BranchId: BranchId, AppId: AppId })
+      getPreferenceData({ CompId: CompId, BranchId: BranchId, AppId: AppId,UserId : UserId })
     ).unwrap();
     if (Preference?.data?.statusCode === 1) {
       let Prefencedata = Preference?.data?.data?.[0]?.[
diff --git a/src/Pages/BookingScreen/Components/UtillComponents/PricingPage.jsx b/src/Pages/BookingScreen/Components/UtillComponents/PricingPage.jsx
index 9379574..4454a41 100644
--- a/src/Pages/BookingScreen/Components/UtillComponents/PricingPage.jsx
+++ b/src/Pages/BookingScreen/Components/UtillComponents/PricingPage.jsx
@@ -162,7 +162,7 @@ const PricingPage = () => {
       getPurchasedAppDetails({ AppId, UserId })
     ).unwrap();
     let response1 = await dispatch(
-      getPreferenceData({ AppId, BranchId, CompId })
+      getPreferenceData({ AppId, BranchId, CompId,UserId })
     ).unwrap();
     setPurchasedDetails(response?.data?.data);
     setCompanydetails(response1?.data?.data);
diff --git a/src/Pages/BranchLogin/BackToBranchLogin.jsx b/src/Pages/BranchLogin/BackToBranchLogin.jsx
index 4e83102..594a5ee 100644
--- a/src/Pages/BranchLogin/BackToBranchLogin.jsx
+++ b/src/Pages/BranchLogin/BackToBranchLogin.jsx
@@ -33,6 +33,7 @@ const BackToBranchLogin = () => {
   );
 
   const AppId = getSession('AppId');
+  const UserId = getSession('UserId');
 
   const items = [
     {
@@ -68,6 +69,7 @@ const BackToBranchLogin = () => {
       CompId: ComId?.CompId,
       BranchId: e,
       AppId: AppId,
+      UserId:UserId
     };
     await dispatch(
       getTemplate({ CompId: ComId?.CompId, BranchId: e, AppId: AppId })
diff --git a/src/Pages/BranchLogin/BranchLogin.jsx b/src/Pages/BranchLogin/BranchLogin.jsx
index 6276da8..e2d1b46 100644
--- a/src/Pages/BranchLogin/BranchLogin.jsx
+++ b/src/Pages/BranchLogin/BranchLogin.jsx
@@ -122,6 +122,7 @@ const BranchLogin = () => {
       CompId: CompId,
       BranchId: e,
       AppId: AppId,
+      UserId: UserId,
     };
 
     let res = await dispatch(getPreferenceData(data)).unwrap();
diff --git a/src/Pages/CustomerMaster/CustMasterList.jsx b/src/Pages/CustomerMaster/CustMasterList.jsx
index 7666e55..cade722 100644
--- a/src/Pages/CustomerMaster/CustMasterList.jsx
+++ b/src/Pages/CustomerMaster/CustMasterList.jsx
@@ -155,7 +155,7 @@ const CustomerMaster = () => {
     }
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId, UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/DashBoard/RetailDashboard.jsx b/src/Pages/DashBoard/RetailDashboard.jsx
index 47fe895..1354768 100644
--- a/src/Pages/DashBoard/RetailDashboard.jsx
+++ b/src/Pages/DashBoard/RetailDashboard.jsx
@@ -897,6 +897,7 @@ const RetailDashboard = () => {
         CompId: CompId,
         BranchId: BranchId ? BranchId : globalbranchid,
         AppId: AppId,
+        UserId: UserId,
       };
 
       let res = await dispatch(getPreferenceData(data)).unwrap();
diff --git a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceList.jsx b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceList.jsx
index ed3e4c3..f3756d8 100644
--- a/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceList.jsx
+++ b/src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceList.jsx
@@ -324,7 +324,7 @@ const DeliveryChallanToInvoiceList = () => {
     };
 
     const getPreference = async () => {
-        await dispatch(getPreferenceData({ AppId: AppId, CompId: CompId, BranchId: BranchId })).unwrap();
+        await dispatch(getPreferenceData({ AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId })).unwrap();
         const decimalSetting = PreferenceDatas?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
         if (decimalSetting) {
             setAllowDecimal(true)
diff --git a/src/Pages/EmpAccess/EmpAccessForm.jsx b/src/Pages/EmpAccess/EmpAccessForm.jsx
index e6f5aff..e8010f6 100644
--- a/src/Pages/EmpAccess/EmpAccessForm.jsx
+++ b/src/Pages/EmpAccess/EmpAccessForm.jsx
@@ -98,6 +98,7 @@ const EmpAccessForm = ({ formType }) => {
             AppId: AppId,
             CompId: cmpId,
             BranchId: brId,
+            UserId: UserId,
           };
           const response = await dispatch(gettableData(DineinData)).unwrap();
           if (response?.data?.statusCode === 1) {
diff --git a/src/Pages/EmpCommissionOrIncentive/EmpCommisionOrIncentiveList.jsx b/src/Pages/EmpCommissionOrIncentive/EmpCommisionOrIncentiveList.jsx
index d3b6b42..61d28b5 100644
--- a/src/Pages/EmpCommissionOrIncentive/EmpCommisionOrIncentiveList.jsx
+++ b/src/Pages/EmpCommissionOrIncentive/EmpCommisionOrIncentiveList.jsx
@@ -301,7 +301,7 @@ const EmpCommisionOrIncentiveList = () => {
 
   const getPreference = async () => {
     await dispatch(
-      getPreferenceData({ AppId: AppId, CompId: CompId, BranchId: BranchId })
+      getPreferenceData({ AppId: AppId, CompId: CompId, BranchId: BranchId, UserId:UserId })
     ).unwrap();
     const decimalSetting = PreferenceDatas?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/ExtraCharges/ExtraChargesList.jsx b/src/Pages/ExtraCharges/ExtraChargesList.jsx
index 469da00..12254e6 100644
--- a/src/Pages/ExtraCharges/ExtraChargesList.jsx
+++ b/src/Pages/ExtraCharges/ExtraChargesList.jsx
@@ -432,7 +432,7 @@ function ExtraChargesList() {
   };
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId, UserId:UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Kiosk/CardPage/SelfCardPage1Sports.jsx b/src/Pages/Kiosk/CardPage/SelfCardPage1Sports.jsx
index c26aa71..b47810a 100644
--- a/src/Pages/Kiosk/CardPage/SelfCardPage1Sports.jsx
+++ b/src/Pages/Kiosk/CardPage/SelfCardPage1Sports.jsx
@@ -365,6 +365,7 @@ const CardPage1Sports = (props) => {
         CompId: SessionDtl?.CompId,
         BranchId: SessionDtl?.BranchId,
         AppId: SessionDtl?.AppId,
+        UserId:SessionDtl?.UserId,
       })
     ).unwrap();
 
diff --git a/src/Pages/Kiosk/KioskBookingPage.jsx b/src/Pages/Kiosk/KioskBookingPage.jsx
index c77f3cf..abbf814 100644
--- a/src/Pages/Kiosk/KioskBookingPage.jsx
+++ b/src/Pages/Kiosk/KioskBookingPage.jsx
@@ -75,6 +75,7 @@ const KioskBookingPage = () => {
       CompId: SessionDtl?.CompId,
       BranchId: SessionDtl?.BranchId,
       AppId: SessionDtl?.AppId,
+      UserId: SessionDtl?.UserId,
     })).unwrap();
     const queryParams = await getQueryParams();
 
@@ -171,6 +172,7 @@ const KioskBookingPage = () => {
             CompId: responseData?.CompId,
             BranchId: responseData?.BranchId,
             AppId: responseData?.AppId,
+            UserId: responseData?.UserId,
           })).unwrap();
           dispatch(
             getProductCategories({
diff --git a/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx b/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
index 3329419..3b6747c 100644
--- a/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
+++ b/src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
@@ -199,7 +199,7 @@ const KioskPayment = (props) => {
         };
         dispatch(getKioskPrinterDetails(data)).unwrap();
       }
-      dispatch(getPreferenceData({ CompId: SessionData.CompId, BranchId: SessionData.BranchId, AppId: SessionData.AppId })).unwrap();
+      dispatch(getPreferenceData({ CompId: SessionData.CompId, BranchId: SessionData.BranchId, AppId: SessionData.AppId,UserId: SessionData.UserId })).unwrap();
     }
   }, [SessionData.CompId, SessionData.BranchId, SessionData.AppId]);
 
diff --git a/src/Pages/Offer/BundleOffer/BundleOfferList.jsx b/src/Pages/Offer/BundleOffer/BundleOfferList.jsx
index 4c159a4..c5832cd 100644
--- a/src/Pages/Offer/BundleOffer/BundleOfferList.jsx
+++ b/src/Pages/Offer/BundleOffer/BundleOfferList.jsx
@@ -74,7 +74,7 @@ const BundleOfferList = () => {
   const [allowDecimal, setAllowDecimal] = useState(false);
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId:UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/ComboOfferPack/ComboOfferForm.jsx b/src/Pages/Offer/ComboOfferPack/ComboOfferForm.jsx
index 8e6c84f..ea0c086 100644
--- a/src/Pages/Offer/ComboOfferPack/ComboOfferForm.jsx
+++ b/src/Pages/Offer/ComboOfferPack/ComboOfferForm.jsx
@@ -94,7 +94,7 @@ const ComboOfferMaster = ({ formType }) => {
   const [allowDecimal, setAllowDecimal] = useState(false);
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId, UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/CouponOffer/CouponWiseOfferlist.jsx b/src/Pages/Offer/CouponOffer/CouponWiseOfferlist.jsx
index c7b90e0..abcf64e 100644
--- a/src/Pages/Offer/CouponOffer/CouponWiseOfferlist.jsx
+++ b/src/Pages/Offer/CouponOffer/CouponWiseOfferlist.jsx
@@ -101,7 +101,7 @@ const CouponWiseOfferlist = () => {
   const indeterminate = checkedList.length > 0 && checkedList.length < plainOptions.length;
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId:UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/ItemOffer/ItemWiseForm.jsx b/src/Pages/Offer/ItemOffer/ItemWiseForm.jsx
index f6dc103..46c8647 100644
--- a/src/Pages/Offer/ItemOffer/ItemWiseForm.jsx
+++ b/src/Pages/Offer/ItemOffer/ItemWiseForm.jsx
@@ -409,7 +409,7 @@ const ItemWiseForm = () => {
   };
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId:UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/LoyaltyPoints/LoyaltyPointsList.jsx b/src/Pages/Offer/LoyaltyPoints/LoyaltyPointsList.jsx
index f10828a..4f5fa46 100644
--- a/src/Pages/Offer/LoyaltyPoints/LoyaltyPointsList.jsx
+++ b/src/Pages/Offer/LoyaltyPoints/LoyaltyPointsList.jsx
@@ -65,7 +65,7 @@ const LoyaltyPointsList = () => {
   const [allowDecimal, setAllowDecimal] = useState(false);
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId:UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/Offer/OfferList.jsx b/src/Pages/Offer/Offer/OfferList.jsx
index 66675fd..f8585c7 100644
--- a/src/Pages/Offer/Offer/OfferList.jsx
+++ b/src/Pages/Offer/Offer/OfferList.jsx
@@ -138,7 +138,7 @@ const OfferList = () => {
     }
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/OfferCode/OfferCodeList.jsx b/src/Pages/Offer/OfferCode/OfferCodeList.jsx
index 924df9d..14d5097 100644
--- a/src/Pages/Offer/OfferCode/OfferCodeList.jsx
+++ b/src/Pages/Offer/OfferCode/OfferCodeList.jsx
@@ -117,7 +117,7 @@ const OfferCodeList = () => {
   const indeterminate =
     checkedList.length > 0 && checkedList.length < plainOptions.length;
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId:UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Offer/PromoCode/PromocodeList.jsx b/src/Pages/Offer/PromoCode/PromocodeList.jsx
index 7e6a382..4c19ec3 100644
--- a/src/Pages/Offer/PromoCode/PromocodeList.jsx
+++ b/src/Pages/Offer/PromoCode/PromocodeList.jsx
@@ -97,7 +97,7 @@ const PromocodeList = () => {
   const checkAll = plainOptions.length === checkedList.length;
   const indeterminate = checkedList.length > 0 && checkedList.length < plainOptions.length;
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/QuantityOffer/QuantityWiseForm.jsx b/src/Pages/Offer/QuantityOffer/QuantityWiseForm.jsx
index 84310cf..9b2ac03 100644
--- a/src/Pages/Offer/QuantityOffer/QuantityWiseForm.jsx
+++ b/src/Pages/Offer/QuantityOffer/QuantityWiseForm.jsx
@@ -416,7 +416,7 @@ const QuantityWiseForm = () => {
     setEmpData(datas?.[0]);
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId:UserId};
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Offer/SalesOffer/SalesWiseList.jsx b/src/Pages/Offer/SalesOffer/SalesWiseList.jsx
index 1eaf164..1882b9f 100644
--- a/src/Pages/Offer/SalesOffer/SalesWiseList.jsx
+++ b/src/Pages/Offer/SalesOffer/SalesWiseList.jsx
@@ -191,7 +191,7 @@ const SalesWiseList = () => {
   }
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Payment/PaymentReceivedRetail/PaymentReceivedRetail.jsx b/src/Pages/Payment/PaymentReceivedRetail/PaymentReceivedRetail.jsx
index d2007ae..9946189 100644
--- a/src/Pages/Payment/PaymentReceivedRetail/PaymentReceivedRetail.jsx
+++ b/src/Pages/Payment/PaymentReceivedRetail/PaymentReceivedRetail.jsx
@@ -305,7 +305,7 @@ const PaymentReceivedRetail = () => {
     }
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Preference/PreferenceList.jsx b/src/Pages/Preference/PreferenceList.jsx
index c90a55f..f2bef2e 100644
--- a/src/Pages/Preference/PreferenceList.jsx
+++ b/src/Pages/Preference/PreferenceList.jsx
@@ -21,7 +21,7 @@ import { useAuth } from '../../AuthContext.jsx';
 import { ApplicationPreferences } from '../../Features/BrachLogin/BranchLogin.js';
 import './PreferenceList.scss';
 import { InputField } from '../../Components/Forms/InputField.jsx';
-import { changePreferenceData } from '../../Features/BookingScreen/BookingData/BookingData.js';
+import { changePreferenceData, getPreferenceData } from '../../Features/BookingScreen/BookingData/BookingData.js';
 import { DropDowns } from '../../Components/Forms/DropDown.jsx';
 import { getBranchUsers } from '../../Features/UserAccount/userData.js';
 import { UserDataBasedOnBranchId } from '../../Features/Reports/Reports.js';
@@ -311,6 +311,8 @@ const PreferenceList = ({ setting = false }) => {
 
   const fetchTableData = async () => {
     const res = await dispatch(gettableData({ CompId, BranchId, AppId,UserId:selectedUserId })).unwrap();
+    const data = { CompId, BranchId, AppId, UserId: selectedUserId };
+    // const res = await dispatch(getPreferenceData(data)).unwrap();
     if (res?.data?.statusCode === 1 && res?.data?.data?.length > 0) {
       await dispatch(changePreferenceData(res?.data?.data));
     } else {
@@ -507,10 +509,7 @@ const userDropData = async () => {
 
 
   if (gettinguserDropDown?.data?.statusCode === 1) {
-    const finaluserDropDown = gettinguserDropDown?.data?.data?.filter(
-      (value) => value.ActiveStatus === "A"
-    );
-
+    const finaluserDropDown = gettinguserDropDown?.data?.data?.filter((value) => value.ActiveStatus === "A");
     setUserDropDown(finaluserDropDown);
 
     if (UserType === 'Employee') {
diff --git a/src/Pages/Product/ProductList.jsx b/src/Pages/Product/ProductList.jsx
index 37fc604..bae45f1 100644
--- a/src/Pages/Product/ProductList.jsx
+++ b/src/Pages/Product/ProductList.jsx
@@ -1596,7 +1596,7 @@ const ProductList = () => {
     }
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/PurchaseQuotation/PurchaseQuotationForm.jsx b/src/Pages/PurchaseQuotation/PurchaseQuotationForm.jsx
index f903436..a883349 100644
--- a/src/Pages/PurchaseQuotation/PurchaseQuotationForm.jsx
+++ b/src/Pages/PurchaseQuotation/PurchaseQuotationForm.jsx
@@ -588,7 +588,7 @@ const SalesQuotationForm = () => {
   );
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId, UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx b/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx
index 85608af..c424dc6 100644
--- a/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx
+++ b/src/Pages/Reports/DateWiseReport/DateWiseReport.jsx
@@ -368,7 +368,7 @@ const DateWiseReport = () => {
   }, []);
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Reports/Estimate/EstimateDateWiseReport.jsx b/src/Pages/Reports/Estimate/EstimateDateWiseReport.jsx
index b02d6d1..a314e21 100644
--- a/src/Pages/Reports/Estimate/EstimateDateWiseReport.jsx
+++ b/src/Pages/Reports/Estimate/EstimateDateWiseReport.jsx
@@ -81,7 +81,7 @@ const EstimateDateWiseReport = () => {
     return allowDecimal ? parseFloat(value || 0).toFixed(2) : Math.round(value || 0);
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId ,UserId: UserId};
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/Reports/Estimate/EstimateItemWiseReport.jsx b/src/Pages/Reports/Estimate/EstimateItemWiseReport.jsx
index 8fd8775..1509962 100644
--- a/src/Pages/Reports/Estimate/EstimateItemWiseReport.jsx
+++ b/src/Pages/Reports/Estimate/EstimateItemWiseReport.jsx
@@ -737,7 +737,7 @@ const EstimateItemWiseReport = () => {
   };
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId, UserId : UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx b/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx
index d4e833f..8d6e824 100644
--- a/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx
+++ b/src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx
@@ -210,7 +210,7 @@ const ItemWiseReport = () => {
     }
   }, [apiCall]);
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx b/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx
index e6900e3..a45b993 100644
--- a/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx
+++ b/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx
@@ -701,7 +701,7 @@ const RevenueItemWiseReport = () => {
     return allowDecimal ? parseFloat(value || 0).toFixed(2) : Math.round(value || 0);
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap()
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y');
     if (decimalSetting) {
diff --git a/src/Pages/StockMaster/StockList.jsx b/src/Pages/StockMaster/StockList.jsx
index 24f0a00..a546b47 100644
--- a/src/Pages/StockMaster/StockList.jsx
+++ b/src/Pages/StockMaster/StockList.jsx
@@ -314,7 +314,7 @@ const StockList = () => {
     setSearchText(e?.target?.value);
   };
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/StockPriceUpdate/StockPriceUpdate.jsx b/src/Pages/StockPriceUpdate/StockPriceUpdate.jsx
index de6ca38..8218b64 100644
--- a/src/Pages/StockPriceUpdate/StockPriceUpdate.jsx
+++ b/src/Pages/StockPriceUpdate/StockPriceUpdate.jsx
@@ -737,7 +737,7 @@ const StockPriceUpdate = () => {
     fetchData();
   }, []);
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/StoreKitchen/StoreKitchenFinish/KitechenFinishform.jsx b/src/Pages/StoreKitchen/StoreKitchenFinish/KitechenFinishform.jsx
index 2cf7413..85cd647 100644
--- a/src/Pages/StoreKitchen/StoreKitchenFinish/KitechenFinishform.jsx
+++ b/src/Pages/StoreKitchen/StoreKitchenFinish/KitechenFinishform.jsx
@@ -981,7 +981,7 @@ const KitechenFinishform = ({ formType }) => {
   };
 
   const getPreference = async () => {
-    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId };
+    const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId };
     const { data: res } = await dispatch(getPreferenceData(data)).unwrap();
     const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find(
       (setting) =>
diff --git a/src/Pages/paymentpdfPage/LinkUrlCreate.jsx b/src/Pages/paymentpdfPage/LinkUrlCreate.jsx
index 36d381c..bc26d20 100644
--- a/src/Pages/paymentpdfPage/LinkUrlCreate.jsx
+++ b/src/Pages/paymentpdfPage/LinkUrlCreate.jsx
@@ -179,16 +179,16 @@ const commonModulePreference = appPreferences?.find(
       setIsDataLoading(false);
     }
   };
-
   const loadAllRequiredData = async (firstInvoice) => {
     try {
-      const { AppId, CompId, BranchId } = firstInvoice;
+      const { AppId, CompId, BranchId,UserId } = firstInvoice;
       const pricingData = {
         appId: AppId,
         compId: CompId,
         branchId: BranchId,
+        UserId : UserId
       };
-      const printData = { AppId, CompId, BranchId };
+      const printData = { AppId, CompId, BranchId, UserId };
 
       // Step 1: Call PricingAppPricingName to update global state
       console.log("Step 1: Calling PricingAppPricingNameData...");
diff --git a/src/ProtectedRoutes.jsx b/src/ProtectedRoutes.jsx
index 9636fc2..a9f28da 100644
--- a/src/ProtectedRoutes.jsx
+++ b/src/ProtectedRoutes.jsx
@@ -91,6 +91,7 @@ const ProtectedRoutes = ({ routesConfig }) => {
         AppId: AppId,
         CompId: CompId,
         BranchId: BranchId,
+        UserId:UserId
       };
       const response = await dispatch(gettableData(DineinData)).unwrap();
       if (response?.data?.statusCode === 1) {