diff --git a/src/Pages/AppPage/AppPage.jsx b/src/Pages/AppPage/AppPage.jsx
index d1e2cd6..3c7802a 100644
--- a/src/Pages/AppPage/AppPage.jsx
+++ b/src/Pages/AppPage/AppPage.jsx
@@ -444,7 +444,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
const SadminUserPurchaseMenuItem = [
getsubItem('Purchase Order', `${subDirectory}setting/purchase-order`),
- getsubItem('Purchase Entry', `${subDirectory}setting/purchase-entry/new`),
+ getsubItem('Product Receipt', `${subDirectory}setting/purchase-entry/new`),
getsubItem('Purchase Return', `${subDirectory}setting/purchase-return`),
];
@@ -498,7 +498,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
),
!iswarehouse &&
getsubItem(
- 'Counter Category Mapping',
+ 'Counter Mapping',
`${subDirectory}setting/counter-category-mapping`
),
];
@@ -533,7 +533,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
getsubItem('Print Setup', `${subDirectory}saleslayouts/print-selection`),
getsubItem('Kiosk Setup', `${subDirectory}saleslayouts/kiosk-selection`),
getsubItem(
- 'Barcode / Qr Setup',
+ 'Barcode / QR',
`${subDirectory}saleslayouts/barcode-qr-selection`
),
];
@@ -875,7 +875,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
`${subDirectory}setting/sales-bill-cancel`
),
getsubItem(
- 'Product Return',
+ 'Sales Product Return',
`${subDirectory}setting/sales-bill-product-return`
),
sportsAppPreference &&
@@ -1047,9 +1047,9 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
const Purchase = [
getsubItem('Automated Reorder', `${subDirectory}setting/automated-reorder`),
- getsubItem('Purchase Order', `${subDirectory}setting/purchase-order/new`),
- getsubItem('Product Receipt', `${subDirectory}setting/purchase-entry/new`),
- getsubItem('Product Return', `${subDirectory}setting/purchase-return`),
+ getsubItem('Purchase Order', `${subDirectory}setting/purchase-order`),
+ getsubItem('Product Receipt', `${subDirectory}setting/purchase-entry`),
+ getsubItem('Product Return', `${subDirectory}setting/purchase-return/list`),
getsubItem(
'Stock Adjustment',
`${subDirectory}setting/stock-adjustment-list`
@@ -1087,7 +1087,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
!sportsAppPreference &&
getsubItem(
'DC to Invoice',
- `${subDirectory}setting/delivery-challan-to-invoice`
+ `${subDirectory}setting/delivery-challan-to-invoice/list`
),
!iswarehouse &&
getsubItem('Customer', `${subDirectory}setting/customer-master`),
@@ -1119,8 +1119,8 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
`${subDirectory}setting/sales-bill-cancel`
),
getsubItem(
- 'Product Return',
- `${subDirectory}setting/sales-bill-product-return`
+ 'Sales Product Return',
+ `${subDirectory}setting/sales-bill-product-return/list`
),
sportsAppPreference &&
getsubItem(
@@ -1139,8 +1139,8 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
const PurchaseMenuItem = [
getsubItem('Automated Reorder', `${subDirectory}setting/automated-reorder`),
getsubItem('Purchase Order', `${subDirectory}setting/purchase-order`),
- getsubItem('Purchase Entry', `${subDirectory}setting/purchase-entry/new`),
- getsubItem('Purchase Return', `${subDirectory}setting/purchase-return`),
+ getsubItem('Product Receipt', `${subDirectory}setting/purchase-entry/new`),
+ getsubItem('Product Return', `${subDirectory}setting/purchase-return`),
getsubItem(
'Stock Adjustment',
`${subDirectory}setting/stock-adjustment-list`
@@ -1196,7 +1196,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
)
: '',
getsubItem(
- 'Counter Category Mapping',
+ 'Counter Mapping',
`${subDirectory}setting/counter-category-mapping`
),
getsubItem('Image Bulk Upload', `${subDirectory}setting/image-bulk-upload`),
@@ -1240,7 +1240,7 @@ console.log(iswarehouse,'iswarehouseiswarehouseiswarehouse');
),
getsubItem('Sales Bill Cancel', `${subDirectory}setting/sales-bill-cancel`),
getsubItem(
- 'Sales Bill Product Return',
+ 'Sales Product Return',
`${subDirectory}setting/sales-bill-product-return`
),
sportsAppPreference &&
@@ -1845,7 +1845,7 @@ const customizedmenuitem = []
`${subDirectory}setting/sales-bill-cancel`
),
getsubItem(
- 'Product Return',
+ 'Sales Product Return',
`${subDirectory}setting/sales-bill-product-return`
),
sportsAppPreference &&
@@ -2433,7 +2433,7 @@ const customizedmenuitem = []
),
!sportsAppPreference &&
getsubItem(
- 'Product Return',
+ 'Sales Product Return',
`${subDirectory}setting/sales-bill-product-return`
),
sportsAppPreference &&
diff --git a/src/Pages/Automated Reorder/AutomatedReorderList.jsx b/src/Pages/Automated Reorder/AutomatedReorderList.jsx
index adf7e8f..49351a7 100644
--- a/src/Pages/Automated Reorder/AutomatedReorderList.jsx
+++ b/src/Pages/Automated Reorder/AutomatedReorderList.jsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useState } from "react";
import { useDispatch } from "react-redux";
import { getSession } from "../../Services/Others";
-import { changeBreadCrumb } from "../../Features/AppPage/CenterPage";
+import { changeBreadCrumb, getEmpAccess } from "../../Features/AppPage/CenterPage";
import { Messages } from "../../Components/Notifications/Messages";
import { Tables } from "../../Components/Tables/Table";
import FormHeader from "../PageComponents/FormHeader";
@@ -19,6 +19,7 @@ import { deleteAutomatedReorder, getAutomatedReorderList } from "../../Features/
import { DefaultModal } from "../../Components/Modal/DefaultModal";
import { FaRegEye } from "react-icons/fa";
import { render } from "react-dom";
+import { useAuth } from "../../AuthContext";
const subDirectory = import.meta.env.BASE_URL;
@@ -40,11 +41,18 @@ const AutomatedReorderList = () => {
const navigate = useNavigate();
const location = useLocation();
const state = location?.state;
+ const { SadminuserAccess } = useAuth();
+ let SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Product Receipt'
+ );
const AppId = getSession('AppId');
const CompId = getSession('CompId');
const BranchId = getSession('BranchId');
const UserId = getSession('UserId');
+ const UserType = getSession('UserType');
+ const [empData, setEmpData] = useState();
+ const [addnewAccess, setaddnewAccess] = useState(true);
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
@@ -176,6 +184,40 @@ const AutomatedReorderList = () => {
}
}, [AppId, CompId, BranchId]);
+ useEffect(() => {
+ if (UserType === 'Employee') {
+ fetchApi();
+ }
+ }, [UserType]);
+
+ useEffect(() => {
+ let hasAccess = false;
+
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+
+ const fetchApi = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Automated Reorder'
+ );
+ setEmpData(datas?.[0]);
+ };
+
const fetchData = async () => {
try {
const res = await dispatch(getAutomatedReorderList({ AppId, CompId, BranchId }))?.unwrap();
@@ -251,6 +293,7 @@ const AutomatedReorderList = () => {
}
/>
diff --git a/src/Pages/BarcodeSetup/BarcodeTemplateSetup.jsx b/src/Pages/BarcodeSetup/BarcodeTemplateSetup.jsx
index 895476a..61d8c4d 100644
--- a/src/Pages/BarcodeSetup/BarcodeTemplateSetup.jsx
+++ b/src/Pages/BarcodeSetup/BarcodeTemplateSetup.jsx
@@ -156,7 +156,7 @@ const BarcodeTemplateSetup = () => {
const { SadminuserAccess } = useAuth();
const SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Barcode / Qr Setup'
+ (e) => e?.MenuName === 'Barcode / QR'
);
// useDispatch
const dispatch = useDispatch();
@@ -335,7 +335,7 @@ const BarcodeTemplateSetup = () => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Barcode / Qr Setup'
+ (item) => item.ConfigName === 'Barcode / QR'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
index 2597d03..be660bc 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/ComboSalesBillTable/ComboSalesBillTable.jsx
@@ -2208,7 +2208,15 @@ const ComboSalesBillTable = () => {
{row?.BrandName ? ` ${row.BrandName}` : ''}
{row?.Type !== 'C' && (
- {row?.ProdVariantName} {row?.Size} {row?.UomName}
+ {/* {row?.ProdVariantName} {row?.Size} {row?.UomName} */}
+ (
+ {!row?.ProdVariantName?.toLowerCase()?.includes(
+ 'variant'
+ ) && {row?.ProdVariantName} }
+ {row?.Size}
+ {row?.SinglePc == 'Y' ? 'PCS' : row?.UomName}
+
+ )
)}
{row?.Type === 'C' &&
diff --git a/src/Pages/BookingScreen/Components/MainPage/MainPage.jsx b/src/Pages/BookingScreen/Components/MainPage/MainPage.jsx
index b4cb052..92a4d81 100644
--- a/src/Pages/BookingScreen/Components/MainPage/MainPage.jsx
+++ b/src/Pages/BookingScreen/Components/MainPage/MainPage.jsx
@@ -17,10 +17,15 @@ import { getSession } from '../../../../Services/Others';
import Buttons from '../../../../Components/Forms/Buttons';
import { BiSkipNext, BiSkipPrevious } from 'react-icons/bi';
import { MdOutlineDisplaySettings } from "react-icons/md";
+import { useAuth } from '../../../../AuthContext';
+import { getEmpAccess } from '../../../../Features/AppPage/CenterPage';
const BookingSelectionPage = (props) => {
-
+ const { SadminuserAccess } = useAuth();
+ let SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Sales Screen'
+ );
const AppId = getSession('AppId');
const UserId = getSession('UserId');
const CompId = getSession('CompId');
@@ -42,6 +47,8 @@ const BookingSelectionPage = (props) => {
console.log(SelectedTheme, "currentSlide")
const [OthersCount, setOthersCount] = useState(1);
const [isNext, isSetNext] = useState(true);
+ const [empData, setEmpData] = useState();
+ const [addnewAccess, setaddnewAccess] = useState(true);
const rightIsLastSlide = currentSlide === mergedThemes.length - 1;
const leftIsFirstSlide = currentSlide === 0 && OthersCount > 1;
const [pendingSlide, setPendingSlide] = useState(null);
@@ -64,6 +71,40 @@ const BookingSelectionPage = (props) => {
GetOthersTemplate()
// gettemplatedetail()
}, [])
+ useEffect(() => {
+ if (UserType === 'Employee') {
+ fetchApi();
+ }
+ }, [UserType]);
+
+ useEffect(() => {
+ let hasAccess = false;
+
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+
+ const fetchApi = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Sales Screen'
+ );
+ setEmpData(datas?.[0]);
+ };
+
const gettemplatedetail = async () => {
let tempdetail = await dispatch(
getTemplate({ CompId: CompId, BranchId: BranchId, AppId: AppId })
@@ -305,6 +346,7 @@ const BookingSelectionPage = (props) => {
}
/>
diff --git a/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx b/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
index 4ad30ed..7097f3d 100644
--- a/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
+++ b/src/Pages/BookingScreen/Components/MainPage/SelectionComponent.jsx
@@ -127,7 +127,7 @@ const SelectionComponent = forwardRef((props, ref) => {
console.log(SadminuserAccess, 'SadminuserAccess');
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Sales Setup'
+ (e) => e?.MenuName === 'Sales Screen'
);
const dispatch = useDispatch();
const formRef = useRef(null);
@@ -453,7 +453,7 @@ const SelectionComponent = forwardRef((props, ref) => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Sales Setup'
+ (item) => item.ConfigName === 'Sales Screen'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponent.jsx b/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponent.jsx
index 9ae3605..c1d674c 100644
--- a/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponent.jsx
+++ b/src/Pages/BookingScreen/Components/PrintMainPage/SelectionComponent.jsx
@@ -96,7 +96,7 @@ const SelectionComponent = forwardRef((props, ref) => {
}));
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Print Setup'
+ (e) => e?.MenuName === 'Print Forms'
);
const formRef = useRef(null);
@@ -395,7 +395,7 @@ const SelectionComponent = forwardRef((props, ref) => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Print Setup'
+ (item) => item.ConfigName === 'Print Forms'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/CancelReschedule/CancellationList.jsx b/src/Pages/CancelReschedule/CancellationList.jsx
index 9105af0..cf1f000 100644
--- a/src/Pages/CancelReschedule/CancellationList.jsx
+++ b/src/Pages/CancelReschedule/CancellationList.jsx
@@ -28,7 +28,7 @@ const CancellationList = () => {
console.log(SadminuserAccess, 'SadminuserAccess');
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Cancellation and Reschedule Rules'
+ (e) => e?.MenuName === 'Cancel / Reschedule'
);
const navigateTo = useNavigate();
@@ -234,7 +234,7 @@ const CancellationList = () => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Cancellation and Reschedule Rules'
+ (item) => item.ConfigName === 'Cancel / Reschedule'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/CancelReschedule/ChangePaymentmode.jsx b/src/Pages/CancelReschedule/ChangePaymentmode.jsx
index 647986c..d5cd450 100644
--- a/src/Pages/CancelReschedule/ChangePaymentmode.jsx
+++ b/src/Pages/CancelReschedule/ChangePaymentmode.jsx
@@ -77,7 +77,7 @@ const valueStyle = {
const ChangePaymentmode = () => {
const { SadminuserAccess } = useAuth();
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Cancel Payment Change'
+ (e) => e?.MenuName === 'Payment Mode Change'
);
const formRef = useRef();
@@ -182,6 +182,11 @@ const ChangePaymentmode = () => {
getCreditcustDetail();
}, [SelectCustId, SelectCust]);
+ useEffect(() => {
+ if (UserType === 'Employee') {
+ fetchApi();
+ }
+ }, [UserType]);
const fetchApi = async () => {
let data = {
CompId: CompId,
@@ -191,7 +196,7 @@ const ChangePaymentmode = () => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Cancel Payment Change'
+ (item) => item.ConfigName === 'Payment Mode Change'
);
setEmpData(datas?.[0]);
};
@@ -2119,7 +2124,7 @@ const ChangePaymentmode = () => {
buttonText="SUBMIT"
color="901D77"
icon={}
- disabled={addnewAccess ? false : isdisabled}
+ disabled={addnewAccess}
/>
diff --git a/src/Pages/CancelReschedule/SalesBillProductReturnList.jsx b/src/Pages/CancelReschedule/SalesBillProductReturnList.jsx
index 0e84251..3d34668 100644
--- a/src/Pages/CancelReschedule/SalesBillProductReturnList.jsx
+++ b/src/Pages/CancelReschedule/SalesBillProductReturnList.jsx
@@ -6,7 +6,7 @@ import { PlusOutlined } from '@ant-design/icons';
import { Messages } from '../../Components/Notifications/Messages';
import { Tables } from '../../Components/Tables/Table';
import { Search } from '../../Components/Forms/Search';
-import { changeBreadCrumb } from '../../Features/AppPage/CenterPage.js';
+import { changeBreadCrumb, getEmpAccess } from '../../Features/AppPage/CenterPage.js';
import { BsEye } from "react-icons/bs";
import Buttons from '../../Components/Forms/Buttons';
import { getSession } from '../../Services/Others';
@@ -14,6 +14,7 @@ import FormHeader from '../PageComponents/FormHeader.jsx';
import { getSalesReturn } from '../../Features/CancelReschedule/CancelApplicableProd.js';
import '../../Styles/OverAllStyle/OverAllStyle.scss';
import { DefaultModal } from '../../Components/Modal/DefaultModal.jsx';
+import { useAuth } from '../../AuthContext.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL;
const items = [
@@ -33,16 +34,24 @@ const items = [
];
const SalesBillProductReturnList = () => {
+ const { SadminuserAccess } = useAuth();
+ const SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Sales Product Return'
+ );
const [page, setpage] = useState(1);
const CompId = getSession('CompId');
const BranchId = getSession('BranchId');
const AppId = getSession('AppId');
+ const UserId = getSession('UserId');
+ const UserType = getSession('UserType');
const navigateTo = useNavigate();
const dispatch = useDispatch();
const [tabledata, setTabledata] = useState();
const [message, setMessage] = useState({ type: null, data: null });
const [searchedText, setSearchedText] = useState('');
const [sortedInfo, setSortedInfo] = useState({});
+ const [empData, setEmpData] = useState();
+ const [addnewAccess, setaddnewAccess] = useState(true);
const [productDetailsModel, setProductDetailsModel] = useState({
model: false,
data: []
@@ -98,6 +107,38 @@ const SalesBillProductReturnList = () => {
setMessage({ type: null, data: null })
}, []);
+
+ useEffect(() => {
+ let hasAccess = false;
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+
+ useEffect(() => {
+ if (UserType === "Employee") {
+ fetchApi()
+ }
+ }, [UserType])
+ const fetchApi = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Sales Product Return'
+ );
+ setEmpData(datas?.[0]);
+ };
const columns = [
{
title: 'Sl.No',
@@ -170,6 +211,7 @@ const SalesBillProductReturnList = () => {
buttonText={'Add New'}
handleSubmit={() => handelAddButton()}
color="901D77"
+ disabled={addnewAccess}
icon={}
>
OPEN
diff --git a/src/Pages/ComboPack/ComboMasterlist.jsx b/src/Pages/ComboPack/ComboMasterlist.jsx
index 2abdab7..7cbe220 100644
--- a/src/Pages/ComboPack/ComboMasterlist.jsx
+++ b/src/Pages/ComboPack/ComboMasterlist.jsx
@@ -54,7 +54,7 @@ const items = [
const ComboList = () => {
const { SadminuserAccess } = useAuth();
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Combo Product'
+ (e) => e?.MenuName === 'Add Product'
);
console.log(SadminuserAccess, 'SadminuserAccessSadminuserAccess');
@@ -205,7 +205,7 @@ const ComboList = () => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Combo Product'
+ (item) => item.ConfigName === 'Add Product'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/DeliveryChallan/Deliverychallan.jsx b/src/Pages/DeliveryChallan/Deliverychallan.jsx
index c1bc3bc..20a8ac9 100644
--- a/src/Pages/DeliveryChallan/Deliverychallan.jsx
+++ b/src/Pages/DeliveryChallan/Deliverychallan.jsx
@@ -65,7 +65,7 @@ import { isMobile } from 'react-device-detect';
const DeliveryChellanForm = () => {
const { SadminuserAccess } = useAuth();
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Delivery challan'
+ (e) => e?.MenuName === 'Delivery Challan'
);
const formRef = useRef(null);
const transportFormRef = useRef(null);
@@ -182,7 +182,7 @@ const DeliveryChellanForm = () => {
};
let response = await dispatch(getEmpAccess(data)).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Purchase Quotation'
+ (item) => item.ConfigName === 'Delivery Challan'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/EmpMaster/EmpMasterList.jsx b/src/Pages/EmpMaster/EmpMasterList.jsx
index 406f121..146dbff 100644
--- a/src/Pages/EmpMaster/EmpMasterList.jsx
+++ b/src/Pages/EmpMaster/EmpMasterList.jsx
@@ -44,7 +44,7 @@ const items = [
const EmployeeMaster = () => {
const { SadminuserAccess } = useAuth();
let SAAccessCommonMaster = SadminuserAccess?.find(
- (e) => e?.MenuName === 'Employee'
+ (e) => e?.MenuName === 'Add Employee'
);
const navigate = useNavigate();
@@ -144,7 +144,7 @@ const EmployeeMaster = () => {
})
).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'Employee'
+ (item) => item.ConfigName === 'Add Employee'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/ExchangeAndReplacement/ExchangeAndReplacementList.jsx b/src/Pages/ExchangeAndReplacement/ExchangeAndReplacementList.jsx
index 9146c65..50d2e32 100644
--- a/src/Pages/ExchangeAndReplacement/ExchangeAndReplacementList.jsx
+++ b/src/Pages/ExchangeAndReplacement/ExchangeAndReplacementList.jsx
@@ -34,7 +34,7 @@ const ExchangeAndReplacementList = () => {
const UserType = getSession('UserType');
const { SadminuserAccess } = useAuth();
- let SAAccessCommonMaster = SadminuserAccess?.find((e) => e?.MenuName === 'ExchangeAndReplacement');
+ let SAAccessCommonMaster = SadminuserAccess?.find((e) => e?.MenuName === 'Exchange / Return');
const items = [
{
@@ -87,7 +87,7 @@ const ExchangeAndReplacementList = () => {
})
).unwrap();
let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
- (item) => item.ConfigName === 'ExchangeAndReplacement'
+ (item) => item.ConfigName === 'Exchange / Return'
);
setEmpData(datas?.[0]);
};
diff --git a/src/Pages/ExchangeReturnMap/ExchangeReturnMapList.jsx b/src/Pages/ExchangeReturnMap/ExchangeReturnMapList.jsx
index 921e715..14be4f8 100644
--- a/src/Pages/ExchangeReturnMap/ExchangeReturnMapList.jsx
+++ b/src/Pages/ExchangeReturnMap/ExchangeReturnMapList.jsx
@@ -4,7 +4,7 @@ import Search from '../../Components/Forms/Search';
import { Tables } from '../../Components/Tables/Table';
import FormHeader from '../PageComponents/FormHeader';
import { useNavigate } from 'react-router-dom';
-import { changeBreadCrumb } from '../../Features/AppPage/CenterPage';
+import { changeBreadCrumb, getEmpAccess } from '../../Features/AppPage/CenterPage';
import {
DeleteFilled,
EditFilled,
@@ -26,7 +26,7 @@ import {
import { Space, Table, message, Modal, Alert } from 'antd';
import { DefaultModal } from '../../Components/Modal/DefaultModal';
import { IoEye } from 'react-icons/io5';
-
+import { useAuth } from '../../AuthContext';
const subDirectory = import.meta.env.BASE_URL;
const items = [
{
@@ -40,6 +40,11 @@ const items = [
},
];
const ExchangeReturnMapList = () => {
+
+ const { SadminuserAccess } = useAuth();
+ const SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Rules Mapping'
+ );
const dispatch = useDispatch();
const CompId = getSession('CompId');
const BranchId = getSession('BranchId');
@@ -53,7 +58,7 @@ const ExchangeReturnMapList = () => {
const [messageData, setMessageData] = useState(null);
// Add missing variables for access control
- const [SAAccessCommonMaster, setSAAccessCommonMaster] = useState({});
+ const [addnewAccess, setaddnewAccess] = useState(true);
const [empData, setEmpData] = useState({});
const [sortedInfo, setSortedInfo] = useState({});
@@ -132,6 +137,38 @@ const ExchangeReturnMapList = () => {
// }
// };
+ useEffect(() => {
+ let hasAccess = false;
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+ useEffect(() => {
+ if (UserType === "Employee") {
+ fetchApiEmpAccess()
+ }
+ }, [UserType])
+ const fetchApiEmpAccess = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Rules Mapping'
+ );
+ setEmpData(datas?.[0]);
+ };
+
+
const statusDeactive = async (data) => {
let deleteData = {
PolicyId: data.PolicyId,
@@ -270,7 +307,7 @@ const ExchangeReturnMapList = () => {
(UserType === 'Super Admin User' &&
SAAccessCommonMaster?.UpdateAccess === 'Y') ||
(UserType === 'Employee' &&
- empData?.UpdateAccess === 'Y') ||
+ addnewAccess) ||
UserType === 'Admin'
? actionsFormatter(record, index)
: null
@@ -301,7 +338,7 @@ const ExchangeReturnMapList = () => {
(UserType === 'Super Admin User' &&
SAAccessCommonMaster?.DeleteAccess === 'Y') ||
(UserType === 'Employee' &&
- empData?.DeleteAccess === 'Y') ||
+ addnewAccess) ||
UserType === 'Admin'
? statusDeactive(record)
: null
@@ -441,6 +478,7 @@ const ExchangeReturnMapList = () => {
}
color="901D77"
/>
diff --git a/src/Pages/Offer/CodeBase/CodeBaseList.jsx b/src/Pages/Offer/CodeBase/CodeBaseList.jsx
index 2f134bf..fc47e8c 100644
--- a/src/Pages/Offer/CodeBase/CodeBaseList.jsx
+++ b/src/Pages/Offer/CodeBase/CodeBaseList.jsx
@@ -19,23 +19,31 @@ import { deleteOfferCodeData, getCodeBaseProductData, putOfferCodeData } from '.
import {
ReloadOutlined,
} from '@ant-design/icons';
-import { changeBreadCrumb } from '../../../Features/AppPage/CenterPage.js';
+import { changeBreadCrumb, getEmpAccess } from '../../../Features/AppPage/CenterPage.js';
+import { useAuth } from '../../../AuthContext.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL;
const CodeBaseList = () => {
dayjs.extend(isSameOrBefore);
+ const { SadminuserAccess } = useAuth();
+ let SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Code Based'
+ );
const navigate = useNavigate();
const dispatch = useDispatch();
const AppId = getSession("AppId")
const CompId = getSession('CompId');
const BranchId = getSession('BranchId');
+ const UserType = getSession('UserType');
const UserId = getSession('UserId');
const [productdata, setProductdata] = useState()
const [searchText, setSearchText] = useState("");
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
+ const [empData, setEmpData] = useState();
+ const [addnewAccess, setaddnewAccess] = useState(true);
const [variantModal, setVariantModal] = useState({
open: false,
variants: [],
@@ -68,6 +76,38 @@ const CodeBaseList = () => {
dispatch(changeBreadCrumb({ items: items }));
}, []);
+
+ useEffect(() => {
+ let hasAccess = false;
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+
+ useEffect(() => {
+ if (UserType === "Employee") {
+ fetchApi()
+ }
+ }, [UserType])
+ const fetchApi = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Code Based'
+ );
+ setEmpData(datas?.[0]);
+ };
const onSearch = (value) => {
setSearchText(value.toLowerCase());
}
@@ -137,6 +177,13 @@ const CodeBaseList = () => {
setMessageType(null);
}, []);
+ const canUpdate =
+ UserType === 'Super Admin' ||
+ UserType === 'Admin' ||
+ (UserType === 'Super Admin User' &&
+ SAAccessCommonMaster?.UpdateAccess === 'Y') ||
+ (UserType === 'Employee' && empData?.UpdateAccess === 'Y');
+
const generalColumns = [
{
title: 'Sl.No',
@@ -231,40 +278,63 @@ const CodeBaseList = () => {
title: "Extend Date",
key: "extend",
align: "center",
- render: (_, record) => (
+ render: (_, record) => {
+ const canExtend =
+ record?.ActiveStatus === 'A' && canUpdate;
+
+ return (
- ),
+ );
+ },
},
{
title: "Actions",
key: "actions",
- render: (_, record, index) => (
+ render: (_, record, index) => {
+ const canUpdate =
+ UserType === "Super Admin" ||
+ UserType === "Admin" ||
+ (UserType === "Super Admin User" && SAAccessCommonMaster?.UpdateAccess === "Y") ||
+ (UserType === "Employee" && empData?.UpdateAccess === "Y");
+
+ const canDelete =
+ UserType === "Super Admin" ||
+ UserType === "Admin" ||
+ (UserType === "Super Admin User" && SAAccessCommonMaster?.DeleteAccess === "Y") ||
+ (UserType === "Employee" && empData?.DeleteAccess === "Y");
+
+ return (
{
e.stopPropagation();
setVariantModal({
open: true,
- product: record, // store the selected product
+ product: record,
variants: record?.ProdOfferDetails || [],
});
}}
@@ -272,9 +342,13 @@ const CodeBaseList = () => {
{record.ActiveStatus === "A" && (
{
e.stopPropagation();
+ if (!canUpdate) return;
navigate(`${subDirectory}setting/code-base/new`, {
state: { formType: "edit", editOffer: record },
});
@@ -285,25 +359,37 @@ const CodeBaseList = () => {
{
e.stopPropagation();
+ if (!canDelete) return;
statusFormatter(record, "D", index);
}}
/>
) : (
{
e.stopPropagation();
+ if (!canDelete) return;
statusFormatter(record, "A", index);
}}
/>
)}
- ),
+ );
+ },
}
+
];
@@ -324,7 +410,8 @@ const CodeBaseList = () => {
Code Base Offers
-
diff --git a/src/Pages/Offer/LoyaltyBased/LoyaltyBasedList.jsx b/src/Pages/Offer/LoyaltyBased/LoyaltyBasedList.jsx
index 074e3bc..fca20ad 100644
--- a/src/Pages/Offer/LoyaltyBased/LoyaltyBasedList.jsx
+++ b/src/Pages/Offer/LoyaltyBased/LoyaltyBasedList.jsx
@@ -18,23 +18,31 @@ import { deleteLoyaltyData, getLoyaltiPointsProductData, putLayoltiPointsData }
import {
ReloadOutlined,
} from '@ant-design/icons';
-import { changeBreadCrumb } from '../../../Features/AppPage/CenterPage.js';
+import { changeBreadCrumb, getEmpAccess } from '../../../Features/AppPage/CenterPage.js';
+import { useAuth } from '../../../AuthContext.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL;
const LoyaltyBasedList = () => {
dayjs.extend(isSameOrBefore);
+ const { SadminuserAccess } = useAuth();
+ let SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Loyalty Points'
+ );
const navigate = useNavigate();
const dispatch = useDispatch();
const AppId = getSession("AppId")
const CompId = getSession('CompId');
const BranchId = getSession('BranchId');
const UserId = getSession('UserId');
+ const UserType = getSession('UserType');
const [productdata, setProductdata] = useState()
const [searchText, setSearchText] = useState("");
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
+ const [empData, setEmpData] = useState();
+ const [addnewAccess, setaddnewAccess] = useState(true);
const [variantModal, setVariantModal] = useState({
open: false,
reward: null,
@@ -69,6 +77,37 @@ const LoyaltyBasedList = () => {
useEffect(() => {
dispatch(changeBreadCrumb({ items: items }));
}, []);
+ useEffect(() => {
+ let hasAccess = false;
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+
+ useEffect(() => {
+ if (UserType === "Employee") {
+ fetchApi()
+ }
+ }, [UserType])
+ const fetchApi = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Loyalty Points'
+ );
+ setEmpData(datas?.[0]);
+ };
const onSearch = (value) => {
setSearchText(value.toLowerCase());
@@ -224,18 +263,31 @@ const LoyaltyBasedList = () => {
{
title: "Extend Days",
key: "extend",
- // align: "center",
- render: (_, record) => (
+ render: (_, record) => {
+ const canExtend =
+ record.ActiveStatus === "A" &&
+ (
+ UserType === "Super Admin" ||
+ UserType === "Admin" ||
+ (UserType === "Super Admin User" && SAAccessCommonMaster?.UpdateAccess === "Y") ||
+ (UserType === "Employee" && empData?.UpdateAccess === "Y")
+ );
+
+ return (
- ),
+ );
+ }
},
{
title: "Actions",
key: "actions",
- render: (_, record) => (
+ render: (_, record) => {
+ // Permission checks
+ const canUpdate =
+ UserType === "Super Admin" ||
+ UserType === "Admin" ||
+ (UserType === "Super Admin User" && SAAccessCommonMaster?.UpdateAccess === "Y") ||
+ (UserType === "Employee" && empData?.UpdateAccess === "Y");
+
+ const canDelete =
+ UserType === "Super Admin" ||
+ UserType === "Admin" ||
+ (UserType === "Super Admin User" && SAAccessCommonMaster?.DeleteAccess === "Y") ||
+ (UserType === "Employee" && empData?.DeleteAccess === "Y");
+
+ return (
{/* View - only if RewardType !== Cash */}
{record?.RewardType !== "Cash" && (
@@ -259,10 +326,7 @@ const LoyaltyBasedList = () => {
style={{ cursor: "pointer" }}
onClick={(e) => {
e.stopPropagation();
- setVariantModal({
- open: true,
- product: record,
- });
+ setVariantModal({ open: true, product: record });
}}
/>
)}
@@ -272,9 +336,13 @@ const LoyaltyBasedList = () => {
{
e.stopPropagation();
+ if (!canUpdate) return;
navigate(`${subDirectory}setting/loyalty-based/update`, {
state: { formType: "edit", editLoyalty: record },
});
@@ -287,25 +355,37 @@ const LoyaltyBasedList = () => {
{
e.stopPropagation();
+ if (!canDelete) return;
statusFormatter(record, "D"); // deactivate
}}
/>
) : (
{
e.stopPropagation();
+ if (!canDelete) return;
statusFormatter(record, "A"); // reactivate
}}
/>
)}
- ),
+ );
+ },
}
+
];
@@ -326,7 +406,7 @@ const LoyaltyBasedList = () => {
Loyalty Points
-
diff --git a/src/Pages/Offer/Offer/OfferListNew.jsx b/src/Pages/Offer/Offer/OfferListNew.jsx
index 13b2871..509c513 100644
--- a/src/Pages/Offer/Offer/OfferListNew.jsx
+++ b/src/Pages/Offer/Offer/OfferListNew.jsx
@@ -27,7 +27,8 @@ import {
} from '../../../Features/Offer/Offernew/Offernew.js';
import { Messages } from '../../../Components/Notifications/Messages.jsx';
-import { changeBreadCrumb } from '../../../Features/AppPage/CenterPage.js';
+import { changeBreadCrumb, getEmpAccess } from '../../../Features/AppPage/CenterPage.js';
+import { useAuth } from '../../../AuthContext.jsx';
const subDirectory = import.meta.env.ENV_BASE_URL;
const OfferListNew = () => {
@@ -39,6 +40,8 @@ const OfferListNew = () => {
const AppId = getSession('AppId');
const CompId = getSession('CompId');
const BranchId = getSession('BranchId');
+ const UserType = getSession('UserType');
+ const UserId = getSession('UserId');
const [messageType, setMessageType] = useState(null);
const [messageData, setMessageData] = useState(null);
@@ -46,6 +49,10 @@ const OfferListNew = () => {
const [page, setpage] = useState(1);
const [sortedInfo, setSortedInfo] = useState({});
+ const { SadminuserAccess } = useAuth();
+ let SAAccessCommonMaster = SadminuserAccess?.find(
+ (e) => e?.MenuName === 'Product Based'
+ );
console.log(products, 'products');
const [allOffers, setAllOffers] = useState([]);
@@ -54,6 +61,8 @@ const OfferListNew = () => {
offer: null,
newToDate: null,
});
+ const [empData, setEmpData] = useState();
+ const [addnewAccess, setaddnewAccess] = useState(true);
const items = [
{
@@ -540,6 +549,37 @@ const OfferListNew = () => {
// ])
};
+ useEffect(() => {
+ let hasAccess = false;
+ if (UserType === 'Admin' || UserType === 'Super Admin') {
+ hasAccess = true;
+ } else if (UserType === 'Employee') {
+ hasAccess = empData?.AddAccess === 'Y';
+ } else if (UserType === 'Super Admin User') {
+ hasAccess = SAAccessCommonMaster?.AddAccess === 'Y';
+ }
+
+ setaddnewAccess(!hasAccess);
+ }, [empData, SAAccessCommonMaster, UserType]);
+
+ useEffect(() => {
+ if (UserType === "Employee") {
+ fetchApi()
+ }
+ }, [UserType])
+ const fetchApi = async () => {
+ let data = {
+ CompId: CompId,
+ BranchId: BranchId,
+ AppId: AppId,
+ EmpId: UserId,
+ };
+ let response = await dispatch(getEmpAccess(data)).unwrap();
+ let datas = response?.data?.data?.[0]?.EmpAccessDetails?.filter(
+ (item) => item.ConfigName === 'Product Based'
+ );
+ setEmpData(datas?.[0]);
+ };
function ExtractDateFormate(dateString) {
if (!dateString) return '';
@@ -683,73 +723,131 @@ const OfferListNew = () => {
dataIndex: 'extend',
key: 'extend',
align: 'center',
- render: (_, record) =>
- record?.ActiveStatus === 'A' ? (
+ render: (_, record) => {
+
+ const canUpdate =
+ UserType === 'Super Admin' ||
+ UserType === 'Admin' ||
+ (UserType === 'Super Admin User' &&
+ SAAccessCommonMaster?.UpdateAccess === 'Y') ||
+ (UserType === 'Employee' && empData?.UpdateAccess === 'Y');
+
+ const canEdit =
+ record?.ActiveStatus === 'A' && canUpdate;
+
+ return record?.ActiveStatus === 'A' ? (
- setExtendModal({ open: true, offer: record, newToDate: null })
- }
+ className={canEdit ? 'extend-button' : 'extendisabled'}
+ onClick={() => {
+ if (!canEdit) return;
+ setExtendModal({
+ open: true,
+ offer: record,
+ newToDate: null,
+ });
+ }}
style={{
height: '32px',
width: '100px',
- padding: '1 12px',
+ padding: '1px 12px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
+ cursor: canEdit ? 'pointer' : 'not-allowed',
+ opacity: canEdit ? 1 : 0.5,
}}
>
Extend
) : (
Extend
- ),
+ );
+ }
},
+
{
title: 'Actions',
dataIndex: 'actions',
key: 'actions',
- render: (_, record, index) => (
+ render: (_, record, index) => {
+
+ const canUpdate =
+ UserType === 'Super Admin' ||
+ UserType === 'Admin' ||
+ (UserType === 'Super Admin User' && SAAccessCommonMaster?.UpdateAccess === 'Y') ||
+ (UserType === 'Employee' && empData?.UpdateAccess === 'Y');
+
+ const canDelete =
+ UserType === 'Super Admin' ||
+ UserType === 'Admin' ||
+ (UserType === 'Super Admin User' && SAAccessCommonMaster?.DeleteAccess === 'Y') ||
+ (UserType === 'Employee' && empData?.DeleteAccess === 'Y');
+
+ return (
{
- (e.stopPropagation(),
- setOpen((prev) => !prev),
- setProducts(record));
+ e.stopPropagation();
+ setOpen((prev) => !prev);
+ setProducts(record);
}}
/>
- {record.ActiveStatus == 'A' && (
+
+ {/* Edit */}
+ {record?.ActiveStatus === 'A' && (
{
- (e.stopPropagation(), actionsFormatter(record, index));
+ e.stopPropagation();
+ if (!canUpdate) return;
+ actionsFormatter(record, index);
}}
/>
)}
- {record?.ActiveStatus == 'A' ? (
+ {record?.ActiveStatus === 'A' ? (
{
- (e.stopPropagation(), statusFormatter(record, index));
+ e.stopPropagation();
+ if (!canDelete) return;
+ statusFormatter(record, index);
}}
/>
) : (
{
- (e.stopPropagation(), statusFormatter(record, index));
+ e.stopPropagation();
+ if (!canDelete) return;
+ statusFormatter(record, index);
}}
/>
)}
- ),
+ );
},
+ }
+
+
];
const handleNewOffer = () => {
@@ -797,7 +895,9 @@ const OfferListNew = () => {
Product Offers
-