admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'Service_Project_Managment' of https://git.marcoaiot.com/admin/marco.pms.web into Service_Project_Managment

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-17 13:34:09 +05:30
commit 4f03cbb305
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/Layout/Header.jsx
View File

@ -46,8 +46,12 @@ const Header = () => {
pathname pathname
); );
const isExpensePage = /^\/expenses$/.test(pathname); const isExpensePage = /^\/expenses$/.test(pathname);
const isPaymentRequest = /^\/payment-request$/.test(pathname);
const isRecurringExpense = /^\/recurring-payment$/.test(pathname);
const isAdvancePayment = /^\/advance-payment$/.test(pathname);
const isServiceProjectPage = /^\/service-projects\/[0-9a-fA-F-]{36}$/.test(pathname);
return !(isDirectoryPath || isProfilePage || isExpensePage); return !(isDirectoryPath || isProfilePage || isExpensePage || isPaymentRequest || isRecurringExpense || isAdvancePayment ||isServiceProjectPage);
}; };
const allowedProjectStatusIds = [ const allowedProjectStatusIds = [
"603e994b-a27f-4e5d-a251-f3d69b0498ba", "603e994b-a27f-4e5d-a251-f3d69b0498ba",
@ -59,11 +63,7 @@ const Header = () => {
if (!Array.isArray(roles)) return "User"; if (!Array.isArray(roles)) return "User";
let role = roles.find((role) => role.id === joRoleId); let role = roles.find((role) => role.id === joRoleId);
return role ? role.name : "User"; return role ? role.name : "User";
}; };
const handleProfilePage = () => { const handleProfilePage = () => {
navigate(`/employee/${profile?.employeeInfo?.id}`); navigate(`/employee/${profile?.employeeInfo?.id}`);

2
src/pages/AdvancePayment/AdvancePaymentPage.jsx
View File

@ -67,7 +67,7 @@ const AdvancePaymentPage = () => {
<div className="col-md-8 d-flex align-items-center justify-content-end"> <div className="col-md-8 d-flex align-items-center justify-content-end">
{balance ? ( {balance ? (
<> <>
<label className="fs-5 fw-semibold">Total Balance : </label> <label className="fs-5 fw-semibold">Current Balance : </label>
<span <span
className={`${ className={`${
balance > 0 ? "text-success" : "text-danger" balance > 0 ? "text-success" : "text-danger"