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

Merge pull request 'User Preference Bases Task added All Component UserId' (#284) from prefarance-task into main 

Reviewed-on: Pozomind/pozo-retail-app#284
This commit is contained in:
karthikalakshmi 2026-03-17 11:41:46 +05:30
parent 69b93e6be3 426e521ebf
commit 411047f784
45 changed files with 63 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Features/BookingScreen/BookingData/BookingData.js
View File

@ -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}`
);
}
}

6
src/Features/PreferenceMaster/PreferenceMaster.js
View File

@ -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}`

1
src/Pages/AppPage/AppPage.jsx
View File

@ -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) {

2
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar1.jsx
View File

@ -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();

2
src/Pages/BookingScreen/Components/BSNavbar/BSNavbar2.jsx
View File

@ -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();

2
src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
View File

@ -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]?.[

7
src/Pages/BookingScreen/Components/PrintMainPage/SelectPrintMode.jsx
View File

@ -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 (

2
src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponentPrinterInc.jsx
View File

@ -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 =

2
src/Pages/BookingScreen/Components/ThemeCreation/ThemeSelection.jsx
View File

@ -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]?.[

2
src/Pages/BookingScreen/Components/UtillComponents/PricingPage.jsx
View File

@ -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);

2
src/Pages/BranchLogin/BackToBranchLogin.jsx
View File

@ -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 })

1
src/Pages/BranchLogin/BranchLogin.jsx
View File

@ -122,6 +122,7 @@ const BranchLogin = () => {
CompId: CompId,
BranchId: e,
AppId: AppId,
UserId: UserId,
};
let res = await dispatch(getPreferenceData(data)).unwrap();

2
src/Pages/CustomerMaster/CustMasterList.jsx
View File

@ -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) {

1
src/Pages/DashBoard/RetailDashboard.jsx
View File

@ -897,6 +897,7 @@ const RetailDashboard = () => {
CompId: CompId,
BranchId: BranchId ? BranchId : globalbranchid,
AppId: AppId,
UserId: UserId,
};
let res = await dispatch(getPreferenceData(data)).unwrap();

2
src/Pages/DeliveryChallanToInvoice/DeliveryChallanToInvoiceList.jsx
View File

@ -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)

1
src/Pages/EmpAccess/EmpAccessForm.jsx
View File

@ -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) {

2
src/Pages/EmpCommissionOrIncentive/EmpCommisionOrIncentiveList.jsx
View File

@ -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) =>

2
src/Pages/ExtraCharges/ExtraChargesList.jsx
View File

@ -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) =>

1
src/Pages/Kiosk/CardPage/SelfCardPage1Sports.jsx
View File

@ -365,6 +365,7 @@ const CardPage1Sports = (props) => {
CompId: SessionDtl?.CompId,
BranchId: SessionDtl?.BranchId,
AppId: SessionDtl?.AppId,
UserId:SessionDtl?.UserId,
})
).unwrap();

2
src/Pages/Kiosk/KioskBookingPage.jsx
View File

@ -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({

2
src/Pages/Kiosk/Payment/KioskPaymentWithModal.jsx
View File

@ -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]);

2
src/Pages/Offer/BundleOffer/BundleOfferList.jsx
View File

@ -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) {

2
src/Pages/Offer/ComboOfferPack/ComboOfferForm.jsx
View File

@ -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) {

2
src/Pages/Offer/CouponOffer/CouponWiseOfferlist.jsx
View File

@ -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) {

2
src/Pages/Offer/ItemOffer/ItemWiseForm.jsx
View File

@ -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) {

2
src/Pages/Offer/LoyaltyPoints/LoyaltyPointsList.jsx
View File

@ -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) {

2
src/Pages/Offer/Offer/OfferList.jsx
View File

@ -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) {

2
src/Pages/Offer/OfferCode/OfferCodeList.jsx
View File

@ -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) =>

2
src/Pages/Offer/PromoCode/PromocodeList.jsx
View File

@ -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) {

2
src/Pages/Offer/QuantityOffer/QuantityWiseForm.jsx
View File

@ -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) {

2
src/Pages/Offer/SalesOffer/SalesWiseList.jsx
View File

@ -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) {

2
src/Pages/Payment/PaymentReceivedRetail/PaymentReceivedRetail.jsx
View File

@ -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) =>

9
src/Pages/Preference/PreferenceList.jsx
View File

@ -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') {

2
src/Pages/Product/ProductList.jsx
View File

@ -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) =>

2
src/Pages/PurchaseQuotation/PurchaseQuotationForm.jsx
View File

@ -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) =>

2
src/Pages/Reports/DateWiseReport/DateWiseReport.jsx
View File

@ -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) =>

2
src/Pages/Reports/Estimate/EstimateDateWiseReport.jsx
View File

@ -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) {

2
src/Pages/Reports/Estimate/EstimateItemWiseReport.jsx
View File

@ -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) =>

2
src/Pages/Reports/ItemWiseReport/ItemWiseReport.jsx
View File

@ -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) =>

2
src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx
View File

@ -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) {

2
src/Pages/StockMaster/StockList.jsx
View File

@ -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) =>

2
src/Pages/StockPriceUpdate/StockPriceUpdate.jsx
View File

@ -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) =>

2
src/Pages/StoreKitchen/StoreKitchenFinish/KitechenFinishform.jsx
View File

@ -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) =>

6
src/Pages/paymentpdfPage/LinkUrlCreate.jsx
View File

@ -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...");

1
src/ProtectedRoutes.jsx
View File

@ -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) {