Compare commits
3 Commits
Multiple_F
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 96bcdffdca | |||
| f8963ef476 | |||
| 9ad3b8726c |
@ -1,7 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" lang="en" class="light-style layout-navbar-fixed layout-menu-fixed layout-compact layout-menu-collapsed " dir="ltr"
|
<html lang="en" lang="en" class="light-style layout-navbar-fixed layout-menu-fixed layout-compact" dir="ltr"
|
||||||
data-theme="theme-default" data-assets-path="/assets/" data-template="vertical-menu-template" data-style="light">
|
data-theme="theme-default" data-assets-path="/assets/" data-template="vertical-menu-template" data-style="light">
|
||||||
<!-- layout-menu-collapsed layout-menu-hover -->
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
|||||||
@ -11,18 +11,6 @@
|
|||||||
top: var(--sticky-top, 0px) !important;
|
top: var(--sticky-top, 0px) !important;
|
||||||
z-index: 1025;
|
z-index: 1025;
|
||||||
}
|
}
|
||||||
.form-control-md {
|
|
||||||
min-height: calc(1.6em + 0.65rem + calc(var(--bs-border-width) * 2));
|
|
||||||
padding: 0.18rem 0.60rem;
|
|
||||||
font-size: 0.875rem; /* ~14px */
|
|
||||||
border-radius: var(--bs-border-radius);
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-control-md::file-selector-button {
|
|
||||||
padding: 0.32rem 0.75rem;
|
|
||||||
margin: -0.32rem -0.75rem;
|
|
||||||
margin-inline-end: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ===========================% Background_Colors %========================================================== */
|
/* ===========================% Background_Colors %========================================================== */
|
||||||
@ -234,9 +222,7 @@ font-weight: normal;
|
|||||||
.h-min { height: min-content; }
|
.h-min { height: min-content; }
|
||||||
.h-max { height: max-content; }
|
.h-max { height: max-content; }
|
||||||
|
|
||||||
.vh-50 {
|
|
||||||
height: 50vh !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.app-brand-text {
|
.app-brand-text {
|
||||||
font-size: 1rem;
|
font-size: 1.75rem;
|
||||||
letter-spacing: -0.5px;
|
letter-spacing: -0.5px;
|
||||||
/* text-transform: lowercase; */
|
/* text-transform: lowercase; */
|
||||||
}
|
}
|
||||||
|
|||||||
@ -148,41 +148,5 @@ function Main () {
|
|||||||
wheelPropagation: false
|
wheelPropagation: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
document.addEventListener("DOMContentLoaded", function () {
|
|
||||||
const html = document.documentElement;
|
|
||||||
|
|
||||||
/******************************
|
|
||||||
* SIDEBAR HOVER BEHAVIOR
|
|
||||||
******************************/
|
|
||||||
document.addEventListener("mouseover", function (e) {
|
|
||||||
const isInsideSidebar = e.target.closest("#layout-menu");
|
|
||||||
|
|
||||||
if (isInsideSidebar && html.classList.contains("layout-menu-collapsed")) {
|
|
||||||
html.classList.add("layout-menu-hover");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document.addEventListener("mouseout", function (e) {
|
|
||||||
const leftSidebar = !e.relatedTarget || !e.relatedTarget.closest("#layout-menu");
|
|
||||||
|
|
||||||
if (leftSidebar) {
|
|
||||||
html.classList.remove("layout-menu-hover");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
/******************************
|
|
||||||
* TOGGLE MENU BUTTON OVERRIDE
|
|
||||||
******************************/
|
|
||||||
document.body.addEventListener("click", function (e) {
|
|
||||||
const btn = e.target.closest(".layout-menu-toggle");
|
|
||||||
if (!btn) return;
|
|
||||||
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
html.classList.toggle("layout-menu-collapsed");
|
|
||||||
html.classList.remove("layout-menu-hover");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@ -39,12 +39,14 @@ const TaskReportFilterPanel = ({ handleFilter }) => {
|
|||||||
dateTo: localToUtc(formData.dateTo),
|
dateTo: localToUtc(formData.dateTo),
|
||||||
};
|
};
|
||||||
handleFilter(filterPayload);
|
handleFilter(filterPayload);
|
||||||
|
closePanel();
|
||||||
};
|
};
|
||||||
|
|
||||||
const onClear = () => {
|
const onClear = () => {
|
||||||
setResetKey((prev) => prev + 1);
|
setResetKey((prev) => prev + 1);
|
||||||
handleFilter(TaskReportDefaultValue);
|
handleFilter(TaskReportDefaultValue);
|
||||||
reset(TaskReportDefaultValue);
|
reset(TaskReportDefaultValue);
|
||||||
|
closePanel();
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
<FormProvider {...methods}>
|
<FormProvider {...methods}>
|
||||||
|
|||||||
@ -204,34 +204,24 @@ const TaskReportList = () => {
|
|||||||
<HoverPopup
|
<HoverPopup
|
||||||
id="total_pending_task"
|
id="total_pending_task"
|
||||||
title="Total Pending Task"
|
title="Total Pending Task"
|
||||||
content={
|
content={<p>This shows the total pending tasks for each activity on that date.</p>}
|
||||||
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
|
||||||
This shows the total pending tasks for each activity on that date.
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
||||||
</HoverPopup>
|
</HoverPopup>
|
||||||
</span>
|
</span>
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th>
|
<th>
|
||||||
<span>
|
<span>
|
||||||
Reported/Planned{" "}
|
Reported/Planned{" "}
|
||||||
<HoverPopup
|
<HoverPopup
|
||||||
id="reportes_and_planned_task"
|
id="reportes_and_planned_task"
|
||||||
title="Reported and Planned Task"
|
title="Reported and Planned Task"
|
||||||
content={
|
content={<p>This shows the reported versus planned tasks for each activity on that date.</p>}
|
||||||
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
|
||||||
This shows the reported versus planned tasks for each activity on that date.
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
<i className="bx bx-xs ms-1 bx-info-circle cursor-pointer"></i>
|
||||||
</HoverPopup>
|
</HoverPopup>
|
||||||
</span>
|
</span>
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th>Assign Date</th>
|
<th>Assign Date</th>
|
||||||
<th>Team</th>
|
<th>Team</th>
|
||||||
<th className="text-center">Actions</th>
|
<th className="text-center">Actions</th>
|
||||||
|
|||||||
@ -100,7 +100,7 @@ const AttendanceOverview = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white px-4 rounded shadow d-flex flex-column h-100" style={{ minHeight: "450px" }}>
|
<div className="bg-white px-4 rounded shadow d-flex flex-column h-100">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div className="d-flex mt-2 justify-content-between align-items-center mb-3">
|
<div className="d-flex mt-2 justify-content-between align-items-center mb-3">
|
||||||
<div className="card-title mb-0 text-start">
|
<div className="card-title mb-0 text-start">
|
||||||
|
|||||||
@ -17,19 +17,12 @@ import ExpenseAnalysis from "./ExpenseAnalysis";
|
|||||||
import ExpenseStatus from "./ExpenseStatus";
|
import ExpenseStatus from "./ExpenseStatus";
|
||||||
import ExpenseByProject from "./ExpenseByProject";
|
import ExpenseByProject from "./ExpenseByProject";
|
||||||
import ProjectStatistics from "../Project/ProjectStatistics";
|
import ProjectStatistics from "../Project/ProjectStatistics";
|
||||||
import ServiceJobs from "./ServiceJobs";
|
|
||||||
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
|
|
||||||
import { REGULARIZE_ATTENDANCE, SELF_ATTENDANCE, TEAM_ATTENDANCE } from "../../utils/constants";
|
|
||||||
|
|
||||||
const Dashboard = () => {
|
const Dashboard = () => {
|
||||||
|
|
||||||
// Get the selected project ID from Redux store
|
// Get the selected project ID from Redux store
|
||||||
const projectId = useSelector((store) => store.localVariables.projectId);
|
const projectId = useSelector((store) => store.localVariables.projectId);
|
||||||
const isAllProjectsSelected = projectId === null;
|
const isAllProjectsSelected = projectId === null;
|
||||||
const canRegularize = useHasUserPermission(REGULARIZE_ATTENDANCE);
|
|
||||||
const canTeamAttendance = useHasUserPermission(TEAM_ATTENDANCE);
|
|
||||||
const canSelfAttendance = useHasUserPermission(SELF_ATTENDANCE);
|
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="container-fluid mt-5">
|
<div className="container-fluid mt-5">
|
||||||
@ -47,6 +40,26 @@ const Dashboard = () => {
|
|||||||
<div className={`${!isAllProjectsSelected ? "col-sm-6 col-lg-6" : "col-sm-6 col-lg-4"}`}>
|
<div className={`${!isAllProjectsSelected ? "col-sm-6 col-lg-6" : "col-sm-6 col-lg-4"}`}>
|
||||||
<TasksCard />
|
<TasksCard />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{isAllProjectsSelected && (
|
||||||
|
<div className="col-xxl-6 col-lg-6">
|
||||||
|
<ProjectCompletionChart />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="col-xxl-6 col-lg-6">
|
||||||
|
<ProjectProgressChart />
|
||||||
|
</div>
|
||||||
|
{!isAllProjectsSelected && (
|
||||||
|
<div className="col-12 col-md-6 mb-sm-0 mb-4">
|
||||||
|
<AttendanceOverview />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!isAllProjectsSelected && (
|
||||||
|
<div className="col-xxl-4 col-lg-4">
|
||||||
|
<ProjectStatistics />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<div className="col-12 col-xl-4 col-md-6">
|
<div className="col-12 col-xl-4 col-md-6">
|
||||||
<div className="card ">
|
<div className="card ">
|
||||||
<ExpenseStatus />
|
<ExpenseStatus />
|
||||||
@ -61,32 +74,6 @@ const Dashboard = () => {
|
|||||||
<div className="col-12 col-md-6">
|
<div className="col-12 col-md-6">
|
||||||
<ExpenseByProject />
|
<ExpenseByProject />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{isAllProjectsSelected && (
|
|
||||||
<div className="col-xxl-6 col-lg-6">
|
|
||||||
<ProjectCompletionChart />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="col-xxl-6 col-lg-6">
|
|
||||||
<ProjectProgressChart />
|
|
||||||
</div>
|
|
||||||
{!isAllProjectsSelected && (canRegularize || canTeamAttendance || canSelfAttendance) && (
|
|
||||||
<div className="col-12 col-md-6 mb-sm-0 mb-4">
|
|
||||||
<AttendanceOverview />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isAllProjectsSelected && (
|
|
||||||
<div className="col-xxl-4 col-lg-4">
|
|
||||||
<div className="card h-100">
|
|
||||||
<ProjectStatistics />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* <div className="col-12 col-md-12">
|
|
||||||
<ServiceJobs />
|
|
||||||
</div> */}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,237 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
const ServiceJobs = () => {
|
|
||||||
return (
|
|
||||||
<div className="col-xxl-4 col-lg-6">
|
|
||||||
<div className="card h-100">
|
|
||||||
<div className="card-header d-flex justify-content-between">
|
|
||||||
<div className="card-title mb-0 text-start">
|
|
||||||
<h5 className="mb-1">Service Jobs</h5>
|
|
||||||
<p className="card-subtitle">All Projects</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="card-body p-0">
|
|
||||||
<div className="nav-align-top">
|
|
||||||
|
|
||||||
{/* Tabs */}
|
|
||||||
<ul className="nav nav-tabs nav-fill rounded-0 timeline-indicator-advanced" role="tablist">
|
|
||||||
<li className="nav-item">
|
|
||||||
<button className="nav-link active" data-bs-toggle="tab" data-bs-target="#tab-new">
|
|
||||||
My Jobs
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li className="nav-item">
|
|
||||||
<button className="nav-link" data-bs-toggle="tab" data-bs-target="#tab-preparing">
|
|
||||||
Assigned
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li className="nav-item">
|
|
||||||
<button className="nav-link" data-bs-toggle="tab" data-bs-target="#tab-shipping">
|
|
||||||
In Progress
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
{/* Tab Content */}
|
|
||||||
<div className="tab-content border-0 mx-1 text-start">
|
|
||||||
|
|
||||||
{/* ---------------------- NEW TAB ---------------------- */}
|
|
||||||
<div className="tab-pane fade show active" id="tab-new">
|
|
||||||
{/* Entry 1 */}
|
|
||||||
<ul className="timeline mb-0">
|
|
||||||
<li className="timeline-item ps-6 border-left-dashed">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-success border-0 shadow-none">
|
|
||||||
<i className="bx bx-check-circle"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-success text-uppercase">Sender</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Myrtle Ullrich</h6>
|
|
||||||
<p className="text-body mb-0">101 Boulder, California(CA), 95959</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
<li className="timeline-item ps-6 border-transparent">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
|
|
||||||
<i className="bx bx-map"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-primary text-uppercase">Receiver</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Barry Schowalter</h6>
|
|
||||||
<p className="text-body mb-0">939 Orange, California(CA), 92118</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div className="border-1 border-light border-top border-dashed my-4"></div>
|
|
||||||
|
|
||||||
{/* Entry 2 */}
|
|
||||||
<ul className="timeline mb-0">
|
|
||||||
<li className="timeline-item ps-6 border-left-dashed">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-success border-0 shadow-none">
|
|
||||||
<i className="bx bx-check-circle"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-success text-uppercase">Sender</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Veronica Herman</h6>
|
|
||||||
<p className="text-body mb-0">162 Windsor, California(CA), 95492</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
<li className="timeline-item ps-6 border-transparent">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
|
|
||||||
<i className="bx bx-map"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-primary text-uppercase">Receiver</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Helen Jacobs</h6>
|
|
||||||
<p className="text-body mb-0">487 Sunset, California(CA), 94043</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* ---------------------- PREPARING TAB ---------------------- */}
|
|
||||||
<div className="tab-pane fade" id="tab-preparing">
|
|
||||||
|
|
||||||
{/* Entry 1 */}
|
|
||||||
<ul className="timeline mb-0">
|
|
||||||
<li className="timeline-item ps-6 border-left-dashed">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-warning border-0 shadow-none">
|
|
||||||
<i className="bx bx-time-five"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-warning text-uppercase">Sender</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Oliver Grant</h6>
|
|
||||||
<p className="text-body mb-0">220 Pine St, California(CA), 95765</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li className="timeline-item ps-6 border-transparent">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
|
|
||||||
<i className="bx bx-map"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-primary text-uppercase">Receiver</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Samantha Lee</h6>
|
|
||||||
<p className="text-body mb-0">744 Bay Area, California(CA), 94016</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div className="border-1 border-light border-top border-dashed my-4"></div>
|
|
||||||
|
|
||||||
{/* Entry 2 */}
|
|
||||||
<ul className="timeline mb-0">
|
|
||||||
<li className="timeline-item ps-6 border-left-dashed">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-warning border-0 shadow-none">
|
|
||||||
<i className="bx bx-time-five"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-warning text-uppercase">Sender</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Marcus Howard</h6>
|
|
||||||
<p className="text-body mb-0">58 Avenue, California(CA), 95376</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li className="timeline-item ps-6 border-transparent">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
|
|
||||||
<i className="bx bx-map"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-primary text-uppercase">Receiver</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Daniel Foster</h6>
|
|
||||||
<p className="text-body mb-0">312 Marina, California(CA), 94109</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* ---------------------- SHIPPING TAB ---------------------- */}
|
|
||||||
<div className="tab-pane fade" id="tab-shipping">
|
|
||||||
|
|
||||||
{/* Entry 1 */}
|
|
||||||
<ul className="timeline mb-0">
|
|
||||||
<li className="timeline-item ps-6 border-left-dashed">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-info border-0 shadow-none">
|
|
||||||
<i className="bx bx-package"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-info text-uppercase">Sender</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">James Carter</h6>
|
|
||||||
<p className="text-body mb-0">441 Market St, California(CA), 94111</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li className="timeline-item ps-6 border-transparent">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
|
|
||||||
<i className="bx bx-map"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-primary text-uppercase">Receiver</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Linda Moore</h6>
|
|
||||||
<p className="text-body mb-0">990 Willow Road, California(CA), 94025</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div className="border-1 border-light border-top border-dashed my-4"></div>
|
|
||||||
|
|
||||||
{/* Entry 2 */}
|
|
||||||
<ul className="timeline mb-0">
|
|
||||||
<li className="timeline-item ps-6 border-left-dashed">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-info border-0 shadow-none">
|
|
||||||
<i className="bx bx-package"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-info text-uppercase">Sender</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">Sarah Bennett</h6>
|
|
||||||
<p className="text-body mb-0">882 Canyon Rd, California(CA), 94704</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<li className="timeline-item ps-6 border-transparent">
|
|
||||||
<span className="timeline-indicator-advanced timeline-indicator-primary border-0 shadow-none">
|
|
||||||
<i className="bx bx-map"></i>
|
|
||||||
</span>
|
|
||||||
<div className="timeline-event ps-1">
|
|
||||||
<div className="timeline-header">
|
|
||||||
<small className="text-primary text-uppercase">Receiver</small>
|
|
||||||
</div>
|
|
||||||
<h6 className="my-50">George Simmons</h6>
|
|
||||||
<p className="text-body mb-0">19 Palm St, California(CA), 93001</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ServiceJobs;
|
|
||||||
@ -2,53 +2,54 @@ import React from "react";
|
|||||||
import { formatFileSize, getIconByFileType } from "../../utils/appUtils";
|
import { formatFileSize, getIconByFileType } from "../../utils/appUtils";
|
||||||
import Tooltip from "../common/Tooltip";
|
import Tooltip from "../common/Tooltip";
|
||||||
|
|
||||||
const Filelist = ({ files, removeFile, expenseToEdit, sm = 6, md = 4 }) => {
|
const Filelist = ({ files, removeFile, expenseToEdit,sm=6,md=4 }) => {
|
||||||
return (
|
return (
|
||||||
<div className="d-flex flex-wrap gap-2 my-1">
|
<div className="d-flex flex-wrap gap-2 my-1">
|
||||||
{files
|
{files
|
||||||
.filter((file) => {
|
.filter((file) => {
|
||||||
if (expenseToEdit) {
|
if (expenseToEdit) {
|
||||||
return file.isActive;
|
return file.isActive;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
})
|
})
|
||||||
.map((file, idx) => (
|
.map((file, idx) => (
|
||||||
<div className={`col-12 col-sm-${sm} col-md-${md} mb-2`} key={idx}>
|
<div className={`col-12 col-sm-${sm} col-md-${md} mb-2`} key={idx}>
|
||||||
<div className="d-flex align-items-center justify-content-between bg-white border rounded p-1">
|
<div className="d-flex align-items-center justify-content-between bg-white border rounded p-1">
|
||||||
{/* File icon and info */}
|
{/* File icon and info */}
|
||||||
<div className="d-flex align-items-center flex-grow-1 gap-2 overflow-hidden">
|
<div className="d-flex align-items-center flex-grow-1 gap-2 overflow-hidden">
|
||||||
<i
|
<i
|
||||||
className={`bx ${getIconByFileType(file?.contentType)} fs-3 `}
|
className={`bx ${getIconByFileType(
|
||||||
style={{ minWidth: "30px" }}
|
file?.contentType
|
||||||
></i>
|
)} fs-3 `}
|
||||||
|
style={{ minWidth: "30px" }}
|
||||||
|
></i>
|
||||||
|
|
||||||
<Tooltip text={file.fileName}>
|
<div className="d-flex flex-column text-truncate">
|
||||||
<div className="d-flex flex-column text-truncate">
|
<span className="fw-semibold small text-truncate">
|
||||||
<span className="fw-semibold small text-truncate">
|
{file.fileName}
|
||||||
{file.fileName}
|
</span>
|
||||||
</span>
|
<span className="text-body-secondary small">
|
||||||
<span className="text-body-secondary small">
|
{file.fileSize ? formatFileSize(file.fileSize) : ""}
|
||||||
{file.fileSize ? formatFileSize(file.fileSize) : ""}
|
</span>
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Delete icon */}
|
|
||||||
<Tooltip text="Remove file">
|
|
||||||
<i
|
|
||||||
className="bx bx-sm bx-trash text-danger fs-4 cursor-pointer ms-2"
|
|
||||||
role="button"
|
|
||||||
onClick={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
removeFile(expenseToEdit ? file.documentId ?? file.tempId ?? idx : file.tempId ?? idx);
|
|
||||||
}}
|
|
||||||
></i>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))}
|
|
||||||
</div>
|
{/* Delete icon */}
|
||||||
|
<Tooltip text="Remove file">
|
||||||
|
<i
|
||||||
|
className="bx bx-sm bx-trash text-danger fs-4 cursor-pointer ms-2"
|
||||||
|
role="button"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
removeFile(expenseToEdit ? file.documentId : idx);
|
||||||
|
}}
|
||||||
|
></i>
|
||||||
|
</Tooltip>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -57,11 +58,13 @@ export const FilelistView = ({ files, viewFile }) => {
|
|||||||
return (
|
return (
|
||||||
<div className="d-flex flex-wrap gap-2 mt-2">
|
<div className="d-flex flex-wrap gap-2 mt-2">
|
||||||
{files?.map((file, idx) => (
|
{files?.map((file, idx) => (
|
||||||
<div className=" bg-white " key={idx}>
|
<div className=" bg-white " key={idx}>
|
||||||
<div className="row align-items-center">
|
<div className="row align-items-center">
|
||||||
{/* File icon and info */}
|
{/* File icon and info */}
|
||||||
<div className="col-12 d-flex align-items-center gap-2">
|
<div className="col-12 d-flex align-items-center gap-2">
|
||||||
<i className={`bx ${getIconByFileType(file?.fileName)} fs-3`}></i>
|
<i
|
||||||
|
className={`bx ${getIconByFileType(file?.fileName)} fs-3`}
|
||||||
|
></i>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className="d-flex flex-column text-truncate"
|
className="d-flex flex-column text-truncate"
|
||||||
@ -69,7 +72,7 @@ export const FilelistView = ({ files, viewFile }) => {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
viewFile({
|
viewFile({
|
||||||
IsOpen: true,
|
IsOpen: true,
|
||||||
Image: files,
|
Image: file.preSignedUrl,
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -89,45 +92,4 @@ export const FilelistView = ({ files, viewFile }) => {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
export const FileView = ({ file, viewFile }) => {
|
|
||||||
if (!file) {
|
|
||||||
return (
|
|
||||||
<div className="d-flex justify-content-center align-items-center py-4">
|
|
||||||
<p className="mb-0 text-muted small">No file uploaded</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className=" bg-white ">
|
|
||||||
<div className="row align-items-center">
|
|
||||||
{/* File icon and info */}
|
|
||||||
<div className="col-12 d-flex align-items-center gap-2 ms-n1">
|
|
||||||
<i className={`bx ${getIconByFileType(file?.contentType)} fs-4`}></i>
|
|
||||||
|
|
||||||
<div
|
|
||||||
className="d-flex flex-column text-truncate"
|
|
||||||
onClick={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
viewFile({
|
|
||||||
IsOpen: true,
|
|
||||||
Image: file.preSignedUrl,
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<span className="text-muted small text-truncate mb-n4">
|
|
||||||
{file.fileName}
|
|
||||||
</span>
|
|
||||||
<span className="text-body-secondary small">
|
|
||||||
<Tooltip text={"Click on file"}>
|
|
||||||
{" "}
|
|
||||||
{file.fileSize ? formatFileSize(file.fileSize) : ""}
|
|
||||||
</Tooltip>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -236,8 +236,31 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
{expenseToEdit ? "Update Expense " : "Create New Expense"}
|
{expenseToEdit ? "Update Expense " : "Create New Expense"}
|
||||||
</h5>
|
</h5>
|
||||||
<form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
|
<form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
|
||||||
<div className="row my-2 text-start">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-12 col-md-6">
|
{/* <div className="col-md-6">
|
||||||
|
<Label className="form-label" required>
|
||||||
|
Select Project
|
||||||
|
</Label>
|
||||||
|
<select
|
||||||
|
className="form-select form-select-sm"
|
||||||
|
{...register("projectId")}
|
||||||
|
>
|
||||||
|
<option value="">Select Project</option>
|
||||||
|
{projectLoading ? (
|
||||||
|
<option>Loading...</option>
|
||||||
|
) : (
|
||||||
|
projectNames?.map((project) => (
|
||||||
|
<option key={project.id} value={project.id}>
|
||||||
|
{project.name}
|
||||||
|
</option>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</select>
|
||||||
|
{errors.projectId && (
|
||||||
|
<small className="danger-text">{errors.projectId.message}</small>
|
||||||
|
)}
|
||||||
|
</div> */}
|
||||||
|
<div className="col-12 col-md-6 mb-2">
|
||||||
<SelectProjectField
|
<SelectProjectField
|
||||||
label="Project"
|
label="Project"
|
||||||
required
|
required
|
||||||
@ -260,7 +283,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
Expense Category
|
Expense Category
|
||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
className="form-select "
|
className="form-select form-select-sm"
|
||||||
id="expenseCategoryId"
|
id="expenseCategoryId"
|
||||||
{...register("expenseCategoryId")}
|
{...register("expenseCategoryId")}
|
||||||
>
|
>
|
||||||
@ -291,7 +314,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
Payment Mode
|
Payment Mode
|
||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
className="form-select "
|
className="form-select form-select-sm"
|
||||||
id="paymentModeId"
|
id="paymentModeId"
|
||||||
{...register("paymentModeId")}
|
{...register("paymentModeId")}
|
||||||
>
|
>
|
||||||
@ -314,23 +337,34 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
</small>
|
</small>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="col-12 col-md-6 text-start">
|
<div className="col-12 col-md-6 text-start">
|
||||||
|
{/* <Label className="form-label" required>
|
||||||
|
Paid By{" "}
|
||||||
|
</Label> */}
|
||||||
|
{/* <EmployeeSearchInput
|
||||||
|
control={control}
|
||||||
|
name="paidById"
|
||||||
|
projectId={null}
|
||||||
|
forAll={true}
|
||||||
|
/> */}
|
||||||
|
|
||||||
<AppFormController
|
<AppFormController
|
||||||
name="paidById"
|
name="paidById"
|
||||||
|
|
||||||
control={control}
|
control={control}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<SelectEmployeeServerSide
|
<SelectEmployeeServerSide
|
||||||
label="Paid By" required
|
label="Paid By" required
|
||||||
value={field.value}
|
value={field.value}
|
||||||
onChange={field.onChange}
|
onChange={field.onChange}
|
||||||
isFullObject={false}
|
isFullObject={false} // because using ID
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="row my-2 text-start mb-4">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<Label htmlFor="transactionDate" className="form-label" required>
|
<Label htmlFor="transactionDate" className="form-label" required>
|
||||||
Transaction Date
|
Transaction Date
|
||||||
@ -340,7 +374,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
className="w-100"
|
className="w-100"
|
||||||
control={control}
|
control={control}
|
||||||
maxDate={new Date()}
|
maxDate={new Date()}
|
||||||
size="md"
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{errors.transactionDate && (
|
{errors.transactionDate && (
|
||||||
@ -357,7 +390,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
id="amount"
|
id="amount"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
min="1"
|
min="1"
|
||||||
step="0.01"
|
step="0.01"
|
||||||
inputMode="decimal"
|
inputMode="decimal"
|
||||||
@ -369,7 +402,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="row my-2 text-start mb-4">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<Label htmlFor="supplerName" className="form-label" required>
|
<Label htmlFor="supplerName" className="form-label" required>
|
||||||
Supplier Name/Transporter Name/Other
|
Supplier Name/Transporter Name/Other
|
||||||
@ -377,7 +410,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="supplerName"
|
id="supplerName"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("supplerName")}
|
{...register("supplerName")}
|
||||||
/>
|
/>
|
||||||
{errors.supplerName && (
|
{errors.supplerName && (
|
||||||
@ -394,7 +427,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="location"
|
id="location"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("location")}
|
{...register("location")}
|
||||||
/>
|
/>
|
||||||
{errors.location && (
|
{errors.location && (
|
||||||
@ -402,7 +435,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="row my-2 text-start mb-4">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<label htmlFor="statusId" className="form-label ">
|
<label htmlFor="statusId" className="form-label ">
|
||||||
Transaction ID
|
Transaction ID
|
||||||
@ -410,7 +443,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="transactionId"
|
id="transactionId"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
min="1"
|
min="1"
|
||||||
{...register("transactionId")}
|
{...register("transactionId")}
|
||||||
/>
|
/>
|
||||||
@ -427,7 +460,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="gstNumber"
|
id="gstNumber"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
min="1"
|
min="1"
|
||||||
{...register("gstNumber")}
|
{...register("gstNumber")}
|
||||||
/>
|
/>
|
||||||
@ -436,13 +469,13 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="row mb-4">
|
<div className="row">
|
||||||
<div className="col-md-6 text-start ">
|
<div className="col-md-6 text-start ">
|
||||||
<Label htmlFor="currencyId" className="form-label" required>
|
<Label htmlFor="currencyId" className="form-label" required>
|
||||||
Select Currency
|
Select Currency
|
||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
className="form-select "
|
className="form-select form-select-sm"
|
||||||
id="currencyId"
|
id="currencyId"
|
||||||
{...register("currencyId")}
|
{...register("currencyId")}
|
||||||
>
|
>
|
||||||
@ -464,14 +497,14 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{expenseCategory?.noOfPersonsRequired && (
|
{expenseCategory?.noOfPersonsRequired && (
|
||||||
<div className="col-md-6 text-start">
|
<div className="col-md-6 text-start">
|
||||||
<Label className="form-label" required>
|
<Label className="form-label" required>
|
||||||
No. of Persons
|
No. of Persons
|
||||||
</Label>
|
</Label>
|
||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
id="noOfPersons"
|
id="noOfPersons"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("noOfPersons")}
|
{...register("noOfPersons")}
|
||||||
inputMode="numeric"
|
inputMode="numeric"
|
||||||
/>
|
/>
|
||||||
@ -484,14 +517,14 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="row my-2 text-start mb-4">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-12">
|
<div className="col-md-12">
|
||||||
<Label htmlFor="description" className="form-label" required>
|
<Label htmlFor="description" className="form-label" required>
|
||||||
Description
|
Description
|
||||||
</Label>
|
</Label>
|
||||||
<textarea
|
<textarea
|
||||||
id="description"
|
id="description"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("description")}
|
{...register("description")}
|
||||||
rows="2"
|
rows="2"
|
||||||
></textarea>
|
></textarea>
|
||||||
@ -503,7 +536,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="row my-4 text-start">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-12">
|
<div className="col-md-12">
|
||||||
<Label className="form-label" required>
|
<Label className="form-label" required>
|
||||||
Upload Bill{" "}
|
Upload Bill{" "}
|
||||||
|
|||||||
@ -1,169 +1,80 @@
|
|||||||
import { useState, useRef, useEffect } from "react";
|
import { useState } from "react";
|
||||||
|
|
||||||
const PreviewDocument = ({ files = [] }) => {
|
|
||||||
const images = Array.isArray(files) ? files : [files];
|
|
||||||
|
|
||||||
const [index, setIndex] = useState(0);
|
const PreviewDocument = ({ imageUrl }) => {
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [rotation, setRotation] = useState(0);
|
const [rotation, setRotation] = useState(0);
|
||||||
const [scale, setScale] = useState(1);
|
const [scale, setScale] = useState(1);
|
||||||
const [position, setPosition] = useState({ x: 0, y: 0 });
|
|
||||||
const [dragging, setDragging] = useState(false);
|
|
||||||
|
|
||||||
const startPos = useRef({ x: 0, y: 0 });
|
|
||||||
|
|
||||||
const MIN_ZOOM = 0.4;
|
|
||||||
const MAX_ZOOM = 3;
|
|
||||||
|
|
||||||
const currentImage = images[index];
|
|
||||||
|
|
||||||
// Reset on image change
|
|
||||||
useEffect(() => {
|
|
||||||
setRotation(0);
|
|
||||||
setScale(1);
|
|
||||||
setPosition({ x: 0, y: 0 });
|
|
||||||
setLoading(true);
|
|
||||||
}, [index]);
|
|
||||||
|
|
||||||
const zoomIn = () => setScale((prev) => Math.min(prev + 0.2, MAX_ZOOM));
|
|
||||||
const zoomOut = () => setScale((prev) => Math.max(prev - 0.2, MIN_ZOOM));
|
|
||||||
|
|
||||||
|
const zoomIn = () => setScale((prev) => Math.min(prev + 0.2, 3));
|
||||||
|
const zoomOut = () => setScale((prev) => Math.max(prev - 0.2, 0.4));
|
||||||
const resetAll = () => {
|
const resetAll = () => {
|
||||||
setRotation(0);
|
setRotation(0);
|
||||||
setScale(1);
|
setScale(1);
|
||||||
setPosition({ x: 0, y: 0 });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const nextImage = () => {
|
|
||||||
if (index < images.length - 1) setIndex((i) => i + 1);
|
|
||||||
};
|
|
||||||
|
|
||||||
const prevImage = () => {
|
|
||||||
if (index > 0) setIndex((i) => i - 1);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleWheel = (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
if (e.ctrlKey) {
|
|
||||||
const delta = e.deltaY > 0 ? -0.1 : 0.1;
|
|
||||||
setScale((prev) => {
|
|
||||||
let next = prev + delta;
|
|
||||||
if (next < MIN_ZOOM) next = MIN_ZOOM;
|
|
||||||
if (next > MAX_ZOOM) next = MAX_ZOOM;
|
|
||||||
return next;
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
if (e.deltaY > 0) nextImage();
|
|
||||||
else prevImage();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleMouseDown = (e) => {
|
|
||||||
setDragging(true);
|
|
||||||
startPos.current = {
|
|
||||||
x: e.clientX - position.x,
|
|
||||||
y: e.clientY - position.y,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleMouseMove = (e) => {
|
|
||||||
if (!dragging) return;
|
|
||||||
|
|
||||||
setPosition({
|
|
||||||
x: e.clientX - startPos.current.x,
|
|
||||||
y: e.clientY - startPos.current.y,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleMouseUp = () => setDragging(false);
|
|
||||||
|
|
||||||
const handleDoubleClick = () => resetAll();
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* Top Controls */}
|
<div className="d-flex justify-content-start gap-3 mb-2">
|
||||||
<div className="d-flex justify-content-start align-items-center mb-2">
|
<i
|
||||||
{/* Left */}
|
className="bx bx-rotate-right cursor-pointer fs-4"
|
||||||
<div className="d-flex gap-3">
|
title="Rotate"
|
||||||
<i
|
onClick={() => setRotation((prev) => prev + 90)}
|
||||||
className="bx bx-rotate-right cursor-pointer fs-4"
|
></i>
|
||||||
onClick={() => setRotation((prev) => prev + 90)}
|
|
||||||
title="Rotate"
|
<i
|
||||||
/>
|
className="bx bx-zoom-in cursor-pointer fs-4"
|
||||||
<i
|
title="Zoom In"
|
||||||
className="bx bx-zoom-in cursor-pointer fs-4"
|
onClick={zoomIn}
|
||||||
onClick={zoomIn}
|
></i>
|
||||||
title="Zoom In"
|
|
||||||
/>
|
<i
|
||||||
<i
|
className="bx bx-zoom-out cursor-pointer fs-4"
|
||||||
className="bx bx-zoom-out cursor-pointer fs-4"
|
title="Zoom Out"
|
||||||
onClick={zoomOut}
|
onClick={zoomOut}
|
||||||
title="Zoom Out"
|
></i>
|
||||||
/>
|
|
||||||
<i
|
|
||||||
className="bx bx-reset cursor-pointer fs-4"
|
|
||||||
onClick={resetAll}
|
|
||||||
title="Reset"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
onWheel={handleWheel}
|
className="position-relative d-flex flex-column justify-content-center align-items-center overflow-hidden"
|
||||||
onMouseDown={handleMouseDown}
|
style={{ minHeight: "80vh" }}
|
||||||
onMouseMove={handleMouseMove}
|
|
||||||
onMouseUp={handleMouseUp}
|
|
||||||
onMouseLeave={handleMouseUp}
|
|
||||||
onDoubleClick={handleDoubleClick}
|
|
||||||
className="position-relative d-flex justify-content-center align-items-center bg-light-secondary overflow-hidden"
|
|
||||||
style={{
|
|
||||||
minHeight: "70vh",
|
|
||||||
userSelect: "none",
|
|
||||||
borderRadius: "10px",
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
{loading && <div className="text-secondary">Loading...</div>}
|
{loading && (
|
||||||
|
<div className="text-secondary text-center mb-2">
|
||||||
|
Loading...
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<img
|
<div className="mb-3 d-flex justify-content-center align-items-center">
|
||||||
src={currentImage?.preSignedUrl}
|
<img
|
||||||
alt="Preview"
|
src={imageUrl}
|
||||||
draggable="false"
|
alt="Full View"
|
||||||
style={{
|
className="img-fluid"
|
||||||
maxHeight: "60vh",
|
style={{
|
||||||
display: loading ? "none" : "block",
|
maxHeight: "80vh",
|
||||||
transform: `
|
objectFit: "contain",
|
||||||
translate(${position.x}px, ${position.y}px)
|
display: loading ? "none" : "block",
|
||||||
scale(${scale})
|
transform: `rotate(${rotation}deg) scale(${scale})`,
|
||||||
rotate(${rotation}deg)
|
transition: "transform 0.3s ease",
|
||||||
`,
|
cursor: "grab",
|
||||||
transition: dragging ? "none" : "transform 0.2s ease",
|
}}
|
||||||
cursor: dragging ? "grabbing" : "grab",
|
onLoad={() => setLoading(false)}
|
||||||
}}
|
/>
|
||||||
onLoad={() => setLoading(false)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="d-flex justify-content-between">
|
|
||||||
<div className="text-center text-muted mt-2 small">
|
|
||||||
Scroll = change image | Double click = reset
|
|
||||||
</div>
|
</div>
|
||||||
<div className="d-flex align-items-center gap-2">
|
|
||||||
<i
|
<div className="position-absolute bottom-0 start-0 m-2">
|
||||||
className="bx bx-chevron-left cursor-pointer fs-4"
|
<button
|
||||||
onClick={prevImage}
|
className="btn btn-outline-secondary"
|
||||||
/>
|
onClick={resetAll}
|
||||||
<span>
|
>
|
||||||
{index + 1} / {images.length}
|
<i className="bx bx-reset"></i> Reset
|
||||||
</span>
|
</button>
|
||||||
<i
|
|
||||||
className="bx bx-chevron-right cursor-pointer fs-4"
|
|
||||||
onClick={nextImage}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export default PreviewDocument;
|
export default PreviewDocument;
|
||||||
|
|||||||
@ -393,7 +393,7 @@ const tdsPercentage = Number(watch("tdsPercentage")) || 0;
|
|||||||
if (isImage) {
|
if (isImage) {
|
||||||
setDocumentView({
|
setDocumentView({
|
||||||
IsOpen: true,
|
IsOpen: true,
|
||||||
Images: data?.documents,
|
Image: doc.preSignedUrl,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
import React from 'react'
|
|
||||||
|
|
||||||
const WarningBlock = ({content}) => {
|
|
||||||
return (
|
|
||||||
<div className="col-12 my-1">
|
|
||||||
<div className="d-flex align-items-center gap-2 p-3 rounded bg-warning bg-opacity-10 border border-warning-subtle text-start align-item-start">
|
|
||||||
<i className="bx bx-info-circle text-warning fs-5"></i>
|
|
||||||
<p className="mb-0 small">
|
|
||||||
{content}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default WarningBlock
|
|
||||||
@ -25,28 +25,17 @@ const Sidebar = () => {
|
|||||||
/>
|
/>
|
||||||
</span> */}
|
</span> */}
|
||||||
|
|
||||||
<a
|
<small className="app-brand-link fw-bold navbar-brand text-green fs-6">
|
||||||
href="/"
|
<span className="app-brand-logo demo">
|
||||||
className="app-brand-link d-flex align-items-center gap-1 fw-bold navbar-brand "
|
<img src="/img/brand/marco.png" width="50" />
|
||||||
>
|
|
||||||
<span className="app-brand-logo demo d-flex align-items-center">
|
|
||||||
<img
|
|
||||||
src="/img/brand/marco.png"
|
|
||||||
width="40"
|
|
||||||
height="40"
|
|
||||||
alt="OnFieldWork logo"
|
|
||||||
/>
|
|
||||||
</span>
|
</span>
|
||||||
|
<span className="text-blue">OnField</span>
|
||||||
<span className="app-brand-text">
|
<span>Work</span>
|
||||||
<span className="text-primary ">OnField</span>
|
<span className="text-dark">.com</span>
|
||||||
<span className="mx-1">Work</span>
|
</small>
|
||||||
<span className="text-dark">.com</span>
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
<small className="layout-menu-toggle menu-link text-large ms-auto cursor-pointer">
|
<small className="layout-menu-toggle menu-link text-large ms-auto">
|
||||||
<i className="bx bx-chevron-left bx-sm d-flex align-items-center justify-content-center"></i>
|
<i className="bx bx-chevron-left bx-sm d-flex align-items-center justify-content-center"></i>
|
||||||
</small>
|
</small>
|
||||||
</div>
|
</div>
|
||||||
@ -69,7 +58,7 @@ const Sidebar = () => {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{data &&
|
{data &&
|
||||||
data?.data.map((section) => (
|
data?.data?.map((section) => (
|
||||||
<React.Fragment
|
<React.Fragment
|
||||||
key={section.id || section.header || section.items[0]?.id}
|
key={section.id || section.header || section.items[0]?.id}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -239,7 +239,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
Select Project
|
Select Project
|
||||||
</Label> */}
|
</Label> */}
|
||||||
{/* <select
|
{/* <select
|
||||||
className="form-select "
|
className="form-select form-select-sm"
|
||||||
{...register("projectId")}
|
{...register("projectId")}
|
||||||
disabled={
|
disabled={
|
||||||
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
||||||
@ -282,7 +282,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
Expense Category
|
Expense Category
|
||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
className="form-select "
|
className="form-select form-select-sm"
|
||||||
id="expenseCategoryId"
|
id="expenseCategoryId"
|
||||||
{...register("expenseCategoryId")}
|
{...register("expenseCategoryId")}
|
||||||
disabled={
|
disabled={
|
||||||
@ -311,7 +311,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Title and Advance Payment */}
|
{/* Title and Advance Payment */}
|
||||||
<div className="row mt-n2 text-start">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<Label htmlFor="title" className="form-label" required>
|
<Label htmlFor="title" className="form-label" required>
|
||||||
Title
|
Title
|
||||||
@ -319,7 +319,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="title"
|
id="title"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("title")}
|
{...register("title")}
|
||||||
disabled={
|
disabled={
|
||||||
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
||||||
@ -330,7 +330,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-md-6">
|
<div className="col-md-6 ">
|
||||||
<Label htmlFor="isAdvance" className="form-label">
|
<Label htmlFor="isAdvance" className="form-label">
|
||||||
Is Advance Payment
|
Is Advance Payment
|
||||||
</Label>
|
</Label>
|
||||||
@ -343,7 +343,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
||||||
}
|
}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<div className="d-flex align-items-center gap-3 mt-3">
|
<div className="d-flex align-items-center gap-3">
|
||||||
<div className="form-check d-flex flex-row m-0 gap-2">
|
<div className="form-check d-flex flex-row m-0 gap-2">
|
||||||
<input
|
<input
|
||||||
type="radio"
|
type="radio"
|
||||||
@ -387,7 +387,6 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
control={control}
|
control={control}
|
||||||
minDate={new Date()}
|
minDate={new Date()}
|
||||||
className="w-100"
|
className="w-100"
|
||||||
size="md"
|
|
||||||
disabled={
|
disabled={
|
||||||
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
||||||
}
|
}
|
||||||
@ -405,7 +404,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
id="amount"
|
id="amount"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
min="1"
|
min="1"
|
||||||
step="0.01"
|
step="0.01"
|
||||||
inputMode="decimal"
|
inputMode="decimal"
|
||||||
@ -430,7 +429,6 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
setValue("payee", val, { shouldValidate: true })
|
setValue("payee", val, { shouldValidate: true })
|
||||||
}
|
}
|
||||||
error={errors.payee?.message}
|
error={errors.payee?.message}
|
||||||
size="md"
|
|
||||||
disabled={
|
disabled={
|
||||||
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
||||||
}
|
}
|
||||||
@ -460,7 +458,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
id="currencyId"
|
id="currencyId"
|
||||||
className="form-select "
|
className="form-select form-select-sm"
|
||||||
{...register("currencyId")}
|
{...register("currencyId")}
|
||||||
disabled={
|
disabled={
|
||||||
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
data?.recurringPayment?.isVariable && !isDraft && !isProcessed
|
||||||
@ -492,7 +490,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
|
|||||||
</Label>
|
</Label>
|
||||||
<textarea
|
<textarea
|
||||||
id="description"
|
id="description"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("description")}
|
{...register("description")}
|
||||||
rows="2"
|
rows="2"
|
||||||
disabled={
|
disabled={
|
||||||
|
|||||||
@ -165,7 +165,7 @@ const ProjectStatistics = ({ project }) => {
|
|||||||
}, [selectedProject]);
|
}, [selectedProject]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<div className="card h-100">
|
||||||
<div className="card-header text-start">
|
<div className="card-header text-start">
|
||||||
<h5 className="card-action-title mb-0">
|
<h5 className="card-action-title mb-0">
|
||||||
{" "}
|
{" "}
|
||||||
@ -242,8 +242,8 @@ const ProjectStatistics = ({ project }) => {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</>
|
|
||||||
|
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -10,11 +10,13 @@ import {
|
|||||||
import useMaster, { useServices } from "../../../hooks/masterHook/useMaster";
|
import useMaster, { useServices } from "../../../hooks/masterHook/useMaster";
|
||||||
import showToast from "../../../services/toastService";
|
import showToast from "../../../services/toastService";
|
||||||
import { useOrganizationEmployees } from "../../../hooks/useOrganization";
|
import { useOrganizationEmployees } from "../../../hooks/useOrganization";
|
||||||
|
import { useDispatch } from "react-redux";
|
||||||
|
import { changeMaster } from "../../../slices/localVariablesSlice";
|
||||||
|
|
||||||
const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
|
const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
|
||||||
const selectedProject = useSelectedProject();
|
const selectedProject = useSelectedProject();
|
||||||
const debounceSearchTerm = useDebounce(searchTerm, 500);
|
const debounceSearchTerm = useDebounce(searchTerm, 500);
|
||||||
|
const dispatch = useDispatch();
|
||||||
const {
|
const {
|
||||||
data: employeesData = [],
|
data: employeesData = [],
|
||||||
isLoading,
|
isLoading,
|
||||||
@ -45,6 +47,7 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
dispatch(changeMaster("Job Role"));
|
||||||
if (employeesData?.data?.length > 0) {
|
if (employeesData?.data?.length > 0) {
|
||||||
const available = employeesData.data.filter((emp) => {
|
const available = employeesData.data.filter((emp) => {
|
||||||
const projEmp = projectEmployees.find((pe) => pe.employeeId === emp.id);
|
const projEmp = projectEmployees.find((pe) => pe.employeeId === emp.id);
|
||||||
@ -119,7 +122,7 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
|
|||||||
status: true,
|
status: true,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
handleAssignEmployee({ payload,actionType:"assign"} );
|
handleAssignEmployee({ payload, actionType: "assign" });
|
||||||
|
|
||||||
setEmployees((prev) =>
|
setEmployees((prev) =>
|
||||||
prev.map((emp) => ({
|
prev.map((emp) => ({
|
||||||
@ -132,26 +135,26 @@ const TeamEmployeeList = ({ organizationId, searchTerm, closeModal }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return ( <div className="page-min-h d-flex justify-content-center align-items-center "><p className="text-muted">Loading employees...</p></div>) ;
|
return (<div className="page-min-h d-flex justify-content-center align-items-center "><p className="text-muted">Loading employees...</p></div>);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isError) {
|
if (isError) {
|
||||||
return (
|
return (
|
||||||
<div className="page-min-h d-flex justify-content-center align-items-center ">
|
<div className="page-min-h d-flex justify-content-center align-items-center ">
|
||||||
{error?.status === 400 ? (
|
{error?.status === 400 ? (
|
||||||
<p className="m-0">Enter employee you want to find.</p>
|
<p className="m-0">Enter employee you want to find.</p>
|
||||||
) : (
|
) : (
|
||||||
<p className="m-0 dange-text">Something went wrong. Please try again later.</p>
|
<p className="m-0 dange-text">Something went wrong. Please try again later.</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (employees.length === 0) {
|
if (employees.length === 0) {
|
||||||
return(<div className="page-min-h d-flex justify-content-center align-items-center "><p className="text-muted">No available employees to assign.</p></div>) ;
|
return (<div className="page-min-h d-flex justify-content-center align-items-center "><p className="text-muted">No available employees to assign.</p></div>);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -183,9 +186,8 @@ if (employees.length === 0) {
|
|||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleSelectChange(index, "serviceId", e.target.value)
|
handleSelectChange(index, "serviceId", e.target.value)
|
||||||
}
|
}
|
||||||
className={`form-select form-select-sm w-auto border-none rounded-0 py-1 px-auto ${
|
className={`form-select form-select-sm w-auto border-none rounded-0 py-1 px-auto ${emp.errors.serviceId ? "is-invalid" : ""
|
||||||
emp.errors.serviceId ? "is-invalid" : ""
|
}`}
|
||||||
}`}
|
|
||||||
>
|
>
|
||||||
<option value="">Select Service</option>
|
<option value="">Select Service</option>
|
||||||
{services?.map((s) => (
|
{services?.map((s) => (
|
||||||
@ -205,9 +207,8 @@ if (employees.length === 0) {
|
|||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
handleSelectChange(index, "jobRole", e.target.value)
|
handleSelectChange(index, "jobRole", e.target.value)
|
||||||
}
|
}
|
||||||
className={`form-select form-select-sm w-auto border-none rounded-0 py-1 px-auto ${
|
className={`form-select form-select-sm w-auto border-none rounded-0 py-1 px-auto ${emp.errors.jobRole ? "is-invalid" : ""
|
||||||
emp.errors.jobRole ? "is-invalid" : ""
|
}`}
|
||||||
}`}
|
|
||||||
>
|
>
|
||||||
<option value="">Select Job Role</option>
|
<option value="">Select Job Role</option>
|
||||||
{jobRoles?.map((r) => (
|
{jobRoles?.map((r) => (
|
||||||
|
|||||||
@ -165,7 +165,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<div className="row my-2 text-start">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
{/* <select
|
{/* <select
|
||||||
className="form-select"
|
className="form-select form-select-sm"
|
||||||
{...register("projectId")}
|
{...register("projectId")}
|
||||||
>
|
>
|
||||||
<option value="">Select Project</option>
|
<option value="">Select Project</option>
|
||||||
@ -201,7 +201,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
Expense Category
|
Expense Category
|
||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
className="form-select"
|
className="form-select form-select-sm"
|
||||||
id="expenseCategoryId"
|
id="expenseCategoryId"
|
||||||
{...register("expenseCategoryId")}
|
{...register("expenseCategoryId")}
|
||||||
>
|
>
|
||||||
@ -227,7 +227,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Title and Is Variable */}
|
{/* Title and Is Variable */}
|
||||||
<div className="row my-2 text-start mt-n2">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<Label htmlFor="title" className="form-label" required>
|
<Label htmlFor="title" className="form-label" required>
|
||||||
Title
|
Title
|
||||||
@ -235,7 +235,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="title"
|
id="title"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("title")}
|
{...register("title")}
|
||||||
placeholder="Enter title"
|
placeholder="Enter title"
|
||||||
/>
|
/>
|
||||||
@ -244,7 +244,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-md-6">
|
<div className="col-md-6 mt-2">
|
||||||
<div className="d-flex justify-content-start align-items-center text-nowrap gap-2">
|
<div className="d-flex justify-content-start align-items-center text-nowrap gap-2">
|
||||||
<Label htmlFor="isVariable" className="form-label mb-0" required>
|
<Label htmlFor="isVariable" className="form-label mb-0" required>
|
||||||
Payment Type
|
Payment Type
|
||||||
@ -252,15 +252,16 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<HoverPopup
|
<HoverPopup
|
||||||
title="Payment Type"
|
title="Payment Type"
|
||||||
id="payment_type"
|
id="payment_type"
|
||||||
|
|
||||||
content={
|
content={
|
||||||
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
<div className=" w-50">
|
||||||
Choose whether the payment amount varies or remains fixed
|
<p>
|
||||||
each cycle.
|
Choose whether the payment amount varies or remains fixed
|
||||||
<br />
|
each cycle.
|
||||||
<strong>Is Variable:</strong> Amount changes per cycle.
|
<br />
|
||||||
<br />
|
<strong>Is Variable:</strong> Amount changes per cycle.
|
||||||
<strong>Fixed:</strong> Amount stays constant.
|
<br />
|
||||||
|
<strong>Fixed:</strong> Amount stays constant.
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
@ -273,7 +274,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
control={control}
|
control={control}
|
||||||
defaultValue={defaultRecurringExpense.isVariable ?? false}
|
defaultValue={defaultRecurringExpense.isVariable ?? false}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<div className="d-flex align-items-center gap-3 mt-2">
|
<div className="d-flex align-items-center gap-3 mt-1">
|
||||||
<div className="form-check">
|
<div className="form-check">
|
||||||
<input
|
<input
|
||||||
type="radio"
|
type="radio"
|
||||||
@ -326,7 +327,6 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
control={control}
|
control={control}
|
||||||
minDate={new Date()}
|
minDate={new Date()}
|
||||||
className="w-100"
|
className="w-100"
|
||||||
size="md"
|
|
||||||
/>
|
/>
|
||||||
{errors.strikeDate && (
|
{errors.strikeDate && (
|
||||||
<small className="danger-text">{errors.strikeDate.message}</small>
|
<small className="danger-text">{errors.strikeDate.message}</small>
|
||||||
@ -340,7 +340,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
id="amount"
|
id="amount"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
min="1"
|
min="1"
|
||||||
step="0.01"
|
step="0.01"
|
||||||
inputMode="decimal"
|
inputMode="decimal"
|
||||||
@ -354,7 +354,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Payee and Currency */}
|
{/* Payee and Currency */}
|
||||||
<div className="row my-2 text-start mt-3">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<Label htmlFor="payee" className="form-label" required>
|
<Label htmlFor="payee" className="form-label" required>
|
||||||
Payee (Supplier Name/Transporter Name/Other)
|
Payee (Supplier Name/Transporter Name/Other)
|
||||||
@ -367,7 +367,6 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
}
|
}
|
||||||
error={errors.payee?.message}
|
error={errors.payee?.message}
|
||||||
placeholder="Select or enter payee"
|
placeholder="Select or enter payee"
|
||||||
size="md"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -377,7 +376,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
id="currencyId"
|
id="currencyId"
|
||||||
className="form-select"
|
className="form-select form-select-sm"
|
||||||
{...register("currencyId")}
|
{...register("currencyId")}
|
||||||
>
|
>
|
||||||
<option value="">Select Currency</option>
|
<option value="">Select Currency</option>
|
||||||
@ -399,7 +398,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Frequency To and Status Id */}
|
{/* Frequency To and Status Id */}
|
||||||
<div className="row my-2 text-start mt-n2">
|
<div className="row my-2 text-start">
|
||||||
<div className="col-md-6">
|
<div className="col-md-6">
|
||||||
<div className="d-flex justify-content-start align-items-center gap-2">
|
<div className="d-flex justify-content-start align-items-center gap-2">
|
||||||
<Label htmlFor="frequency" className="form-label mb-0" required>
|
<Label htmlFor="frequency" className="form-label mb-0" required>
|
||||||
@ -421,7 +420,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
|
|
||||||
<select
|
<select
|
||||||
id="frequency"
|
id="frequency"
|
||||||
className="form-select mt-1"
|
className="form-select form-select-sm mt-1"
|
||||||
{...register("frequency", { valueAsNumber: true })}
|
{...register("frequency", { valueAsNumber: true })}
|
||||||
>
|
>
|
||||||
<option value="">Select Frequency</option>
|
<option value="">Select Frequency</option>
|
||||||
@ -443,7 +442,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
</Label>
|
</Label>
|
||||||
<select
|
<select
|
||||||
id="statusId"
|
id="statusId"
|
||||||
className="form-select"
|
className="form-select form-select-sm"
|
||||||
{...register("statusId")}
|
{...register("statusId")}
|
||||||
>
|
>
|
||||||
<option value="">Select Status</option>
|
<option value="">Select Status</option>
|
||||||
@ -477,10 +476,10 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
title="Payment Buffer Days"
|
title="Payment Buffer Days"
|
||||||
id="payment_buffer_days"
|
id="payment_buffer_days"
|
||||||
content={
|
content={
|
||||||
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
<p>
|
||||||
Number of extra days allowed after the due date before
|
Number of extra days allowed after the due date before
|
||||||
payment is considered late.
|
payment is considered late.
|
||||||
</div>
|
</p>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
||||||
@ -490,7 +489,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
id="paymentBufferDays"
|
id="paymentBufferDays"
|
||||||
className="form-control mt-1"
|
className="form-control form-control-sm mt-1"
|
||||||
min="0"
|
min="0"
|
||||||
step="1"
|
step="1"
|
||||||
{...register("paymentBufferDays", { valueAsNumber: true })}
|
{...register("paymentBufferDays", { valueAsNumber: true })}
|
||||||
@ -512,11 +511,10 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
<HoverPopup
|
<HoverPopup
|
||||||
title="End Date"
|
title="End Date"
|
||||||
id="end_date"
|
id="end_date"
|
||||||
|
|
||||||
content={
|
content={
|
||||||
<div className="text-wrap" style={{ maxWidth: "200px" }}>
|
<p>
|
||||||
The date when the last payment in the recurrence occurs.
|
The date when the last payment in the recurrence occurs.
|
||||||
</div>
|
</p>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
<i className="bx bx-info-circle bx-xs text-muted cursor-pointer"></i>
|
||||||
@ -528,7 +526,6 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
control={control}
|
control={control}
|
||||||
minDate={StrikeDate}
|
minDate={StrikeDate}
|
||||||
className="w-100 mt-1"
|
className="w-100 mt-1"
|
||||||
size="md"
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{errors.endDate && (
|
{errors.endDate && (
|
||||||
@ -571,7 +568,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
</Label>
|
</Label>
|
||||||
<textarea
|
<textarea
|
||||||
id="description"
|
id="description"
|
||||||
className="form-control "
|
className="form-control form-control-sm"
|
||||||
{...register("description")}
|
{...register("description")}
|
||||||
rows="2"
|
rows="2"
|
||||||
></textarea>
|
></textarea>
|
||||||
@ -595,8 +592,8 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
|
|||||||
{createPending || isPending
|
{createPending || isPending
|
||||||
? "Please wait...."
|
? "Please wait...."
|
||||||
: requestToEdit
|
: requestToEdit
|
||||||
? "Update"
|
? "Update"
|
||||||
: "Save as Draft"}
|
: "Save as Draft"}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@ -166,6 +166,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
console.log("Tanish",filteredData)
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{IsDeleteModalOpen && (
|
{IsDeleteModalOpen && (
|
||||||
|
|||||||
@ -175,9 +175,12 @@ const JobList = ({ isArchive }) => {
|
|||||||
<td
|
<td
|
||||||
key={col.key}
|
key={col.key}
|
||||||
className={col.className}
|
className={col.className}
|
||||||
|
// onClick={() =>
|
||||||
|
// setSelectedJob({ showCanvas: true, job: row?.id })
|
||||||
|
// }
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (!isArchive) {
|
if (!isArchive) {
|
||||||
setSelectedJob({ showCanvas: true, job: row?.id });
|
setSelectedJob({ showCanvas: true, job: e?.id });
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|||||||
@ -62,27 +62,15 @@ const Jobs = () => {
|
|||||||
<div className="card page-min-h my-2 px-7 pb-4">
|
<div className="card page-min-h my-2 px-7 pb-4">
|
||||||
<div className="row align-items-center py-4">
|
<div className="row align-items-center py-4">
|
||||||
|
|
||||||
{/* LEFT — Archive / Unarchive Toggle */}
|
{/* LEFT — Tabs */}
|
||||||
<div className="col-12 col-md-6 text-start">
|
<div className="col-12 col-md-6 text-start">
|
||||||
<div className="d-inline-flex border rounded-pill overflow-hidden shadow-none">
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
className={`btn btn-sm ${showArchive ? "btn-secondary" : "btn-outline-secondary"}`}
|
||||||
className={`btn px-3 py-1 rounded-0 text-tiny ${!showArchive ? "btn-primary text-white" : ""
|
onClick={() => setShowArchive(!showArchive)}
|
||||||
}`}
|
>
|
||||||
onClick={() => setShowArchive(false)}
|
<i className="bx bx-archive bx-sm me-1 mt-1"></i> Archived
|
||||||
>
|
</button>
|
||||||
<i className="bx bx-archive-out me-1"></i> Active Jobs
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={`btn px-3 py-1 rounded-0 text-tiny ${showArchive ? "btn-primary text-white" : ""
|
|
||||||
}`}
|
|
||||||
onClick={() => setShowArchive(true)}
|
|
||||||
>
|
|
||||||
<i className="bx bx-archive me-1"></i> Archived
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* RIGHT — New Job button */}
|
{/* RIGHT — New Job button */}
|
||||||
@ -91,10 +79,9 @@ const Jobs = () => {
|
|||||||
className="btn btn-sm btn-primary"
|
className="btn btn-sm btn-primary"
|
||||||
onClick={() => setManageJob({ isOpen: true, jobId: null })}
|
onClick={() => setManageJob({ isOpen: true, jobId: null })}
|
||||||
>
|
>
|
||||||
<i className="bx bx-plus-circle bx-md me-2"></i> New Job
|
<i className="bx bx-plus-circle bx-md me-2"></i>New Job
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Job List */}
|
{/* Job List */}
|
||||||
|
|||||||
@ -222,7 +222,10 @@ const ManageServiceProject = ({ serviceProjectId, onClose }) => {
|
|||||||
type="text"
|
type="text"
|
||||||
className="form-control form-control-sm"
|
className="form-control form-control-sm"
|
||||||
{...register("contactName")}
|
{...register("contactName")}
|
||||||
placeholder="Enter Employee name.."
|
placeholder="Enter Employee name.."
|
||||||
|
onInput={(e) => {
|
||||||
|
e.target.value = e.target.value.replace(/[^A-Za-z ]/g, "");
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
{errors?.contactName && (
|
{errors?.contactName && (
|
||||||
<span className="danger-text">{errors.contactName.message}</span>
|
<span className="danger-text">{errors.contactName.message}</span>
|
||||||
|
|||||||
@ -237,17 +237,14 @@ const ServiceBranch = () => {
|
|||||||
!isError &&
|
!isError &&
|
||||||
(!data?.data || data.data.length === 0) && (
|
(!data?.data || data.data.length === 0) && (
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={columns.length + 1}>
|
<td
|
||||||
<div
|
colSpan={columns.length + 1}
|
||||||
className="d-flex justify-content-center align-items-center"
|
className="text-center py-12"
|
||||||
style={{ height: "150px" }}
|
>
|
||||||
>
|
No Branch Found
|
||||||
No Branch Found
|
|
||||||
</div>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
@ -150,7 +150,7 @@ const JobComments = ({ data }) => {
|
|||||||
type="submit"
|
type="submit"
|
||||||
disabled={!watch("comment")?.trim() || isPending}
|
disabled={!watch("comment")?.trim() || isPending}
|
||||||
>
|
>
|
||||||
Submit
|
Send
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@ -172,20 +172,6 @@ const ManageJob = ({ Job }) => {
|
|||||||
<div className="container">
|
<div className="container">
|
||||||
<AppFormProvider {...methods}>
|
<AppFormProvider {...methods}>
|
||||||
<form className="row text-start" onSubmit={handleSubmit(onSubmit)}>
|
<form className="row text-start" onSubmit={handleSubmit(onSubmit)}>
|
||||||
<div className="col-12 col-md-12">
|
|
||||||
<SelectFieldSearch
|
|
||||||
label="Select Branch"
|
|
||||||
placeholder="Select Branch"
|
|
||||||
value={watch("projectBranchId")}
|
|
||||||
onChange={(val) => setValue("projectBranchId", val)}
|
|
||||||
valueKey="id"
|
|
||||||
labelKey="branchName"
|
|
||||||
hookParams={[projectId, true, 10, 1]}
|
|
||||||
useFetchHook={useBranches}
|
|
||||||
isMultiple={false}
|
|
||||||
disabled={Job}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="col-12 col-md-12 mb-2 ">
|
<div className="col-12 col-md-12 mb-2 ">
|
||||||
<Label required>Title</Label>
|
<Label required>Title</Label>
|
||||||
<input
|
<input
|
||||||
@ -258,7 +244,20 @@ const ManageJob = ({ Job }) => {
|
|||||||
placeholder="Enter Tag"
|
placeholder="Enter Tag"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="col-12 col-md-6 mb-2 mb-md-4">
|
||||||
|
<SelectFieldSearch
|
||||||
|
label="Select Branch"
|
||||||
|
placeholder="Select Branch"
|
||||||
|
value={watch("projectBranchId")}
|
||||||
|
onChange={(val) => setValue("projectBranchId", val)}
|
||||||
|
valueKey="id"
|
||||||
|
labelKey="branchName"
|
||||||
|
hookParams={[projectId, true, 10, 1]}
|
||||||
|
useFetchHook={useBranches}
|
||||||
|
isMultiple={false}
|
||||||
|
disabled={Job}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<div className="col-12">
|
<div className="col-12">
|
||||||
<Label required>Description</Label>
|
<Label required>Description</Label>
|
||||||
<textarea
|
<textarea
|
||||||
@ -277,7 +276,7 @@ const ManageJob = ({ Job }) => {
|
|||||||
? "Please wait..."
|
? "Please wait..."
|
||||||
: Job
|
: Job
|
||||||
? "Update"
|
? "Update"
|
||||||
: "Assign"}
|
: "Submit"}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@ -22,7 +22,8 @@ export const projectSchema = z.object({
|
|||||||
contactName: z
|
contactName: z
|
||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
.min(1, "Contact name is required"),
|
.min(1, "Contact name is required")
|
||||||
|
.regex(/^[A-Za-z\s]+$/, "Contact name can contain only letters"),
|
||||||
|
|
||||||
contactPhone: z
|
contactPhone: z
|
||||||
.string()
|
.string()
|
||||||
|
|||||||
@ -77,7 +77,6 @@ const ServiceProjectTeamList = () => {
|
|||||||
<td
|
<td
|
||||||
colSpan={servceProjectColmen.length}
|
colSpan={servceProjectColmen.length}
|
||||||
className="text-center py-4 border-0"
|
className="text-center py-4 border-0"
|
||||||
style={{ height: "200px" }}
|
|
||||||
>
|
>
|
||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<SpinnerLoader />
|
<SpinnerLoader />
|
||||||
@ -86,7 +85,6 @@ const ServiceProjectTeamList = () => {
|
|||||||
)}
|
)}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
)}
|
)}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@ -200,9 +200,7 @@ export const SelectProjectField = ({
|
|||||||
isFullObject = false,
|
isFullObject = false,
|
||||||
isMultiple = false,
|
isMultiple = false,
|
||||||
isAllProject = false,
|
isAllProject = false,
|
||||||
disabled,
|
disabled
|
||||||
className,
|
|
||||||
errors,
|
|
||||||
}) => {
|
}) => {
|
||||||
const [searchText, setSearchText] = useState("");
|
const [searchText, setSearchText] = useState("");
|
||||||
const debounce = useDebounce(searchText, 300);
|
const debounce = useDebounce(searchText, 300);
|
||||||
@ -305,10 +303,7 @@ export const SelectProjectField = ({
|
|||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{errors?.projectId && (
|
{/* DROPDOWN */}
|
||||||
<div className="danger-text">{errors.projectId.message}</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{open && (
|
{open && (
|
||||||
<ul
|
<ul
|
||||||
className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded"
|
className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded"
|
||||||
@ -331,7 +326,6 @@ export const SelectProjectField = ({
|
|||||||
placeholder="Search..."
|
placeholder="Search..."
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="overflow-auto px-1" style={{ maxHeight: "200px" }}>
|
|
||||||
|
|
||||||
{isLoading && (
|
{isLoading && (
|
||||||
<li className="dropdown-item text-muted text-center">Loading...</li>
|
<li className="dropdown-item text-muted text-center">Loading...</li>
|
||||||
@ -364,7 +358,6 @@ export const SelectProjectField = ({
|
|||||||
</li>
|
</li>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@ -373,7 +366,7 @@ export const SelectProjectField = ({
|
|||||||
|
|
||||||
export const SelectFieldSearch = ({
|
export const SelectFieldSearch = ({
|
||||||
label = "Select",
|
label = "Select",
|
||||||
placeholder = "Select",
|
placeholder = "Select ",
|
||||||
required = false,
|
required = false,
|
||||||
value = null,
|
value = null,
|
||||||
onChange,
|
onChange,
|
||||||
@ -384,7 +377,6 @@ export const SelectFieldSearch = ({
|
|||||||
isMultiple = false,
|
isMultiple = false,
|
||||||
hookParams,
|
hookParams,
|
||||||
useFetchHook,
|
useFetchHook,
|
||||||
errors = null,
|
|
||||||
}) => {
|
}) => {
|
||||||
const [searchText, setSearchText] = useState("");
|
const [searchText, setSearchText] = useState("");
|
||||||
const debounce = useDebounce(searchText, 300);
|
const debounce = useDebounce(searchText, 300);
|
||||||
@ -394,76 +386,108 @@ export const SelectFieldSearch = ({
|
|||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const dropdownRef = useRef(null);
|
const dropdownRef = useRef(null);
|
||||||
|
|
||||||
const getDisplayName = (entity) =>
|
const getDisplayName = (entity) => {
|
||||||
entity ? `${entity[labelKey] || ""}`.trim() : "";
|
if (!entity) return "";
|
||||||
|
return `${entity[labelKey] || ""}`.trim();
|
||||||
|
};
|
||||||
|
|
||||||
/** ----------------------------- SELECTED OPTION ----------------------------- */
|
/** -----------------------------
|
||||||
|
* SELECTED OPTION (SINGLE)
|
||||||
|
* ----------------------------- */
|
||||||
let selectedSingle = null;
|
let selectedSingle = null;
|
||||||
|
|
||||||
if (!isMultiple) {
|
if (!isMultiple) {
|
||||||
if (isFullObject && value) selectedSingle = value;
|
if (isFullObject && value) selectedSingle = value;
|
||||||
else if (!isFullObject && value)
|
else if (!isFullObject && value)
|
||||||
selectedSingle = options.find((o) => o[valueKey] === value);
|
selectedSingle = options.find((o) => o[valueKey] === value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** -----------------------------
|
||||||
|
* SELECTED OPTION (MULTIPLE)
|
||||||
|
* ----------------------------- */
|
||||||
let selectedList = [];
|
let selectedList = [];
|
||||||
if (isMultiple && Array.isArray(value)) {
|
if (isMultiple && Array.isArray(value)) {
|
||||||
selectedList = isFullObject
|
if (isFullObject) selectedList = value;
|
||||||
? value
|
else {
|
||||||
: options.filter((opt) => value.includes(opt[valueKey]));
|
selectedList = options.filter((opt) => value.includes(opt[valueKey]));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Main button label */
|
||||||
const displayText = !isMultiple
|
const displayText = !isMultiple
|
||||||
? getDisplayName(selectedSingle) || placeholder
|
? getDisplayName(selectedSingle) || placeholder
|
||||||
: selectedList.length
|
: selectedList.length > 0
|
||||||
? selectedList.map((e) => getDisplayName(e)).join(", ")
|
? selectedList.map((e) => getDisplayName(e)).join(", ")
|
||||||
: placeholder;
|
: placeholder;
|
||||||
|
|
||||||
/** ----------------------------- OUTSIDE CLICK ----------------------------- */
|
/** -----------------------------
|
||||||
|
* HANDLE OUTSIDE CLICK
|
||||||
|
* ----------------------------- */
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleClickOutside = (e) => {
|
const handleClickOutside = (e) => {
|
||||||
if (dropdownRef.current && !dropdownRef.current.contains(e.target))
|
if (dropdownRef.current && !dropdownRef.current.contains(e.target)) {
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
document.addEventListener("mousedown", handleClickOutside);
|
document.addEventListener("mousedown", handleClickOutside);
|
||||||
return () => document.removeEventListener("mousedown", handleClickOutside);
|
return () => document.removeEventListener("mousedown", handleClickOutside);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
/** ----------------------------- MERGED OPTIONS ----------------------------- */
|
// MERGED OPTIONS TO ENSURE SELECTED VALUE APPEARS EVEN IF NOT IN SEARCH RESULT
|
||||||
const [mergedOptions, setMergedOptions] = useState(options);
|
const [mergedOptions, setMergedOptions] = useState([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let finalList = [...options];
|
let finalList = [...options];
|
||||||
|
|
||||||
if (!isMultiple && value && !isFullObject && typeof value === "object") {
|
if (!isMultiple && value && !isFullObject) {
|
||||||
const exists = options.some((o) => o[valueKey] === value[valueKey]);
|
// already selected option inside options?
|
||||||
if (!exists) finalList.unshift(value);
|
const exists = options.some((o) => o[valueKey] === value);
|
||||||
|
|
||||||
|
// if selected item not found, try to get from props (value) as fallback
|
||||||
|
if (!exists && typeof value === "object") {
|
||||||
|
finalList.unshift(value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMultiple && Array.isArray(value)) {
|
if (isMultiple && Array.isArray(value)) {
|
||||||
value.forEach((val) => {
|
value.forEach((val) => {
|
||||||
const id = isFullObject ? val[valueKey] : val;
|
const id = isFullObject ? val[valueKey] : val;
|
||||||
const exists = options.some((o) => o[valueKey] === id);
|
const exists = options.some((o) => o[valueKey] === id);
|
||||||
if (!exists && typeof val === "object") finalList.unshift(val);
|
|
||||||
|
if (!exists && typeof val === "object") {
|
||||||
|
finalList.unshift(val);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only update if different to avoid infinite loop
|
setMergedOptions(finalList);
|
||||||
const oldKeys = mergedOptions.map((o) => o[valueKey]).join(",");
|
}, [options, value]);
|
||||||
const newKeys = finalList.map((o) => o[valueKey]).join(",");
|
|
||||||
if (oldKeys !== newKeys) setMergedOptions(finalList);
|
|
||||||
}, [options, value, isMultiple, isFullObject, valueKey, mergedOptions]);
|
|
||||||
|
|
||||||
/** ----------------------------- HANDLE SELECT ----------------------------- */
|
/** -----------------------------
|
||||||
|
* HANDLE SELECT
|
||||||
|
* ----------------------------- */
|
||||||
const handleSelect = (option) => {
|
const handleSelect = (option) => {
|
||||||
if (!isMultiple) {
|
if (!isMultiple) {
|
||||||
onChange(isFullObject ? option : option[valueKey]);
|
// SINGLE SELECT
|
||||||
setOpen(false)
|
if (isFullObject) onChange(option);
|
||||||
|
else onChange(option[valueKey]);
|
||||||
} else {
|
} else {
|
||||||
|
// MULTIPLE SELECT
|
||||||
|
let updated = [];
|
||||||
|
|
||||||
const exists = selectedList.some((e) => e[valueKey] === option[valueKey]);
|
const exists = selectedList.some((e) => e[valueKey] === option[valueKey]);
|
||||||
const updated = exists
|
|
||||||
? selectedList.filter((e) => e[valueKey] !== option[valueKey])
|
if (exists) {
|
||||||
: [...selectedList, option];
|
// remove
|
||||||
onChange(isFullObject ? updated : updated.map((x) => x[valueKey]));
|
updated = selectedList.filter((e) => e[valueKey] !== option[valueKey]);
|
||||||
|
} else {
|
||||||
|
// add
|
||||||
|
updated = [...selectedList, option];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isFullObject) onChange(updated);
|
||||||
|
else onChange(updated.map((x) => x[valueKey]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -475,9 +499,10 @@ export const SelectFieldSearch = ({
|
|||||||
</Label>
|
</Label>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* MAIN BUTTON */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={`select2-icons form-select d-flex align-items-center justify-content-between ${
|
className={`select2-icons form-select d-flex align-items-center justify-content-between ${
|
||||||
open ? "show" : ""
|
open ? "show" : ""
|
||||||
}`}
|
}`}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
@ -488,17 +513,17 @@ export const SelectFieldSearch = ({
|
|||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{errors && <div className="danger-text">{errors.message}</div>}
|
{/* DROPDOWN */}
|
||||||
|
|
||||||
{open && (
|
{open && (
|
||||||
<ul
|
<ul
|
||||||
className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded rounded-top-0 overflow-x-hidden"
|
className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded overflow-x-hidden"
|
||||||
style={{
|
style={{
|
||||||
position: "absolute",
|
position: "absolute",
|
||||||
top: "100%",
|
top: "100%",
|
||||||
left: 0,
|
left: 0,
|
||||||
zIndex: 1050,
|
zIndex: 1050,
|
||||||
marginTop: "1px",
|
marginTop: "2px",
|
||||||
|
borderRadius: "0.375rem",
|
||||||
overflow: "hidden",
|
overflow: "hidden",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -512,40 +537,36 @@ export const SelectFieldSearch = ({
|
|||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="overflow-auto px-1" style={{ maxHeight: "200px" }}>
|
|
||||||
{isLoading && (
|
|
||||||
<li className="dropdown-item text-muted text-center">
|
|
||||||
Loading...
|
|
||||||
</li>
|
|
||||||
)}
|
|
||||||
{!isLoading && mergedOptions.length === 0 && (
|
|
||||||
<li className="dropdown-item text-muted text-center">
|
|
||||||
No results found
|
|
||||||
</li>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isLoading &&
|
{isLoading && (
|
||||||
mergedOptions.map((option) => {
|
<li className="dropdown-item text-muted text-center">Loading...</li>
|
||||||
const isActive = isMultiple
|
)}
|
||||||
? selectedList.some((x) => x[valueKey] === option[valueKey])
|
|
||||||
: selectedSingle &&
|
|
||||||
selectedSingle[valueKey] === option[valueKey];
|
|
||||||
|
|
||||||
return (
|
{!isLoading && options.length === 0 && (
|
||||||
<li key={option[valueKey]}>
|
<li className="dropdown-item text-muted text-center">
|
||||||
<button
|
No results found
|
||||||
type="button"
|
</li>
|
||||||
className={`dropdown-item rounded ${
|
)}
|
||||||
isActive ? "active" : ""
|
|
||||||
}`}
|
{!isLoading &&
|
||||||
onClick={() => handleSelect(option)}
|
options.map((option) => {
|
||||||
>
|
const isActive = isMultiple
|
||||||
{getDisplayName(option)}
|
? selectedList.some((x) => x[valueKey] === option[valueKey])
|
||||||
</button>
|
: selectedSingle &&
|
||||||
</li>
|
selectedSingle[valueKey] === option[valueKey];
|
||||||
);
|
|
||||||
})}
|
return (
|
||||||
</div>
|
<li key={option[valueKey]}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={`dropdown-item ${isActive ? "active" : ""}`}
|
||||||
|
onClick={() => handleSelect(option)}
|
||||||
|
>
|
||||||
|
{getDisplayName(option)}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -58,66 +58,139 @@ const HoverPopup = ({
|
|||||||
return () => document.removeEventListener("click", handler);
|
return () => document.removeEventListener("click", handler);
|
||||||
}, [Mode, visible, dispatch, id]);
|
}, [Mode, visible, dispatch, id]);
|
||||||
|
|
||||||
|
// Positioning effect: respects align prop and stays inside boundary (drawer)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!visible || !popupRef.current || !triggerRef.current) return;
|
if (!visible || !popupRef.current || !triggerRef.current) return;
|
||||||
|
|
||||||
|
// run in next frame so DOM/layout settles
|
||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
const popup = popupRef.current;
|
const popup = popupRef.current;
|
||||||
const boundaryEl = (boundaryRef && boundaryRef.current) || popup.parentElement;
|
|
||||||
|
// choose boundary: provided boundaryRef or nearest positioned parent (popup.parentElement)
|
||||||
|
const boundaryEl =
|
||||||
|
(boundaryRef && boundaryRef.current) || popup.parentElement;
|
||||||
if (!boundaryEl) return;
|
if (!boundaryEl) return;
|
||||||
|
|
||||||
const boundaryRect = boundaryEl.getBoundingClientRect();
|
const boundaryRect = boundaryEl.getBoundingClientRect();
|
||||||
const triggerRect = triggerRef.current.getBoundingClientRect();
|
const triggerRect = triggerRef.current.getBoundingClientRect();
|
||||||
|
|
||||||
|
// reset styles first
|
||||||
popup.style.left = "";
|
popup.style.left = "";
|
||||||
popup.style.right = "";
|
popup.style.right = "";
|
||||||
popup.style.transform = "";
|
popup.style.transform = "";
|
||||||
popup.style.top = "";
|
popup.style.top = "";
|
||||||
|
|
||||||
const popupRect = popup.getBoundingClientRect();
|
const popupRect = popup.getBoundingClientRect();
|
||||||
const triggerCenterX = triggerRect.left + triggerRect.width / 2 - boundaryRect.left;
|
const parentRect = boundaryRect; // alias
|
||||||
let left = triggerCenterX - popupRect.width / 2;
|
|
||||||
|
|
||||||
// Clamp to boundaries
|
// Convert trigger center to parent coordinates
|
||||||
left = Math.max(0, Math.min(left, boundaryRect.width - popupRect.width));
|
const triggerCenterX =
|
||||||
popup.style.left = `${left}px`;
|
triggerRect.left + triggerRect.width / 2 - parentRect.left;
|
||||||
|
|
||||||
|
// preferred left so popup center aligns to trigger center:
|
||||||
|
const preferredLeft = triggerCenterX - popupRect.width / 2;
|
||||||
|
|
||||||
|
// Helpers to set styles in parent's coordinate system:
|
||||||
|
const setLeft = (leftPx) => {
|
||||||
|
popup.style.left = `${leftPx}px`;
|
||||||
|
popup.style.right = "auto";
|
||||||
|
popup.style.transform = "none";
|
||||||
|
};
|
||||||
|
const setRight = (rightPx) => {
|
||||||
|
popup.style.left = "auto";
|
||||||
|
popup.style.right = `${rightPx}px`;
|
||||||
|
popup.style.transform = "none";
|
||||||
|
};
|
||||||
|
|
||||||
|
// If user forced align:
|
||||||
|
if (align === "left") {
|
||||||
|
// align popup's left to parent's left (0)
|
||||||
|
setLeft(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (align === "right") {
|
||||||
|
// align popup's right to parent's right (0)
|
||||||
|
setRight(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (align === "center") {
|
||||||
|
popup.style.left = "50%";
|
||||||
|
popup.style.right = "auto";
|
||||||
|
popup.style.transform = "translateX(-50%)";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// align === "auto": try preferred centered position, but flip fully if overflow
|
||||||
|
// clamp preferredLeft to boundaries so it doesn't render partially outside
|
||||||
|
const leftIfCentered = Math.max(
|
||||||
|
0,
|
||||||
|
Math.min(preferredLeft, parentRect.width - popupRect.width)
|
||||||
|
);
|
||||||
|
|
||||||
|
// if centered fits, use it
|
||||||
|
if (leftIfCentered === preferredLeft) {
|
||||||
|
setLeft(leftIfCentered);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// if centering would overflow right -> stick popup fully to left (left=0)
|
||||||
|
if (preferredLeft > parentRect.width - popupRect.width) {
|
||||||
|
// place popup so its right aligns to parent's right
|
||||||
|
// i.e., left = parent width - popup width
|
||||||
|
setLeft(parentRect.width - popupRect.width);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// if centering would overflow left -> stick popup fully to left=0
|
||||||
|
if (preferredLeft < 0) {
|
||||||
|
setLeft(0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// fallback center
|
||||||
|
setLeft(leftIfCentered);
|
||||||
});
|
});
|
||||||
}, [visible, align, boundaryRef]);
|
}, [visible, align, boundaryRef]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<div
|
||||||
|
className="d-inline-block position-relative" // <-- ADD THIS !!
|
||||||
|
style={{
|
||||||
|
maxWidth: "calc(700px - 100px)",
|
||||||
|
width: "100%",
|
||||||
|
wordWrap: "break-word",
|
||||||
|
overflow: "visible", // also make sure popup isn't clipped
|
||||||
|
}}
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
className="d-inline-block position-relative" // <-- ADD THIS !!
|
className="d-inline-block"
|
||||||
style={{ overflow: "visible" }}
|
ref={triggerRef}
|
||||||
|
onMouseEnter={handleMouseEnter}
|
||||||
|
onMouseLeave={handleMouseLeave}
|
||||||
|
onClick={handleClick}
|
||||||
|
style={{ cursor: "pointer" }}
|
||||||
>
|
>
|
||||||
<div
|
{children}
|
||||||
|
|
||||||
ref={triggerRef}
|
|
||||||
onMouseEnter={handleMouseEnter}
|
|
||||||
onMouseLeave={handleMouseLeave}
|
|
||||||
onClick={handleClick}
|
|
||||||
style={{ cursor: "pointer", display: "inline-block" }}
|
|
||||||
>
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{visible && (
|
|
||||||
<div
|
|
||||||
ref={popupRef}
|
|
||||||
className={`hover-popup bg-white border rounded shadow-sm p-3 position-absolute mt-2 ${className}`}
|
|
||||||
style={{
|
|
||||||
zIndex: 2000,
|
|
||||||
top: "100%",
|
|
||||||
minWidth: "200px",
|
|
||||||
maxWidth: "300px",
|
|
||||||
wordWrap: "break-word",
|
|
||||||
}}
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
|
||||||
>
|
|
||||||
{title && <h6 className="fw-semibold mb-2">{title}</h6>}
|
|
||||||
<div>{content}</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
|
||||||
|
{visible && (
|
||||||
|
<div
|
||||||
|
ref={popupRef}
|
||||||
|
className={`hover-popup bg-white border rounded shadow-sm p-3 position-absolute mt-2 ${className}`}
|
||||||
|
style={{
|
||||||
|
zIndex: 2000,
|
||||||
|
top: "100%",
|
||||||
|
width: "max-content",
|
||||||
|
minWidth: "120px",
|
||||||
|
}}
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
{title && <h6 className="fw-semibold mb-2">{title}</h6>}
|
||||||
|
<div>{content}</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,6 @@ const InputSuggestions = ({
|
|||||||
organizationList = [],
|
organizationList = [],
|
||||||
value,
|
value,
|
||||||
onChange,
|
onChange,
|
||||||
size = "sm",
|
|
||||||
error,
|
error,
|
||||||
disabled = false,
|
disabled = false,
|
||||||
}) => {
|
}) => {
|
||||||
@ -28,7 +27,7 @@ const InputSuggestions = ({
|
|||||||
return (
|
return (
|
||||||
<div className="mb-3 position-relative">
|
<div className="mb-3 position-relative">
|
||||||
<input
|
<input
|
||||||
className={`form-control form-control-${size}`}
|
className="form-control form-control-sm"
|
||||||
value={value}
|
value={value}
|
||||||
onChange={handleInputChange}
|
onChange={handleInputChange}
|
||||||
onBlur={() => setTimeout(() => setShowSuggestions(false), 150)}
|
onBlur={() => setTimeout(() => setShowSuggestions(false), 150)}
|
||||||
@ -51,6 +50,7 @@ const InputSuggestions = ({
|
|||||||
{filteredList.map((org) => (
|
{filteredList.map((org) => (
|
||||||
<li
|
<li
|
||||||
key={org}
|
key={org}
|
||||||
|
className="ropdown-item"
|
||||||
style={{
|
style={{
|
||||||
cursor: "pointer",
|
cursor: "pointer",
|
||||||
padding: "5px 12px",
|
padding: "5px 12px",
|
||||||
@ -58,14 +58,15 @@ const InputSuggestions = ({
|
|||||||
transition: "background-color 0.2s",
|
transition: "background-color 0.2s",
|
||||||
}}
|
}}
|
||||||
onMouseDown={() => handleSelectSuggestion(org)}
|
onMouseDown={() => handleSelectSuggestion(org)}
|
||||||
className={`dropdown-item ${org === value ? "active" : ""
|
className={`dropdown-item ${
|
||||||
|
org === value ? "active" : ""
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{org}
|
{org}
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{error && <small className="danger-text">{error}</small>}
|
{error && <small className="danger-text">{error}</small>}
|
||||||
|
|||||||
@ -1,111 +0,0 @@
|
|||||||
import { useRef } from "react";
|
|
||||||
import Label from "./Label";
|
|
||||||
import Tooltip from "./Tooltip";
|
|
||||||
import { formatFileSize, getIconByFileType } from "../../utils/appUtils";
|
|
||||||
|
|
||||||
const SingleFileUploader = ({
|
|
||||||
label = "Upload Document",
|
|
||||||
required = false,
|
|
||||||
value,
|
|
||||||
onChange,
|
|
||||||
onRemove,
|
|
||||||
disabled,
|
|
||||||
error,
|
|
||||||
accept = ".pdf,.jpg,.jpeg,.png",
|
|
||||||
maxSizeMB = 25,
|
|
||||||
hint = "(PDF, JPG, PNG, max 5MB)",
|
|
||||||
}) => {
|
|
||||||
const inputRef = useRef(null);
|
|
||||||
|
|
||||||
const handleFileSelect = async (e) => {
|
|
||||||
const file = e.target.files?.[0];
|
|
||||||
if (!file) return;
|
|
||||||
|
|
||||||
// Validate size
|
|
||||||
if (file.size > maxSizeMB * 1024 * 1024) {
|
|
||||||
alert(`File size cannot exceed ${maxSizeMB}MB`);
|
|
||||||
e.target.value = "";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert to base64
|
|
||||||
const base64Data = await new Promise((resolve, reject) => {
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
reader.onload = () => resolve(reader.result.split(",")[1]);
|
|
||||||
reader.onerror = (err) => reject(err);
|
|
||||||
});
|
|
||||||
|
|
||||||
const attachmentObj = {
|
|
||||||
fileName: file.name,
|
|
||||||
base64Data,
|
|
||||||
invoiceAttachmentTypeId: "", // set dynamically if needed
|
|
||||||
contentType: file.type,
|
|
||||||
fileSize: file.size,
|
|
||||||
description: "",
|
|
||||||
isActive: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
onChange(attachmentObj);
|
|
||||||
e.target.value = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="col-md-12">
|
|
||||||
<Label className="form-label" required={required}>
|
|
||||||
{label}
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<div
|
|
||||||
className="border border-secondary border-dashed rounded p-4 text-center bg-textMuted position-relative"
|
|
||||||
style={{ cursor: "pointer" }}
|
|
||||||
onClick={() => inputRef.current.click()}
|
|
||||||
>
|
|
||||||
<i className="bx bx-cloud-upload d-block bx-lg"></i>
|
|
||||||
<span className="text-muted d-block">
|
|
||||||
Click to select or click here to browse
|
|
||||||
</span>
|
|
||||||
<small className="text-muted">{hint}</small>
|
|
||||||
|
|
||||||
<input
|
|
||||||
type="file"
|
|
||||||
ref={inputRef}
|
|
||||||
accept={accept}
|
|
||||||
style={{ display: "none" }}
|
|
||||||
onChange={handleFileSelect}
|
|
||||||
disabled={disabled}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{error && <small className="danger-text">{error}</small>}
|
|
||||||
|
|
||||||
{value && (
|
|
||||||
<div className="mt-3">
|
|
||||||
<div className="d-flex align-items-center justify-content-between bg-white border rounded p-2">
|
|
||||||
<div className="d-flex align-items-center gap-2">
|
|
||||||
<i
|
|
||||||
className={`bx ${getIconByFileType(value.contentType)} fs-3`}
|
|
||||||
></i>
|
|
||||||
|
|
||||||
<div className="d-flex flex-column text-truncate">
|
|
||||||
<span className="fw-semibold small text-truncate">
|
|
||||||
{value.fileName}
|
|
||||||
</span>
|
|
||||||
<small className="text-muted">
|
|
||||||
{value.fileSize ? formatFileSize(value.fileSize) : ""}
|
|
||||||
</small>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<i
|
|
||||||
className="bx bx-trash text-danger fs-5 cursor-pointer"
|
|
||||||
onClick={onRemove}
|
|
||||||
></i>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default SingleFileUploader;
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { useDeliverChallane } from "../../hooks/usePurchase";
|
|
||||||
import { SpinnerLoader } from "../common/Loader";
|
|
||||||
import { formatUTCToLocalTime } from "../../utils/dateUtils";
|
|
||||||
import { FileView } from "../Expenses/Filelist";
|
|
||||||
|
|
||||||
const DeliverChallanList = ({ purchaseId }) => {
|
|
||||||
const { data, isLoading, isError, error } = useDeliverChallane(purchaseId);
|
|
||||||
if (isLoading) {
|
|
||||||
return (
|
|
||||||
<div className="d-flex justify-content-center align-items-center text-center vh-50">
|
|
||||||
<SpinnerLoader />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isError) {
|
|
||||||
return (
|
|
||||||
<div className="py-3">
|
|
||||||
<Error error={error} />
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (!isLoading && data.length === 0)
|
|
||||||
return (
|
|
||||||
<div className="d-flex justify-content-center align-items-center text-center vh-50">
|
|
||||||
<p className="mb-0">Not Yet</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="list-group list-group-flush text-start">
|
|
||||||
{data.map((item) => (
|
|
||||||
<div
|
|
||||||
key={item.id}
|
|
||||||
className="list-group-item d-flex justify-content-between align-items-start flex-wrap px-3 w-full"
|
|
||||||
>
|
|
||||||
{/* LEFT SIDE */}
|
|
||||||
<div className=" pe-3 text-break w-full">
|
|
||||||
<div className="d-flex justify-content-between">
|
|
||||||
<p className="mb-1 fw-semibold">{item.deliveryChallanNumber}</p>
|
|
||||||
<small className="text-muted text-end">
|
|
||||||
{formatUTCToLocalTime(item.deliveryChallanDate, true)}
|
|
||||||
</small>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mb-1 small text-muted text-break">
|
|
||||||
<span className="fw-semibold me-1">Invoice:</span>
|
|
||||||
{item.purchaseInvoice?.title} (
|
|
||||||
{item.purchaseInvoice?.purchaseInvoiceUId})
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p className="mb-1 text-break">
|
|
||||||
<span className="fw-semibold">Description:</span>{" "}
|
|
||||||
{item.description || "-"}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
{item.attachment?.preSignedUrl && (
|
|
||||||
<FileView file={item.attachment} />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default DeliverChallanList;
|
|
||||||
@ -1,200 +0,0 @@
|
|||||||
import React, { useState } from "react";
|
|
||||||
import {
|
|
||||||
useAddDeliverChallan,
|
|
||||||
useDeliverChallane,
|
|
||||||
} from "../../hooks/usePurchase";
|
|
||||||
import { SpinnerLoader } from "../common/Loader";
|
|
||||||
import { formatUTCToLocalTime } from "../../utils/dateUtils";
|
|
||||||
import DeliverChallanList from "./DeliverChallanList";
|
|
||||||
import { AppFormController, useAppForm } from "../../hooks/appHooks/useAppForm";
|
|
||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
|
||||||
import {
|
|
||||||
DeliveryChallanDefaultValue,
|
|
||||||
DeliveryChallanSchema,
|
|
||||||
} from "./PurchaseSchema";
|
|
||||||
import Label from "../common/Label";
|
|
||||||
import DatePicker from "../common/DatePicker";
|
|
||||||
import { useInvoiceAttachmentTypes } from "../../hooks/masterHook/useMaster";
|
|
||||||
import SelectField from "../common/Forms/SelectField";
|
|
||||||
import Filelist from "../Expenses/Filelist";
|
|
||||||
import SingleFileUploader from "../common/SigleFileUploader";
|
|
||||||
import { localToUtc } from "../../utils/appUtils";
|
|
||||||
import WarningBlock from "../InfoBlock/WarningBlock";
|
|
||||||
import { FILE_UPLOAD_INFO } from "../../utils/staticContent";
|
|
||||||
|
|
||||||
const DeliveryChallane = ({ purchaseId }) => {
|
|
||||||
const [file, setFile] = useState(null);
|
|
||||||
|
|
||||||
const {
|
|
||||||
register,
|
|
||||||
control,
|
|
||||||
handleSubmit,
|
|
||||||
setValue,
|
|
||||||
trigger,
|
|
||||||
watch,
|
|
||||||
reset,
|
|
||||||
formState: { errors },
|
|
||||||
} = useAppForm({
|
|
||||||
resolver: zodResolver(DeliveryChallanSchema),
|
|
||||||
defaultValues: DeliveryChallanDefaultValue,
|
|
||||||
});
|
|
||||||
|
|
||||||
const { data, isLoading } = useInvoiceAttachmentTypes();
|
|
||||||
const { mutate: AddChallan, isPending } = useAddDeliverChallan(() => {
|
|
||||||
setFile(null);
|
|
||||||
setValue("attachment", null, { shouldValidate: false });
|
|
||||||
reset({
|
|
||||||
...DeliveryChallanDefaultValue,
|
|
||||||
attachment: null,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
const onSubmit = async (formData) => {
|
|
||||||
const valid = await trigger();
|
|
||||||
if (!valid) return;
|
|
||||||
const { invoiceAttachmentTypeId, ...rest } = formData;
|
|
||||||
|
|
||||||
const payload = {
|
|
||||||
...rest,
|
|
||||||
attachment: formData.attachment
|
|
||||||
? {
|
|
||||||
...formData.attachment,
|
|
||||||
invoiceAttachmentTypeId,
|
|
||||||
}
|
|
||||||
: null,
|
|
||||||
purchaseInvoiceId: purchaseId,
|
|
||||||
deliveryChallanDate: formData.deliveryChallanDate
|
|
||||||
? localToUtc(formData.deliveryChallanDate)
|
|
||||||
: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
AddChallan(payload);
|
|
||||||
};
|
|
||||||
const isUploaded = watch("attachment");
|
|
||||||
const isDocumentType = watch("invoiceAttachmentTypeId");
|
|
||||||
return (
|
|
||||||
<div className="row px-3 px-sm-1">
|
|
||||||
<div className="fw-semibold mb-3 fs-5">Delivery Challans</div>
|
|
||||||
|
|
||||||
<div className="col-md-6">
|
|
||||||
<form
|
|
||||||
onSubmit={handleSubmit(onSubmit)}
|
|
||||||
className="row g-3 text-start"
|
|
||||||
noValidate
|
|
||||||
>
|
|
||||||
{/* Challan Number */}
|
|
||||||
<div className="col-md-6">
|
|
||||||
<Label required>Delivery Challan No</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
className="form-control"
|
|
||||||
{...register("deliveryChallanNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.deliveryChallanNumber && (
|
|
||||||
<small className="danger-text">
|
|
||||||
{errors.deliveryChallanNumber.message}
|
|
||||||
</small>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-md-6">
|
|
||||||
<Label required>Delivery Date</Label>
|
|
||||||
|
|
||||||
<DatePicker
|
|
||||||
name="deliveryChallanDate"
|
|
||||||
control={control}
|
|
||||||
className="w-100"
|
|
||||||
size="xs"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.deliveryChallanDate && (
|
|
||||||
<small className="danger-text">
|
|
||||||
{errors.deliveryChallanDate.message}
|
|
||||||
</small>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12">
|
|
||||||
<Label required>Description</Label>
|
|
||||||
|
|
||||||
<textarea
|
|
||||||
className="form-control form-control-sm"
|
|
||||||
rows="3"
|
|
||||||
{...register("description")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.description && (
|
|
||||||
<small className="danger-text">
|
|
||||||
{errors.description.message}
|
|
||||||
</small>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12">
|
|
||||||
<AppFormController
|
|
||||||
name="invoiceAttachmentTypeId"
|
|
||||||
control={control}
|
|
||||||
render={({ field }) => (
|
|
||||||
<SelectField
|
|
||||||
label="Select Document Type"
|
|
||||||
options={data ?? []}
|
|
||||||
placeholder="Choose Type"
|
|
||||||
labelKeyKey="name"
|
|
||||||
valueKeyKey="id"
|
|
||||||
value={field.value}
|
|
||||||
onChange={field.onChange}
|
|
||||||
isLoading={isLoading}
|
|
||||||
className="m-0"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.invoiceAttachmentTypeId && (
|
|
||||||
<small className="danger-text">
|
|
||||||
{errors.invoiceAttachmentTypeId.message}
|
|
||||||
</small>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<SingleFileUploader
|
|
||||||
label="Upload Bill"
|
|
||||||
required
|
|
||||||
value={file}
|
|
||||||
onChange={(selectedFile) => {
|
|
||||||
setFile(selectedFile);
|
|
||||||
setValue("attachment", selectedFile, { shouldValidate: true });
|
|
||||||
}}
|
|
||||||
disabled={!isDocumentType}
|
|
||||||
onRemove={() => {
|
|
||||||
setFile(null);
|
|
||||||
setValue("attachment", null, { shouldValidate: true });
|
|
||||||
}}
|
|
||||||
error={errors?.attachment?.message}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div className="col-12 text-end my-3">
|
|
||||||
<button type="submit" className="btn btn-sm btn-primary px-4">
|
|
||||||
{isPending ? "Please Wait..." : "Submit"}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
{!isUploaded && (
|
|
||||||
<WarningBlock content={FILE_UPLOAD_INFO} />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-md-6 text-start">
|
|
||||||
<div className="d-flex justiffy-content-start align-items-center gap-1 ms-2">
|
|
||||||
<i className="bx bx-history bx-xs"></i>{" "}
|
|
||||||
<p className="fw-medium mb-0">History</p>
|
|
||||||
</div>
|
|
||||||
<div className="overflow-auto " style={{ maxHeight: "420px" }}>
|
|
||||||
<DeliverChallanList purchaseId={purchaseId} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default DeliveryChallane;
|
|
||||||
@ -1,234 +0,0 @@
|
|||||||
import React, { useEffect, useMemo, useCallback, useState } from "react";
|
|
||||||
import { AppFormProvider, useAppForm } from "../../hooks/appHooks/useAppForm";
|
|
||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
|
||||||
|
|
||||||
import {
|
|
||||||
defaultPurchaseValue,
|
|
||||||
PurchaseSchema,
|
|
||||||
getStepFields,
|
|
||||||
} from "./PurchaseSchema";
|
|
||||||
|
|
||||||
import PurchasePartyDetails from "./PurchasePartyDetails";
|
|
||||||
import PurchaseTransportDetails from "./PurchaseTransportDetails";
|
|
||||||
import PurchasePaymentDetails from "./PurchasePaymentDetails";
|
|
||||||
|
|
||||||
import {
|
|
||||||
useCreatePurchaseInvoice,
|
|
||||||
usePurchase,
|
|
||||||
useUpdatePurchaseInvoice,
|
|
||||||
} from "../../hooks/usePurchase";
|
|
||||||
import { error } from "pdf-lib";
|
|
||||||
|
|
||||||
const ManagePurchase = ({ onClose, purchaseId }) => {
|
|
||||||
const { data } = usePurchase(purchaseId);
|
|
||||||
|
|
||||||
const [activeTab, setActiveTab] = useState(0);
|
|
||||||
const [completedTabs, setCompletedTabs] = useState([]);
|
|
||||||
|
|
||||||
const stepsConfig = useMemo(
|
|
||||||
() => [
|
|
||||||
{
|
|
||||||
name: "Party Details",
|
|
||||||
icon: "bx bx-user bx-md",
|
|
||||||
subtitle: "Supplier & project information",
|
|
||||||
component: <PurchasePartyDetails purchase={data} />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Invoice & Transport",
|
|
||||||
icon: "bx bx-receipt bx-md",
|
|
||||||
subtitle: "Invoice, eWay bill & transport info",
|
|
||||||
component: <PurchaseTransportDetails />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Payment Details",
|
|
||||||
icon: "bx bx-credit-card bx-md",
|
|
||||||
subtitle: "Amount, tax & due date",
|
|
||||||
component: <PurchasePaymentDetails purchaseId={purchaseId} />,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
[data, purchaseId]
|
|
||||||
);
|
|
||||||
|
|
||||||
const purchaseOrder = useAppForm({
|
|
||||||
resolver: zodResolver(PurchaseSchema),
|
|
||||||
defaultValues: defaultPurchaseValue,
|
|
||||||
mode: "onChange",
|
|
||||||
shouldUnregister: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const { reset, formState } = purchaseOrder;
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!purchaseId || !data) return;
|
|
||||||
|
|
||||||
reset({
|
|
||||||
...data,
|
|
||||||
projectId: data?.project?.id,
|
|
||||||
organizationId: data?.organization?.id,
|
|
||||||
supplierId: data?.supplier?.id,
|
|
||||||
invoiceAttachmentTypeId: null,
|
|
||||||
attachments:
|
|
||||||
data?.attachments?.map((doc) => ({
|
|
||||||
fileName: doc.fileName,
|
|
||||||
base64Data: null,
|
|
||||||
contentType: doc.contentType,
|
|
||||||
documentId: doc.documentId,
|
|
||||||
invoiceAttachmentTypeId: doc.invoiceAttachmentType?.id ?? null,
|
|
||||||
fileSize: 0,
|
|
||||||
description: "",
|
|
||||||
preSignedUrl: doc.preSignedUrl,
|
|
||||||
isActive: doc.isActive ?? true,
|
|
||||||
})) || [],
|
|
||||||
});
|
|
||||||
|
|
||||||
setCompletedTabs([0, 1, 2]);
|
|
||||||
}, [purchaseId, data, reset]);
|
|
||||||
|
|
||||||
const handleNext = useCallback(async () => {
|
|
||||||
const fields = getStepFields(activeTab);
|
|
||||||
const valid = await purchaseOrder.trigger(fields);
|
|
||||||
|
|
||||||
if (!valid) return;
|
|
||||||
|
|
||||||
setCompletedTabs((prev) => [...new Set([...prev, activeTab])]);
|
|
||||||
setActiveTab((prev) => Math.min(prev + 1, stepsConfig.length - 1));
|
|
||||||
}, [activeTab, purchaseOrder, stepsConfig.length]);
|
|
||||||
|
|
||||||
const handlePrev = useCallback(() => {
|
|
||||||
setActiveTab((prev) => Math.max(prev - 1, 0));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const generatePatchOps = useCallback(
|
|
||||||
(formData) => {
|
|
||||||
const { dirtyFields } = formState;
|
|
||||||
|
|
||||||
return Object.keys(dirtyFields)
|
|
||||||
.filter((key) => key !== "invoiceAttachmentTypeId")
|
|
||||||
.map((key) => ({
|
|
||||||
operationType: 0,
|
|
||||||
path: `/${key}`,
|
|
||||||
op: "replace",
|
|
||||||
value: formData[key],
|
|
||||||
}));
|
|
||||||
},
|
|
||||||
[formState]
|
|
||||||
);
|
|
||||||
|
|
||||||
const { mutate: CreateInvoice, isPending } = useCreatePurchaseInvoice(() => {
|
|
||||||
reset();
|
|
||||||
onClose();
|
|
||||||
});
|
|
||||||
|
|
||||||
const { mutate: updatePurchase, isPending: isUpdating } =
|
|
||||||
useUpdatePurchaseInvoice(() => {
|
|
||||||
reset();
|
|
||||||
onClose();
|
|
||||||
});
|
|
||||||
|
|
||||||
const onSubmit = useCallback(
|
|
||||||
(formData) => {
|
|
||||||
if (activeTab !== 2) return;
|
|
||||||
|
|
||||||
if (purchaseId) {
|
|
||||||
const payload = generatePatchOps(formData);
|
|
||||||
updatePurchase({ purchaseId, payload });
|
|
||||||
} else {
|
|
||||||
CreateInvoice(formData);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
[activeTab, purchaseId, generatePatchOps, updatePurchase, CreateInvoice]
|
|
||||||
);
|
|
||||||
return (
|
|
||||||
<div className="bs-stepper horizontically mt-2 b-secondry shadow-none border-0">
|
|
||||||
{/* --- Steps Header --- */}
|
|
||||||
<div className="bs-stepper-header text-start px-0 py-1">
|
|
||||||
{stepsConfig.map((step, index) => {
|
|
||||||
const isActive = activeTab === index;
|
|
||||||
const isCompleted = completedTabs.includes(index);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<React.Fragment key={step.name}>
|
|
||||||
<div
|
|
||||||
className={`step text-truncate ${isActive ? "active" : ""} ${
|
|
||||||
isCompleted ? "crossed" : ""
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="step-trigger"
|
|
||||||
onClick={() => purchaseId && setActiveTab(index)}
|
|
||||||
>
|
|
||||||
<span className="bs-stepper-circle">
|
|
||||||
{isCompleted ? (
|
|
||||||
<i className="bx bx-check"></i>
|
|
||||||
) : (
|
|
||||||
<i className={step.icon}></i>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<span className="bs-stepper-label">
|
|
||||||
<span className="bs-stepper-title">{step.name}</span>
|
|
||||||
<span className="bs-stepper-subtitle">{step.subtitle}</span>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{index < stepsConfig.length - 1 && (
|
|
||||||
<div className="line text-primary"></div>
|
|
||||||
)}
|
|
||||||
</React.Fragment>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* --- Form Content --- */}
|
|
||||||
<div className="bs-stepper-content py-2 px-3">
|
|
||||||
<AppFormProvider {...purchaseOrder}>
|
|
||||||
<form
|
|
||||||
onKeyDown={(e) =>
|
|
||||||
e.key === "Enter" && activeTab !== 2 && e.preventDefault()
|
|
||||||
}
|
|
||||||
onSubmit={purchaseOrder.handleSubmit(onSubmit)}
|
|
||||||
>
|
|
||||||
{stepsConfig[activeTab].component}
|
|
||||||
|
|
||||||
{/* Buttons */}
|
|
||||||
<div className="d-flex justify-content-between mt-4">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="btn btn-sm btn-outline-secondary"
|
|
||||||
onClick={handlePrev}
|
|
||||||
disabled={activeTab === 0}
|
|
||||||
>
|
|
||||||
Previous
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
{activeTab < stepsConfig.length - 1 ? (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
onClick={handleNext}
|
|
||||||
disabled={isPending || isUpdating}
|
|
||||||
>
|
|
||||||
Next
|
|
||||||
</button>
|
|
||||||
) : (
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
disabled={isPending || isUpdating}
|
|
||||||
>
|
|
||||||
{isPending || isUpdating ? "Please Wait" : "Submit"}
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</AppFormProvider>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ManagePurchase;
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
import React, { useState } from "react";
|
|
||||||
import { usePurchasesList } from "../../hooks/usePurchase";
|
|
||||||
import { ITEMS_PER_PAGE } from "../../utils/constants";
|
|
||||||
import Pagination from "../common/Pagination";
|
|
||||||
import { PurchaseColumn } from "./Purchasetable";
|
|
||||||
import { SpinnerLoader } from "../common/Loader";
|
|
||||||
import { useDebounce } from "../../utils/appUtils";
|
|
||||||
import { usePurchaseContext } from "../../pages/purchase/PurchasePage";
|
|
||||||
|
|
||||||
const PurchaseList = ({ searchString }) => {
|
|
||||||
const { setViewPurchase, setManagePurchase, setChallan } =
|
|
||||||
usePurchaseContext();
|
|
||||||
const [currentPage, setCurrentPage] = useState(1);
|
|
||||||
const debounceSearch = useDebounce(searchString, 300);
|
|
||||||
const { data, isLoading } = usePurchasesList(
|
|
||||||
ITEMS_PER_PAGE,
|
|
||||||
currentPage,
|
|
||||||
true,
|
|
||||||
{},
|
|
||||||
debounceSearch
|
|
||||||
);
|
|
||||||
|
|
||||||
const paginate = (page) => {
|
|
||||||
if (page >= 1 && page <= (data?.totalPages ?? 1)) {
|
|
||||||
setCurrentPage(page);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const visibleColumns = PurchaseColumn.filter((col) => !col.hidden);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="card mt-2 page-min-h px-sm-4">
|
|
||||||
<div className="table-responsive px-2">
|
|
||||||
<table className="datatables-users table border-top text-nowrap">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
{visibleColumns.map((col) => (
|
|
||||||
<th key={col.key} colSpan={col.colSpan || 1}>
|
|
||||||
<div className={col.className || ""}>{col.label}</div>
|
|
||||||
</th>
|
|
||||||
))}
|
|
||||||
<th>Action</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
|
|
||||||
<tbody>
|
|
||||||
{/* LOADING */}
|
|
||||||
{isLoading && (
|
|
||||||
<tr>
|
|
||||||
<td colSpan={visibleColumns.length + 1} className="border-0">
|
|
||||||
<div className="py-6 py-12">
|
|
||||||
<SpinnerLoader />
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
)}
|
|
||||||
{!isLoading && data?.data?.length === 0 && (
|
|
||||||
<tr>
|
|
||||||
<td
|
|
||||||
colSpan={visibleColumns.length}
|
|
||||||
className="text-center py-4"
|
|
||||||
colSpan={4}
|
|
||||||
>
|
|
||||||
No Data Found
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isLoading &&
|
|
||||||
data?.data?.map((item, index) => (
|
|
||||||
<tr key={item?.id || index}>
|
|
||||||
{visibleColumns.map((col) => (
|
|
||||||
<td key={col.key} className={col.className || ""}>
|
|
||||||
{col.render ? col.render(item) : item[col.key] || "NA"}
|
|
||||||
</td>
|
|
||||||
))}
|
|
||||||
<td >
|
|
||||||
<div className="dropdown z-2">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="btn btn-icon btn-text-secondary rounded-pill dropdown-toggle hide-arrow p-0"
|
|
||||||
data-bs-toggle="dropdown"
|
|
||||||
aria-expanded="false"
|
|
||||||
>
|
|
||||||
<i
|
|
||||||
className="bx bx-dots-vertical-rounded bx-sm text-muted"
|
|
||||||
data-bs-toggle="tooltip"
|
|
||||||
data-bs-offset="0,8"
|
|
||||||
data-bs-placement="top"
|
|
||||||
data-bs-custom-class="tooltip-dark"
|
|
||||||
title="More Action"
|
|
||||||
></i>
|
|
||||||
</button>
|
|
||||||
<ul className="dropdown-menu dropdown-menu-end">
|
|
||||||
<li>
|
|
||||||
<a
|
|
||||||
className="dropdown-item cursor-pointer"
|
|
||||||
onClick={() =>
|
|
||||||
setViewPurchase({
|
|
||||||
isOpen: true,
|
|
||||||
purchaseId: item.id,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<i className="bx bx-show me-2"></i>
|
|
||||||
<span className="align-left">view</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a
|
|
||||||
className="dropdown-item cursor-pointer"
|
|
||||||
onClick={() =>
|
|
||||||
setManagePurchase({
|
|
||||||
isOpen: true,
|
|
||||||
purchaseId: item.id,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<i className="bx bx-edit me-2"></i>
|
|
||||||
<span className="align-left">Edit</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a
|
|
||||||
className="dropdown-item cursor-pointer"
|
|
||||||
onClick={() =>
|
|
||||||
setChallan({
|
|
||||||
isOpen: true,
|
|
||||||
purchaseId: item.id,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<i className="bx bx-file bx-plus me-2"></i>
|
|
||||||
|
|
||||||
<span className="align-left">Add Delivery Challan</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{data?.data?.length > 0 && (
|
|
||||||
<Pagination
|
|
||||||
currentPage={currentPage}
|
|
||||||
totalPages={data.totalPages}
|
|
||||||
onPageChange={paginate}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PurchaseList;
|
|
||||||
@ -1,232 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import {
|
|
||||||
AppFormController,
|
|
||||||
useAppFormContext,
|
|
||||||
} from "../../hooks/appHooks/useAppForm";
|
|
||||||
import Label from "../common/Label";
|
|
||||||
import DatePicker from "../common/DatePicker";
|
|
||||||
import {
|
|
||||||
SelectFieldSearch,
|
|
||||||
SelectProjectField,
|
|
||||||
} from "../common/Forms/SelectFieldServerSide";
|
|
||||||
import {
|
|
||||||
useGlobaleOrganizations,
|
|
||||||
useOrganization,
|
|
||||||
useOrganizationsList,
|
|
||||||
} from "../../hooks/useOrganization";
|
|
||||||
import { ITEMS_PER_PAGE } from "../../utils/constants";
|
|
||||||
|
|
||||||
const PurchasePartyDetails = () => {
|
|
||||||
const {
|
|
||||||
register,
|
|
||||||
control,
|
|
||||||
setValue,
|
|
||||||
watch,
|
|
||||||
formState: { errors },
|
|
||||||
} = useAppFormContext();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="row g-3 text-start">
|
|
||||||
{/* Title */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="title" required>
|
|
||||||
Title
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="title"
|
|
||||||
type="text"
|
|
||||||
className={`form-control form-control-xs ${
|
|
||||||
errors?.title ? "is-invalid" : ""
|
|
||||||
}`}
|
|
||||||
{...register("title")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.title && (
|
|
||||||
<div className="danger-text">{errors.title.message}</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Project ID */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<SelectProjectField
|
|
||||||
className={`form-control form-control-xs ${
|
|
||||||
errors?.projectId ? "is-invalid" : ""
|
|
||||||
}`}
|
|
||||||
label="Project"
|
|
||||||
required
|
|
||||||
placeholder="Select Project"
|
|
||||||
value={watch("projectId")}
|
|
||||||
onChange={(val) =>
|
|
||||||
setValue("projectId", val, {
|
|
||||||
shouldDirty: true,
|
|
||||||
shouldValidate: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
errors={errors}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6 my-0">
|
|
||||||
<AppFormController
|
|
||||||
name="organizationId"
|
|
||||||
control={control}
|
|
||||||
render={({ field }) => (
|
|
||||||
<SelectFieldSearch
|
|
||||||
{...field}
|
|
||||||
label="Organization"
|
|
||||||
placeholder="Select Organization"
|
|
||||||
required
|
|
||||||
valueKey="id"
|
|
||||||
labelKey="name"
|
|
||||||
useFetchHook={useGlobaleOrganizations}
|
|
||||||
hookParams={[ITEMS_PER_PAGE, 1]}
|
|
||||||
error={errors?.organizationId?.message}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6 my-0">
|
|
||||||
<AppFormController
|
|
||||||
name="supplierId"
|
|
||||||
control={control}
|
|
||||||
render={({ field }) => (
|
|
||||||
<SelectFieldSearch
|
|
||||||
label="Supplier"
|
|
||||||
placeholder="Select Organization"
|
|
||||||
required
|
|
||||||
value={field.value}
|
|
||||||
onChange={field.onChange}
|
|
||||||
valueKey="id"
|
|
||||||
labelKey="name"
|
|
||||||
useFetchHook={useGlobaleOrganizations}
|
|
||||||
hookParams={[ITEMS_PER_PAGE, 1]}
|
|
||||||
errors={errors.supplierId}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6 my-0">
|
|
||||||
<Label htmlFor="billingAddress">Billing Address</Label>
|
|
||||||
|
|
||||||
<textarea
|
|
||||||
id="billingAddress"
|
|
||||||
rows="2"
|
|
||||||
className={`form-control form-control-xs `}
|
|
||||||
{...register("billingAddress")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.billingAddress && (
|
|
||||||
<div className="danger-text">{errors.billingAddress.message}</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6 my-0 mb-1">
|
|
||||||
<Label htmlFor="shippingAddress">Shipping Address</Label>
|
|
||||||
|
|
||||||
<textarea
|
|
||||||
id="shippingAddress"
|
|
||||||
rows="2"
|
|
||||||
className={`form-control form-control-xs `}
|
|
||||||
{...register("shippingAddress")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.shippingAddress && (
|
|
||||||
<div className="danger-text">{errors.shippingAddress.message}</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Purchase Order Number */}
|
|
||||||
<div className="col-12 col-md-6 ">
|
|
||||||
<Label htmlFor="purchaseOrderNumber" required>
|
|
||||||
Purchase Order Number
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="purchaseOrderNumber"
|
|
||||||
type="text"
|
|
||||||
className={`form-control form-control-xs `}
|
|
||||||
{...register("purchaseOrderNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.purchaseOrderNumber && (
|
|
||||||
<div className="danger-text">
|
|
||||||
{errors.purchaseOrderNumber.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Purchase Order Date */}
|
|
||||||
<div className="col-12 col-md-6 mb-1">
|
|
||||||
<Label htmlFor="purchaseOrderDate" required>
|
|
||||||
Purchase Order Date
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<DatePicker
|
|
||||||
control={control}
|
|
||||||
name="purchaseOrderDate"
|
|
||||||
size="xs"
|
|
||||||
className={` w-full ${
|
|
||||||
errors?.purchaseOrderDate ? "is-invalid" : ""
|
|
||||||
}`}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.purchaseOrderDate && (
|
|
||||||
<div className="danger-text">{errors.purchaseOrderDate.message}</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Proforma Invoice */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="proformaInvoiceNumber">Proforma Invoice Number</Label>
|
|
||||||
<input
|
|
||||||
id="proformaInvoiceNumber"
|
|
||||||
type="text"
|
|
||||||
className={`form-control `}
|
|
||||||
{...register("proformaInvoiceNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.proformaInvoiceNumber && (
|
|
||||||
<div className="danger-text">
|
|
||||||
{errors.proformaInvoiceNumber.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="col-12 col-md-6 mb-1">
|
|
||||||
<Label htmlFor="proformaInvoiceAmountt">Proforma Amount</Label>
|
|
||||||
<input
|
|
||||||
id="proformaInvoiceAmount"
|
|
||||||
type="text"
|
|
||||||
className={`form-control `}
|
|
||||||
{...register("proformaInvoiceAmount")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.proformaInvoiceAmountt && (
|
|
||||||
<div className="danger-text">
|
|
||||||
{errors.proformaInvoiceAmount.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="col-12 col-md-6 mb-2">
|
|
||||||
<Label htmlFor="proformaInvoiceDate">Proforma Date</Label>
|
|
||||||
|
|
||||||
<DatePicker
|
|
||||||
control={control}
|
|
||||||
name="proformaInvoiceDate"
|
|
||||||
className="w-full"
|
|
||||||
size="xs"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.proformaInvoiceDate && (
|
|
||||||
<div className="danger-text">
|
|
||||||
{errors.proformaInvoiceDate.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PurchasePartyDetails;
|
|
||||||
@ -1,308 +0,0 @@
|
|||||||
import React, { useEffect } from "react";
|
|
||||||
import Label from "../common/Label";
|
|
||||||
import {
|
|
||||||
AppFormController,
|
|
||||||
useAppFormContext,
|
|
||||||
} from "../../hooks/appHooks/useAppForm";
|
|
||||||
import DatePicker from "../common/DatePicker";
|
|
||||||
import { useInvoiceAttachmentTypes } from "../../hooks/masterHook/useMaster";
|
|
||||||
import Filelist from "../Expenses/Filelist";
|
|
||||||
import SelectField from "../common/Forms/SelectField";
|
|
||||||
import { useWatch } from "react-hook-form";
|
|
||||||
import WarningBlock from "../InfoBlock/WarningBlock";
|
|
||||||
import { FILE_UPLOAD_INFO } from "../../utils/staticContent";
|
|
||||||
|
|
||||||
const PurchasePaymentDetails = ({ purchaseId = null }) => {
|
|
||||||
const { data, isLoading, error, isError } = useInvoiceAttachmentTypes();
|
|
||||||
const { data: InvoiceDocTypes, isLoading: invoiceDocLoading } =
|
|
||||||
useInvoiceAttachmentTypes();
|
|
||||||
const {
|
|
||||||
register,
|
|
||||||
watch,
|
|
||||||
setValue,
|
|
||||||
control,
|
|
||||||
formState: { errors },
|
|
||||||
} = useAppFormContext();
|
|
||||||
|
|
||||||
const baseAmount = watch("baseAmount");
|
|
||||||
const taxAmount = watch("taxAmount");
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const base = parseFloat(baseAmount) || 0;
|
|
||||||
const tax = parseFloat(taxAmount) || 0;
|
|
||||||
|
|
||||||
if (base || tax) {
|
|
||||||
setValue("totalAmount", (base + tax).toFixed(2));
|
|
||||||
}
|
|
||||||
}, [baseAmount, taxAmount, setValue]);
|
|
||||||
const invoiceAttachmentType = watch("invoiceAttachmentTypeId");
|
|
||||||
const files = watch("attachments");
|
|
||||||
const toBase64 = (file) =>
|
|
||||||
new Promise((resolve, reject) => {
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
reader.onload = () => resolve(reader.result.split(",")[1]);
|
|
||||||
reader.onerror = (error) => reject(error);
|
|
||||||
});
|
|
||||||
const onFileChange = async (e) => {
|
|
||||||
const newFiles = Array.from(e.target.files);
|
|
||||||
if (newFiles.length === 0) return;
|
|
||||||
|
|
||||||
const existingFiles = watch("attachments") || [];
|
|
||||||
|
|
||||||
const parsedFiles = await Promise.all(
|
|
||||||
newFiles.map(async (file) => {
|
|
||||||
const base64Data = await toBase64(file);
|
|
||||||
return {
|
|
||||||
fileName: file.name,
|
|
||||||
base64Data,
|
|
||||||
contentType: file.type,
|
|
||||||
fileSize: file.size,
|
|
||||||
description: "",
|
|
||||||
isActive: true,
|
|
||||||
invoiceAttachmentTypeId: invoiceAttachmentType,
|
|
||||||
isNew: true, // <-- temp
|
|
||||||
tempId: crypto.randomUUID(), // temp - id
|
|
||||||
};
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
const combinedFiles = [
|
|
||||||
...existingFiles,
|
|
||||||
...parsedFiles.filter(
|
|
||||||
(newFile) =>
|
|
||||||
!existingFiles.some(
|
|
||||||
(f) =>
|
|
||||||
f.fileName === newFile.fileName && f.fileSize === newFile.fileSize
|
|
||||||
)
|
|
||||||
),
|
|
||||||
];
|
|
||||||
|
|
||||||
setValue("attachments", combinedFiles, {
|
|
||||||
shouldDirty: true,
|
|
||||||
shouldValidate: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const removeFile = (index) => {
|
|
||||||
const updated = files.flatMap((file, i) => {
|
|
||||||
// NEW FILE → remove completely
|
|
||||||
if (file.isNew && file.tempId === index) {
|
|
||||||
return []; // remove from array
|
|
||||||
}
|
|
||||||
|
|
||||||
// EXISTING FILE → mark inactive
|
|
||||||
if (!file.isNew && file.documentId === index) {
|
|
||||||
return [{ ...file, isActive: false }];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [file];
|
|
||||||
});
|
|
||||||
|
|
||||||
setValue("attachments", updated, {
|
|
||||||
shouldDirty: true,
|
|
||||||
shouldValidate: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="row g-1 text-start">
|
|
||||||
<div className="col-12 col-md-4">
|
|
||||||
<Label htmlFor="baseAmount" required>
|
|
||||||
Base Amount
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="baseAmount"
|
|
||||||
type="number"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("baseAmount", { valueAsNumber: true })}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.baseAmount && (
|
|
||||||
<div className="small danger-text mt-1">
|
|
||||||
{errors.baseAmount.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-4">
|
|
||||||
<Label htmlFor="taxAmount" required>
|
|
||||||
Tax Amount
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="taxAmount"
|
|
||||||
type="number"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("taxAmount", { valueAsNumber: true })}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.taxAmount && (
|
|
||||||
<div className="small danger-text mt-1">
|
|
||||||
{errors.taxAmount.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-4">
|
|
||||||
<Label htmlFor="totalAmount" required>
|
|
||||||
Total Amount
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="totalAmount"
|
|
||||||
type="number"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("totalAmount", { valueAsNumber: true })}
|
|
||||||
readOnly
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.totalAmount && (
|
|
||||||
<div className="small danger-text mt-1">
|
|
||||||
{errors.totalAmount.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="transportCharges">Transport Charges</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="transportCharges"
|
|
||||||
type="number"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("transportCharges", { valueAsNumber: true })}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.transportCharges && (
|
|
||||||
<div className="small danger-text mt-1">
|
|
||||||
{errors.transportCharges.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="paymentDueDate">Payment Due Date</Label>
|
|
||||||
|
|
||||||
<DatePicker
|
|
||||||
name={"paymentDueDate"}
|
|
||||||
control={control}
|
|
||||||
className="w-full"
|
|
||||||
size="xs"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.paymentDueDate && (
|
|
||||||
<div className="small danger-text mt-1">
|
|
||||||
{errors.paymentDueDate.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 mb-2">
|
|
||||||
<Label htmlFor="description" required>
|
|
||||||
Description
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<textarea
|
|
||||||
id="description"
|
|
||||||
rows="3"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("description")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.description && (
|
|
||||||
<div className="small danger-text mt-1">
|
|
||||||
{errors.description.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="col-12">
|
|
||||||
<AppFormController
|
|
||||||
name="invoiceAttachmentTypeId"
|
|
||||||
control={control}
|
|
||||||
render={({ field }) => (
|
|
||||||
<SelectField
|
|
||||||
label="Select Document Type"
|
|
||||||
options={InvoiceDocTypes ?? []}
|
|
||||||
placeholder="Choose Type"
|
|
||||||
labelKeyKey="name"
|
|
||||||
valueKeyKey="id"
|
|
||||||
value={field.value}
|
|
||||||
onChange={field.onChange}
|
|
||||||
isLoading={invoiceDocLoading}
|
|
||||||
className="m-0"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.invoiceAttachmentTypeId && (
|
|
||||||
<small className="danger-text">
|
|
||||||
{errors.invoiceAttachmentTypeId.message}
|
|
||||||
</small>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="text-start">
|
|
||||||
<div className="col-md-12">
|
|
||||||
<Label className="form-label" required>
|
|
||||||
Upload Bill{" "}
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<div
|
|
||||||
className="border border-secondary border-dashed rounded p-4 text-center bg-textMuted position-relative"
|
|
||||||
style={{ cursor: "pointer" }}
|
|
||||||
onClick={() => document.getElementById("attachments").click()}
|
|
||||||
>
|
|
||||||
<i className="bx bx-cloud-upload d-block bx-lg"> </i>
|
|
||||||
<span className="text-muted d-block">
|
|
||||||
Click to select or click here to browse
|
|
||||||
</span>
|
|
||||||
<small className="text-muted">(PDF, JPG, PNG, max 5MB)</small>
|
|
||||||
|
|
||||||
<input
|
|
||||||
type="file"
|
|
||||||
id="attachments"
|
|
||||||
accept=".pdf,.jpg,.jpeg,.png"
|
|
||||||
multiple
|
|
||||||
disabled={!invoiceAttachmentType}
|
|
||||||
style={{ display: "none" }}
|
|
||||||
{...register("attachments")}
|
|
||||||
onChange={(e) => {
|
|
||||||
onFileChange(e);
|
|
||||||
e.target.value = "";
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
{errors.attachments && (
|
|
||||||
<small className="danger-text">{errors.attachments.message}</small>
|
|
||||||
)}
|
|
||||||
{files.length > 0 && (
|
|
||||||
<Filelist
|
|
||||||
files={files}
|
|
||||||
removeFile={removeFile}
|
|
||||||
expenseToEdit={purchaseId}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{Array.isArray(errors.attachments) &&
|
|
||||||
errors.attachments.map((fileError, index) => (
|
|
||||||
<div key={index} className="danger-text small mt-1">
|
|
||||||
{
|
|
||||||
(fileError?.fileSize?.message ||
|
|
||||||
fileError?.contentType?.message ||
|
|
||||||
fileError?.base64Data?.message,
|
|
||||||
fileError?.documentId?.message)
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{!invoiceAttachmentType && (
|
|
||||||
<WarningBlock content={FILE_UPLOAD_INFO} />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PurchasePaymentDetails;
|
|
||||||
@ -1,188 +0,0 @@
|
|||||||
import { z } from "zod";
|
|
||||||
import { normalizeAllowedContentTypes } from "../../utils/appUtils";
|
|
||||||
|
|
||||||
const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
|
|
||||||
const ALLOWED_TYPES = [
|
|
||||||
"application/pdf",
|
|
||||||
"image/png",
|
|
||||||
"image/jpg",
|
|
||||||
"image/jpeg",
|
|
||||||
];
|
|
||||||
|
|
||||||
export const AttachmentSchema = z.object({
|
|
||||||
invoiceAttachmentTypeId: z.string().nullable(),
|
|
||||||
fileName: z.string().min(1, { message: "Filename is required" }),
|
|
||||||
base64Data: z.string().nullable(),
|
|
||||||
contentType: z
|
|
||||||
.string()
|
|
||||||
.refine((val) => ALLOWED_TYPES.includes(val), {
|
|
||||||
message: "Only PDF, PNG, JPG, or JPEG files are allowed",
|
|
||||||
}),
|
|
||||||
fileSize: z.number().max(MAX_FILE_SIZE, {
|
|
||||||
message: "File size must be less than or equal to 5MB",
|
|
||||||
}),
|
|
||||||
description: z.string().optional().default(""),
|
|
||||||
isActive: z.boolean().default(true),
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
export const PurchaseSchema = z.object({
|
|
||||||
title: z.string().min(1, { message: "Title is required" }),
|
|
||||||
projectId: z.string().min(1, { message: "Project is required" }),
|
|
||||||
organizationId: z.string().min(1, { message: "Organization is required" }),
|
|
||||||
billingAddress: z.string().min(1, { message: "Address is required" }),
|
|
||||||
shippingAddress: z.string().min(1, { message: "Address is required" }),
|
|
||||||
|
|
||||||
purchaseOrderNumber: z.string().nullable(),
|
|
||||||
purchaseOrderDate: z.coerce.date().nullable(),
|
|
||||||
|
|
||||||
supplierId: z.string().min(1, { message: "Supplier is required" }),
|
|
||||||
|
|
||||||
proformaInvoiceNumber: z.string().nullable(),
|
|
||||||
proformaInvoiceDate: z.coerce.date().nullable(),
|
|
||||||
proformaInvoiceAmount: z.coerce.number().optional(),
|
|
||||||
|
|
||||||
invoiceNumber: z.string().nullable(),
|
|
||||||
invoiceDate: z.coerce.date().nullable(),
|
|
||||||
eWayBillNumber: z.string().nullable(),
|
|
||||||
eWayBillDate: z.coerce.date().nullable(),
|
|
||||||
invoiceReferenceNumber: z.string().nullable(),
|
|
||||||
acknowledgmentDate: z.coerce.date().nullable(),
|
|
||||||
acknowledgmentNumber: z.string().nullable(),
|
|
||||||
|
|
||||||
baseAmount: z.number().min(1, { message: "Base amount is required" }),
|
|
||||||
taxAmount: z.number().min(1, { message: "Tax amount is required" }),
|
|
||||||
totalAmount: z.number().min(1, { message: "Total amount is required" }),
|
|
||||||
paymentDueDate: z.coerce.date().nullable(),
|
|
||||||
transportCharges: z.number().nullable(),
|
|
||||||
description: z.string().min(1, { message: "Description is required" }),
|
|
||||||
invoiceAttachmentTypeId:z.string().nullable(),
|
|
||||||
attachments: z
|
|
||||||
.array(AttachmentSchema)
|
|
||||||
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
export const defaultPurchaseValue = {
|
|
||||||
title: "",
|
|
||||||
projectId: "",
|
|
||||||
organizationId: "",
|
|
||||||
billingAddress: "",
|
|
||||||
shippingAddress: "",
|
|
||||||
purchaseOrderNumber: null,
|
|
||||||
purchaseOrderDate: null,
|
|
||||||
|
|
||||||
supplierId: "",
|
|
||||||
|
|
||||||
proformaInvoiceNumber: null,
|
|
||||||
proformaInvoiceDate: null,
|
|
||||||
proformaInvoiceAmount: 0,
|
|
||||||
|
|
||||||
invoiceNumber: null,
|
|
||||||
invoiceDate: null,
|
|
||||||
eWayBillNumber: null,
|
|
||||||
eWayBillDate: null,
|
|
||||||
invoiceReferenceNumber: null,
|
|
||||||
acknowledgmentNumber: null,
|
|
||||||
acknowledgmentDate: null,
|
|
||||||
|
|
||||||
baseAmount: 0,
|
|
||||||
taxAmount: 0,
|
|
||||||
totalAmount: 0,
|
|
||||||
paymentDueDate: null,
|
|
||||||
transportCharges: null,
|
|
||||||
description: "",
|
|
||||||
invoiceAttachmentTypeId:null,
|
|
||||||
attachments: [],
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getStepFields = (stepIndex) => {
|
|
||||||
const stepFieldMap = {
|
|
||||||
0: [
|
|
||||||
"title",
|
|
||||||
"projectId",
|
|
||||||
"organizationId",
|
|
||||||
"supplierId",
|
|
||||||
"billingAddress",
|
|
||||||
"shippingAddress",
|
|
||||||
"purchaseOrderNumber",
|
|
||||||
"purchaseOrderDate",
|
|
||||||
"proformaInvoiceNumber",
|
|
||||||
"proformaInvoiceDate",
|
|
||||||
"proformaInvoiceAmount",
|
|
||||||
],
|
|
||||||
1: [
|
|
||||||
"invoiceNumber",
|
|
||||||
"invoiceDate",
|
|
||||||
"eWayBillNumber",
|
|
||||||
"eWayBillDate",
|
|
||||||
"invoiceReferenceNumber",
|
|
||||||
"acknowledgmentNumber",
|
|
||||||
"acknowledgmentDate",
|
|
||||||
],
|
|
||||||
2: [
|
|
||||||
"baseAmount",
|
|
||||||
"taxAmount",
|
|
||||||
"totalAmount",
|
|
||||||
"transportCharges",
|
|
||||||
"paymentDueDate",
|
|
||||||
"invoiceAttachmentTypeId",
|
|
||||||
"description",
|
|
||||||
"attachments"
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
return stepFieldMap[stepIndex] || [];
|
|
||||||
};
|
|
||||||
|
|
||||||
export const SingleAttachmentSchema = z.object({
|
|
||||||
fileName: z.string().min(1, { message: "File name is required" }),
|
|
||||||
base64Data: z.string().min(1, { message: "File data is required" }),
|
|
||||||
invoiceAttachmentTypeId: z.string().nullable(),
|
|
||||||
|
|
||||||
contentType: z
|
|
||||||
.string()
|
|
||||||
.min(1, { message: "MIME type is required" })
|
|
||||||
.refine(
|
|
||||||
(val) =>
|
|
||||||
["application/pdf", "image/jpeg", "image/jpg", "image/png"].includes(
|
|
||||||
val
|
|
||||||
),
|
|
||||||
{
|
|
||||||
message: "File type must be PDF, JPG, JPEG or PNG",
|
|
||||||
}
|
|
||||||
),
|
|
||||||
|
|
||||||
fileSize: z
|
|
||||||
.number()
|
|
||||||
.int()
|
|
||||||
.nonnegative("fileSize must be ≥ 0")
|
|
||||||
.max(5 * 1024 * 1024, "File size must be ≤ 5MB"),
|
|
||||||
|
|
||||||
description: z.string().optional().default(""),
|
|
||||||
isActive: z.boolean(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const DeliveryChallanSchema = z.object({
|
|
||||||
deliveryChallanNumber: z
|
|
||||||
.string()
|
|
||||||
.min(1, { message: "Challan Number required" }),
|
|
||||||
invoiceAttachmentTypeId: z.string().nullable(),
|
|
||||||
deliveryChallanDate: z.string().min(1, { message: "Deliver date required" }),
|
|
||||||
description: z.string().min(1, { message: "Description required" }),
|
|
||||||
attachment: z.any().refine(
|
|
||||||
(val) => val && typeof val === "object" && !!val.base64Data,
|
|
||||||
{
|
|
||||||
message: "Please upload document",
|
|
||||||
}
|
|
||||||
),
|
|
||||||
});
|
|
||||||
|
|
||||||
export const DeliveryChallanDefaultValue = {
|
|
||||||
deliveryChallanNumber: "",
|
|
||||||
deliveryChallanDate: "",
|
|
||||||
description: "",
|
|
||||||
attachment: null,
|
|
||||||
invoiceAttachmentTypeId: null,
|
|
||||||
};
|
|
||||||
@ -1,131 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { useAppFormContext } from "../../hooks/appHooks/useAppForm";
|
|
||||||
import DatePicker from "../common/DatePicker";
|
|
||||||
import Label from "../common/Label";
|
|
||||||
|
|
||||||
const PurchaseTransportDetails = () => {
|
|
||||||
const {
|
|
||||||
register,control,
|
|
||||||
formState: { errors },
|
|
||||||
} = useAppFormContext();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="row g-3 text-start">
|
|
||||||
{/* Invoice Number */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="invoiceNumber" required>
|
|
||||||
Invoice Number
|
|
||||||
</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="invoiceNumber"
|
|
||||||
type="text"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("invoiceNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.invoiceNumber && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.invoiceNumber.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Invoice Date */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="invoiceDate">Invoice Date</Label>
|
|
||||||
|
|
||||||
|
|
||||||
<DatePicker control={control} name="invoiceDate" className="w-full" size="xs"/>
|
|
||||||
|
|
||||||
{errors?.invoiceDate && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.invoiceDate.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* E-Way Bill Number */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="eWayBillNumber">E-Way Bill Number</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="eWayBillNumber"
|
|
||||||
type="text"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("eWayBillNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.eWayBillNumber && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.eWayBillNumber.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* E-Way Bill Date */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="eWayBillDate">E-Way Bill Date</Label>
|
|
||||||
|
|
||||||
|
|
||||||
<DatePicker control={control} name="eWayBillDate" className="w-full"/>
|
|
||||||
|
|
||||||
{errors?.eWayBillDate && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.eWayBillDate.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Invoice Reference Number */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="invoiceReferenceNumber">Invoice Reference Number</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="invoiceReferenceNumber"
|
|
||||||
type="text"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("invoiceReferenceNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.invoiceReferenceNumber && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.invoiceReferenceNumber.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Acknowledgment Number */}
|
|
||||||
<div className="col-12 col-md-6">
|
|
||||||
<Label htmlFor="acknowledgmentNumber">Acknowledgment Number</Label>
|
|
||||||
|
|
||||||
<input
|
|
||||||
id="acknowledgmentNumber"
|
|
||||||
type="text"
|
|
||||||
className="form-control form-control-xs"
|
|
||||||
{...register("acknowledgmentNumber")}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{errors?.acknowledgmentNumber && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.acknowledgmentNumber.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 col-md-6 mb-2">
|
|
||||||
<Label htmlFor="acknowledgmentDate">Acknowledgment Date</Label>
|
|
||||||
|
|
||||||
<DatePicker control={control} name="acknowledgmentDate" className="w-full" size="xs"/>
|
|
||||||
|
|
||||||
{errors?.acknowledgmentDate && (
|
|
||||||
<div className="small text-danger mt-1">
|
|
||||||
{errors.acknowledgmentDate.message}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PurchaseTransportDetails;
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
import { formatFigure, getColorNameFromHex } from "../../utils/appUtils";
|
|
||||||
|
|
||||||
export const PurchaseColumn = [
|
|
||||||
{
|
|
||||||
key: "purchaseInvoiceUId",
|
|
||||||
label: "Invoice Id",
|
|
||||||
|
|
||||||
className: "text-start",
|
|
||||||
render: (item) => (
|
|
||||||
<div className="d-flex justify-content-start align-items-center p-1">
|
|
||||||
<span className="fw-normal">{item?.purchaseInvoiceUId || "NA"}</span>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "title",
|
|
||||||
label: "Title",
|
|
||||||
|
|
||||||
className: "text-start",
|
|
||||||
render: (item) => (
|
|
||||||
<div className="d-flex justify-content-start align-items-center">
|
|
||||||
<span className="fw-normal">{item?.title || "NA"}</span>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "project",
|
|
||||||
label: "Project",
|
|
||||||
className: "text-start ",
|
|
||||||
render: (item) => <span>{item?.project?.name || "NA"}</span>,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "supplier",
|
|
||||||
label: "Supplier",
|
|
||||||
className: "text-start ",
|
|
||||||
render: (item) => <span>{item?.supplier?.name || "NA"}</span>,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "status",
|
|
||||||
label: "Status",
|
|
||||||
className: "text-start",
|
|
||||||
render: (item) => {
|
|
||||||
let color = getColorNameFromHex(item.status?.color);
|
|
||||||
return (
|
|
||||||
<span className={`badge rounded-pill bg-label-${color}`}>
|
|
||||||
<span className={`badge badge-dot bg-${color} me-1`}></span>
|
|
||||||
{item?.status.displayName || "NA"}
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "totalAmount",
|
|
||||||
label: "Total Amount",
|
|
||||||
className: "text-end",
|
|
||||||
render: (item) => (
|
|
||||||
<span>{formatFigure(item?.totalAmount, { type: "currency" })}</span>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
@ -1,243 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { usePurchase } from "../../hooks/usePurchase";
|
|
||||||
import { SpinnerLoader } from "../common/Loader";
|
|
||||||
import { formatUTCToLocalTime } from "../../utils/dateUtils";
|
|
||||||
import { getColorNameFromHex } from "../../utils/appUtils";
|
|
||||||
|
|
||||||
const ViewPurchase = ({ purchaseId }) => {
|
|
||||||
const { data, isLoading, isError, error } = usePurchase(purchaseId);
|
|
||||||
|
|
||||||
if (isLoading) return <SpinnerLoader />;
|
|
||||||
if (isError) return <Error error={error} />;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="row g-3 px-3">
|
|
||||||
<div className="col-12 mb-1">
|
|
||||||
<h5 className="fw-semibold m-0">Purchase Invoice Details</h5>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 text-start">
|
|
||||||
<div className="row">
|
|
||||||
<div className="fs-6 col-md-10 d-flex align-items-center fw-semibold">
|
|
||||||
<p className="mb-0 me-1">Purchase No:</p>
|
|
||||||
<p className="mb-0">{data?.purchaseInvoiceUId}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-md-2 d-flex align-items-center">
|
|
||||||
<p className="fw-light me-2 mb-0"></p>
|
|
||||||
<span className={`badge rounded-pill bg-label-${getColorNameFromHex(data?.status?.color)}`}>
|
|
||||||
{data?.status?.displayName || "NA"}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 text-start border-bottom">
|
|
||||||
<div className=" ">
|
|
||||||
<p className="fw-semibold mb-3">Purchase Details</p>
|
|
||||||
<div className="row mb-3">
|
|
||||||
<div className="col-md-6">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-captions bx-sm me-1'></i>Title:</p>
|
|
||||||
<p className="fw-light mb-1">{data?.title}</p>
|
|
||||||
</div>
|
|
||||||
<div className="col-md-6">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-comment-detail bx-sm me-1'></i>Description:</p>
|
|
||||||
<p className="fw-light mb-1 ">{data?.description}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-12 border-bottom">
|
|
||||||
<div className="text-start h-auto fw-semibold">
|
|
||||||
<p className="text-muted mb-2">Project</p>
|
|
||||||
</div>
|
|
||||||
<div className="row text-start h-auto">
|
|
||||||
{/* Project Name */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-captions bx-sm me-1'></i>Project Name:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.project?.name}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Organization Name */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bxs-component bx-sm me-1'></i>Organization:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.organization?.name}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Email */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-envelope me-1 bx-sm'></i>Email:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.organization?.email}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Contact Number */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bxs-contact bx-sm me-1' ></i>Contact:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.organization?.contactNumber}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Address */}
|
|
||||||
<div className="col-12 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-message-square-detail bx-sm me-1'></i>Address:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.organization?.address}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div className="col-12 border-bottom">
|
|
||||||
<div className="row text-start h-auto">
|
|
||||||
<p className="text-muted mb-2 fw-semibold">Supplier</p>
|
|
||||||
|
|
||||||
{/* Supplier Name */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-captions bx-sm me-1'></i>Name:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.supplier?.name}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Contact Person */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-support bx-sm me-1'></i>Contact Person:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.supplier?.contactPerson}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Email */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-envelope me-1 bx-sm'></i>Email:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.supplier?.email}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Contact Number */}
|
|
||||||
<div className="col-12 col-md-4 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bxs-contact bx-sm me-1' ></i>Contact:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.supplier?.contactNumber}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Address */}
|
|
||||||
<div className="col-12 mb-3">
|
|
||||||
<p className="text-secondary mb-0"><i class='bx bx-message-square-detail bx-sm me-1'></i>Address:</p>
|
|
||||||
<p className="fw-light mb-0">{data?.supplier?.address}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-md-6">
|
|
||||||
<div className="text-start h-auto">
|
|
||||||
<p className="text-muted mb-2 fw-semibold">Invoice Details</p>
|
|
||||||
|
|
||||||
<div className="row g-3">
|
|
||||||
{/* Left column */}
|
|
||||||
<div className="col-12 col-sm-6">
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">Invoice No:</p>
|
|
||||||
<p className="fw-light mb-1">{data?.invoiceNumber}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">Proforma No:</p>
|
|
||||||
<p className="fw-light mb-1">{data?.proformaInvoiceNumber}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">E-Way Bill:</p>
|
|
||||||
<p className="fw-light mb-1">{data?.eWayBillNumber}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">PO No:</p>
|
|
||||||
<p className="fw-light mb-1">{data?.purchaseOrderNumber}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Right column */}
|
|
||||||
<div className="col-12 col-sm-6">
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0 ">Invoice Date:</p>
|
|
||||||
<p className="fw-light mb-1">
|
|
||||||
{formatUTCToLocalTime(data?.invoiceDate)}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">Proforma Date:</p>
|
|
||||||
<p className="fw-light mb-1">
|
|
||||||
{formatUTCToLocalTime(data?.proformaInvoiceDate)}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">E-Way Date:</p>
|
|
||||||
<p className="fw-light mb-1">
|
|
||||||
{formatUTCToLocalTime(data?.eWayBillDate)}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<p className="text-secondary mb-0">PO Date:</p>
|
|
||||||
<p className="fw-light">
|
|
||||||
{formatUTCToLocalTime(data?.purchaseOrderDate)}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-md-6">
|
|
||||||
<div className="text-start h-auto">
|
|
||||||
<p className="text-muted mb-2 fw-semibold">Amount Summary</p>
|
|
||||||
|
|
||||||
<div className="d-flex justify-content-between">
|
|
||||||
<p className="text-secondary mb-0">Base Amount</p>
|
|
||||||
<p className="fw-light mb-1">₹ {data?.baseAmount}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="d-flex justify-content-between">
|
|
||||||
<p className="text-secondary mb-0">Tax</p>
|
|
||||||
<p className="fw-light mb-1">₹ {data?.taxAmount}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="d-flex justify-content-between">
|
|
||||||
<p className="text-secondary mb-0">Transport</p>
|
|
||||||
<p className="fw-light mb-1">₹ {data?.transportCharges}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr className="my-2" />
|
|
||||||
|
|
||||||
<div className="d-flex justify-content-between fs-6 fs-medium">
|
|
||||||
<span>Total</span>
|
|
||||||
<span>₹ {data?.totalAmount}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="mt-2">
|
|
||||||
<p className="text-secondary mb-0">Due Date:</p>
|
|
||||||
<p className="fw-light mb-0">
|
|
||||||
{formatUTCToLocalTime(data?.paymentDueDate)}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="row mt-3 text-start">
|
|
||||||
<div className="col-md-6 mb-3 ms-n2">
|
|
||||||
<div className="h-100">
|
|
||||||
<p className="text-secondary mb-0">Billing Address</p>
|
|
||||||
|
|
||||||
<p className="mb-0 fw-light">{data?.billingAddress || "-"}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="col-md-6 mb-3 text-start">
|
|
||||||
<div className="h-100">
|
|
||||||
<p className="text-secondary mb-0">Shipping Address</p>
|
|
||||||
<p className="mb-0 fw-light">{data?.shippingAddress || "-"}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ViewPurchase;
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
import { useForm, Controller, FormProvider, useFormContext } from "react-hook-form";
|
import { useForm, Controller,FormProvider } from "react-hook-form";
|
||||||
|
|
||||||
export const useAppForm = (config) => useForm(config);
|
export const useAppForm = (config) => useForm(config);
|
||||||
export const AppFormProvider = FormProvider;
|
export const AppFormProvider = FormProvider;
|
||||||
export const AppFormController = Controller;
|
export const AppFormController = Controller;
|
||||||
export const useAppFormContext = useFormContext;
|
|
||||||
|
|||||||
@ -10,25 +10,16 @@ import {
|
|||||||
} from "@tanstack/react-query";
|
} from "@tanstack/react-query";
|
||||||
import showToast from "../../services/toastService";
|
import showToast from "../../services/toastService";
|
||||||
|
|
||||||
export const useInvoiceAttachmentTypes = () => {
|
|
||||||
return useQuery({
|
|
||||||
queryKey: ["invoiceAttachmentType"],
|
|
||||||
queryFn: async () => {
|
|
||||||
const resp = await MasterRespository.getInvoiceAttachmentTypes();
|
|
||||||
return resp.data;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useRecurringStatus = () => {
|
export const useRecurringStatus = ()=>{
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["RecurringStatus"],
|
queryKey:["RecurringStatus"],
|
||||||
queryFn: async () => {
|
queryFn:async()=>{
|
||||||
const resp = await MasterRespository.getRecurringStatus();
|
const resp = await MasterRespository.getRecurringStatus();
|
||||||
return resp.data;
|
return resp.data
|
||||||
},
|
}
|
||||||
});
|
})
|
||||||
};
|
}
|
||||||
export const useCurrencies = () => {
|
export const useCurrencies = () => {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["currencies"],
|
queryKey: ["currencies"],
|
||||||
@ -40,10 +31,10 @@ export const useCurrencies = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const usePaymentAjustmentHead = (isActive) => {
|
export const usePaymentAjustmentHead = (isActive) => {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["paymentType", isActive],
|
queryKey: ["paymentType",isActive],
|
||||||
queryFn: async () =>
|
queryFn: async () => await MasterRespository.getPaymentAdjustmentHead(isActive),
|
||||||
await MasterRespository.getPaymentAdjustmentHead(isActive),
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -305,26 +296,26 @@ export const useOrganizationType = () => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useJobStatus = (statusId, projectId) => {
|
export const useJobStatus=(statusId,projectId)=>{
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["Job_Staus", statusId, projectId],
|
queryKey:["Job_Staus",statusId,projectId],
|
||||||
queryFn: async () => {
|
queryFn:async()=>{
|
||||||
const resp = await MasterRespository.getJobStatus(statusId, projectId);
|
const resp = await MasterRespository.getJobStatus(statusId,projectId);
|
||||||
return resp.data;
|
return resp.data;
|
||||||
},
|
},
|
||||||
enabled: !!statusId && !!projectId,
|
enabled:!!statusId && !!projectId
|
||||||
});
|
})
|
||||||
};
|
}
|
||||||
|
|
||||||
export const useTeamRole = () => {
|
export const useTeamRole=()=>{
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["Team_Role"],
|
queryKey:["Team_Role"],
|
||||||
queryFn: async () => {
|
queryFn:async()=>{
|
||||||
const resp = await MasterRespository.getTeamRole();
|
const resp = await MasterRespository.getTeamRole();
|
||||||
return resp.data;
|
return resp.data;
|
||||||
},
|
}
|
||||||
});
|
})
|
||||||
};
|
}
|
||||||
//#region ==Get Masters==
|
//#region ==Get Masters==
|
||||||
const fetchMasterData = async (masterType) => {
|
const fetchMasterData = async (masterType) => {
|
||||||
switch (masterType) {
|
switch (masterType) {
|
||||||
@ -414,6 +405,8 @@ const useMaster = () => {
|
|||||||
export default useMaster;
|
export default useMaster;
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// ================================Mutation====================================
|
// ================================Mutation====================================
|
||||||
|
|
||||||
//#region Job Role
|
//#region Job Role
|
||||||
@ -463,6 +456,10 @@ export const useCreateJobRole = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion Job Role
|
//#endregion Job Role
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Application Role
|
//#region Application Role
|
||||||
export const useCreateApplicationRole = (onSuccessCallback) => {
|
export const useCreateApplicationRole = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -508,6 +505,10 @@ export const useUpdateApplicationRole = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Create work Category
|
//#region Create work Category
|
||||||
export const useCreateWorkCategory = (onSuccessCallback) => {
|
export const useCreateWorkCategory = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -553,6 +554,11 @@ export const useUpdateWorkCategory = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Contact Category
|
//#region Contact Category
|
||||||
|
|
||||||
export const useCreateContactCategory = (onSuccessCallback) => {
|
export const useCreateContactCategory = (onSuccessCallback) => {
|
||||||
@ -603,6 +609,10 @@ export const useUpdateContactCategory = (onSuccessCallback) => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Contact Tag
|
//#region Contact Tag
|
||||||
|
|
||||||
export const useCreateContactTag = (onSuccessCallback) => {
|
export const useCreateContactTag = (onSuccessCallback) => {
|
||||||
@ -649,6 +659,10 @@ export const useUpdateContactTag = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Expense Category
|
//#region Expense Category
|
||||||
export const useCreateExpenseCategory = (onSuccessCallback) => {
|
export const useCreateExpenseCategory = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -675,10 +689,7 @@ export const useUpdateExpenseCategory = (onSuccessCallback) => {
|
|||||||
|
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: async ({ id, payload }) => {
|
mutationFn: async ({ id, payload }) => {
|
||||||
const response = await MasterRespository.updateExpenseCategory(
|
const response = await MasterRespository.updateExpenseCategory(id, payload);
|
||||||
id,
|
|
||||||
payload
|
|
||||||
);
|
|
||||||
return response.data;
|
return response.data;
|
||||||
},
|
},
|
||||||
onSuccess: (data, variables) => {
|
onSuccess: (data, variables) => {
|
||||||
@ -697,6 +708,11 @@ export const useUpdateExpenseCategory = (onSuccessCallback) => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Payment Mode
|
//#region Payment Mode
|
||||||
|
|
||||||
export const useCreatePaymentMode = (onSuccessCallback) => {
|
export const useCreatePaymentMode = (onSuccessCallback) => {
|
||||||
@ -743,6 +759,10 @@ export const useUpdatePaymentMode = (onSuccessCallback) => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Services-------------------------------
|
// Services-------------------------------
|
||||||
|
|
||||||
// export const useCreateService = (onSuccessCallback) => {
|
// export const useCreateService = (onSuccessCallback) => {
|
||||||
@ -824,6 +844,10 @@ export const useUpdateService = (onSuccessCallback) => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Activity Grouph
|
//#region Activity Grouph
|
||||||
|
|
||||||
export const useCreateActivityGroup = (onSuccessCallback) => {
|
export const useCreateActivityGroup = (onSuccessCallback) => {
|
||||||
@ -888,6 +912,10 @@ export const useUpdateActivityGroup = (onSuccessCallback) => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Activities
|
//#region Activities
|
||||||
export const useCreateActivity = (onSuccessCallback) => {
|
export const useCreateActivity = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -942,6 +970,11 @@ export const useUpdateActivity = (onSuccessCallback) => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Expense Status
|
//#region Expense Status
|
||||||
export const useCreateExpenseStatus = (onSuccessCallback) => {
|
export const useCreateExpenseStatus = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -985,6 +1018,10 @@ export const useUpdateExpenseStatus = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Document-Category
|
//#region Document-Category
|
||||||
export const useCreateDocumentCatgory = (onSuccessCallback) => {
|
export const useCreateDocumentCatgory = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -1031,6 +1068,11 @@ export const useUpdateDocumentCategory = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Document-Type
|
//#region Document-Type
|
||||||
export const useCreateDocumentType = (onSuccessCallback) => {
|
export const useCreateDocumentType = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -1075,6 +1117,10 @@ export const useUpdateDocumentType = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region Payment Adjustment Head
|
//#region Payment Adjustment Head
|
||||||
export const useCreatePaymentAjustmentHead = (onSuccessCallback) => {
|
export const useCreatePaymentAjustmentHead = (onSuccessCallback) => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -1101,10 +1147,7 @@ export const useUpdatePaymentAjustmentHead = (onSuccessCallback) => {
|
|||||||
|
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: async ({ id, payload }) => {
|
mutationFn: async ({ id, payload }) => {
|
||||||
const resp = await MasterRespository.updatePaymentAjustmentHead(
|
const resp = await MasterRespository.updatePaymentAjustmentHead(id, payload);
|
||||||
id,
|
|
||||||
payload
|
|
||||||
);
|
|
||||||
return resp.data;
|
return resp.data;
|
||||||
},
|
},
|
||||||
onSuccess: (data) => {
|
onSuccess: (data) => {
|
||||||
@ -1121,6 +1164,10 @@ export const useUpdatePaymentAjustmentHead = (onSuccessCallback) => {
|
|||||||
};
|
};
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region ==Delete Master==
|
//#region ==Delete Master==
|
||||||
export const useDeleteMasterItem = () => {
|
export const useDeleteMasterItem = () => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
@ -1156,6 +1203,8 @@ export const useDeleteMasterItem = () => {
|
|||||||
|
|
||||||
//#endregion
|
//#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export const useDeleteServiceGroup = () => {
|
export const useDeleteServiceGroup = () => {
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
|||||||
@ -24,9 +24,7 @@ export const useOrganizationModal = () => {
|
|||||||
dispatch(
|
dispatch(
|
||||||
openOrgModal({
|
openOrgModal({
|
||||||
isOpen: true,
|
isOpen: true,
|
||||||
orgData: options.hasOwnProperty("orgData")
|
orgData: options.hasOwnProperty("orgData") ? options.orgData : orgData,
|
||||||
? options.orgData
|
|
||||||
: orgData,
|
|
||||||
startStep: options.startStep ?? startStep ?? 1,
|
startStep: options.startStep ?? startStep ?? 1,
|
||||||
prevStep: options.prevStep ?? prevStep ?? 1,
|
prevStep: options.prevStep ?? prevStep ?? 1,
|
||||||
flowType: options.flowType ?? flowType ?? "default",
|
flowType: options.flowType ?? flowType ?? "default",
|
||||||
@ -39,30 +37,16 @@ export const useOrganizationModal = () => {
|
|||||||
|
|
||||||
// ================================Query=============================================================
|
// ================================Query=============================================================
|
||||||
|
|
||||||
export const useGlobaleOrganizations = (pageSize, pageNumber,id, searchString) => {
|
export const useOrganization=(id)=>{
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["global_organization",pageSize, pageNumber,id, searchString],
|
queryKey:["organization",id],
|
||||||
queryFn: async () => {
|
queryFn:async()=> {
|
||||||
const resp = await OrganizationRepository.getGlobalOrganization(
|
const resp = await await OrganizationRepository.getOrganizaion(id);
|
||||||
pageSize,
|
return resp.data
|
||||||
pageNumber,id,
|
},
|
||||||
searchString
|
enabled:!!id
|
||||||
);
|
})
|
||||||
return resp.data;
|
}
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useOrganization = (id) => {
|
|
||||||
return useQuery({
|
|
||||||
queryKey: ["organization", id],
|
|
||||||
queryFn: async () => {
|
|
||||||
const resp = await await OrganizationRepository.getOrganizaion(id);
|
|
||||||
return resp.data;
|
|
||||||
},
|
|
||||||
enabled: !!id,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
export const useOrganizationBySPRID = (sprid) => {
|
export const useOrganizationBySPRID = (sprid) => {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ["organization by", sprid],
|
queryKey: ["organization by", sprid],
|
||||||
@ -117,7 +101,7 @@ export const useOrganizationEmployees = (
|
|||||||
organizationId,
|
organizationId,
|
||||||
searchString
|
searchString
|
||||||
),
|
),
|
||||||
enabled: !!projectId,
|
enabled: !!projectId ,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -154,10 +138,10 @@ export const useAssignOrgToProject = (onSuccessCallback) => {
|
|||||||
useClient.invalidateQueries({
|
useClient.invalidateQueries({
|
||||||
queryKey: ["projectAssignedOrganiztions"],
|
queryKey: ["projectAssignedOrganiztions"],
|
||||||
});
|
});
|
||||||
useClient.invalidateQueries({
|
useClient.invalidateQueries({
|
||||||
queryKey: ["projectAssignedOrganiztionsName"],
|
queryKey: ["projectAssignedOrganiztionsName"],
|
||||||
});
|
});
|
||||||
|
|
||||||
useClient.invalidateQueries({
|
useClient.invalidateQueries({
|
||||||
queryKey: ["projectAssignedServices", projectId],
|
queryKey: ["projectAssignedServices", projectId],
|
||||||
});
|
});
|
||||||
@ -197,14 +181,12 @@ export const useAssignOrgToTenant = (onSuccessCallback) => {
|
|||||||
export const useUpdateOrganization = (onSuccessCallback) => {
|
export const useUpdateOrganization = (onSuccessCallback) => {
|
||||||
const useClient = useQueryClient();
|
const useClient = useQueryClient();
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: async ({ orgId, payload }) =>
|
mutationFn: async ({orgId,payload}) =>
|
||||||
await OrganizationRepository.updateOrganizaion(orgId, payload),
|
await OrganizationRepository.updateOrganizaion(orgId,payload),
|
||||||
onSuccess: (_, variables) => {
|
onSuccess: (_, variables) => {
|
||||||
useClient.invalidateQueries({ queryKey: ["organizationList"] });
|
useClient.invalidateQueries({ queryKey: ["organizationList"] });
|
||||||
useClient.invalidateQueries({
|
useClient.invalidateQueries({ queryKey: ["projectAssignedOrganiztionsName"] });
|
||||||
queryKey: ["projectAssignedOrganiztionsName"],
|
|
||||||
});
|
|
||||||
|
|
||||||
showToast("Organization Updated successfully", "success");
|
showToast("Organization Updated successfully", "success");
|
||||||
if (onSuccessCallback) onSuccessCallback();
|
if (onSuccessCallback) onSuccessCallback();
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,122 +0,0 @@
|
|||||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
||||||
import { PurchaseRepository } from "../repositories/PurchaseRepository";
|
|
||||||
import showToast from "../services/toastService";
|
|
||||||
|
|
||||||
export const usePurchasesList = (
|
|
||||||
pageSize,
|
|
||||||
pageNumber,
|
|
||||||
isActive,
|
|
||||||
filter,
|
|
||||||
searchString
|
|
||||||
) => {
|
|
||||||
return useQuery({
|
|
||||||
queryKey: [
|
|
||||||
"purchase_list",
|
|
||||||
pageSize,
|
|
||||||
pageNumber,
|
|
||||||
isActive,
|
|
||||||
filter,
|
|
||||||
searchString,
|
|
||||||
],
|
|
||||||
queryFn: async () => {
|
|
||||||
const resp = await PurchaseRepository.GetPurchaseList(
|
|
||||||
pageSize,
|
|
||||||
pageNumber,
|
|
||||||
isActive,
|
|
||||||
filter,
|
|
||||||
searchString
|
|
||||||
);
|
|
||||||
return resp.data;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useDeliverChallane = (purchaseInvoiceId) => {
|
|
||||||
return useQuery({
|
|
||||||
queryKey: ["deliverliy_challane", purchaseInvoiceId],
|
|
||||||
queryFn: async () => {
|
|
||||||
const resp = await PurchaseRepository.GetDeliveryChallan(
|
|
||||||
purchaseInvoiceId
|
|
||||||
);
|
|
||||||
return resp.data;
|
|
||||||
},
|
|
||||||
enabled: !!purchaseInvoiceId,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const usePurchase = (id) => {
|
|
||||||
return useQuery({
|
|
||||||
queryKey: ["purchase", id],
|
|
||||||
queryFn: async () => {
|
|
||||||
const resp = await PurchaseRepository.GetPurchase(id);
|
|
||||||
return resp.data;
|
|
||||||
},
|
|
||||||
enabled: !!id,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useCreatePurchaseInvoice = (onSuccessCallback) => {
|
|
||||||
const queryClient = useQueryClient();
|
|
||||||
|
|
||||||
return useMutation({
|
|
||||||
mutationFn: async (payload) =>
|
|
||||||
await PurchaseRepository.CreatePurchase(payload),
|
|
||||||
onSuccess: (data, variables) => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["purchase_list"] });
|
|
||||||
showToast("Purchase Invoice Created successfully", "success");
|
|
||||||
if (onSuccessCallback) onSuccessCallback();
|
|
||||||
},
|
|
||||||
onError: (error) => {
|
|
||||||
showToast(
|
|
||||||
error?.response?.data?.message ||
|
|
||||||
error.message ||
|
|
||||||
"Failed to create invoice",
|
|
||||||
"error"
|
|
||||||
);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const useUpdatePurchaseInvoice = (onSuccessCallback) => {
|
|
||||||
const queryClient = useQueryClient();
|
|
||||||
|
|
||||||
return useMutation({
|
|
||||||
mutationFn: async ({ purchaseId, payload }) =>
|
|
||||||
PurchaseRepository.UpdatePurchase(purchaseId, payload),
|
|
||||||
onSuccess: (data, variables) => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["purchase_list"] });
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["purchase"] });
|
|
||||||
showToast("Purchase Invoice Updated successfully", "success");
|
|
||||||
if (onSuccessCallback) onSuccessCallback();
|
|
||||||
},
|
|
||||||
onError: (error) => {
|
|
||||||
showToast(
|
|
||||||
error?.response?.data?.message ||
|
|
||||||
error.message ||
|
|
||||||
"Failed to create invoice",
|
|
||||||
"error"
|
|
||||||
);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
export const useAddDeliverChallan = (onSuccessCallback) => {
|
|
||||||
const queryClient = useQueryClient();
|
|
||||||
|
|
||||||
return useMutation({
|
|
||||||
mutationFn: async (payload) =>
|
|
||||||
PurchaseRepository.addDelievryChallan(payload),
|
|
||||||
onSuccess: (data, variables) => {
|
|
||||||
queryClient.invalidateQueries({ queryKey: ["deliverliy_challane"] });
|
|
||||||
showToast("Challan added successfully", "success");
|
|
||||||
if (onSuccessCallback) onSuccessCallback();
|
|
||||||
},
|
|
||||||
onError: (error) => {
|
|
||||||
showToast(
|
|
||||||
error?.response?.data?.message ||
|
|
||||||
error.message ||
|
|
||||||
"Failed to create invoice",
|
|
||||||
"error"
|
|
||||||
);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@ -62,7 +62,7 @@ const ExpensePage = () => {
|
|||||||
|
|
||||||
const [ViewDocument, setDocumentView] = useState({
|
const [ViewDocument, setDocumentView] = useState({
|
||||||
IsOpen: false,
|
IsOpen: false,
|
||||||
Images: null,
|
Image: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
const IsCreatedAble = useHasUserPermission(CREATE_EXEPENSE);
|
const IsCreatedAble = useHasUserPermission(CREATE_EXEPENSE);
|
||||||
@ -208,10 +208,10 @@ const ExpensePage = () => {
|
|||||||
<GlobalModel
|
<GlobalModel
|
||||||
isOpen
|
isOpen
|
||||||
size="md"
|
size="md"
|
||||||
key={ViewDocument.Images ?? "doc"}
|
key={ViewDocument.Image ?? "doc"}
|
||||||
closeModal={() => setDocumentView({ IsOpen: false, Images: null })}
|
closeModal={() => setDocumentView({ IsOpen: false, Image: null })}
|
||||||
>
|
>
|
||||||
<PreviewDocument files={ViewDocument.Images} />
|
<PreviewDocument imageUrl={ViewDocument.Image} />
|
||||||
</GlobalModel>
|
</GlobalModel>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -24,9 +24,6 @@ import { useProjectAccess } from "../../hooks/useProjectAccess";
|
|||||||
|
|
||||||
import "./ProjectDetails.css";
|
import "./ProjectDetails.css";
|
||||||
import ProjectOrganizations from "../../components/Project/ProjectOrganizations";
|
import ProjectOrganizations from "../../components/Project/ProjectOrganizations";
|
||||||
import ProjectStatistics from "../../components/Project/ProjectStatistics";
|
|
||||||
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
|
|
||||||
import { REGULARIZE_ATTENDANCE, SELF_ATTENDANCE, TEAM_ATTENDANCE } from "../../utils/constants";
|
|
||||||
|
|
||||||
const ProjectDetails = () => {
|
const ProjectDetails = () => {
|
||||||
const projectId = useSelectedProject();
|
const projectId = useSelectedProject();
|
||||||
@ -37,10 +34,6 @@ const ProjectDetails = () => {
|
|||||||
useProjectDetails(projectId);
|
useProjectDetails(projectId);
|
||||||
|
|
||||||
const { canView, loading: permsLoading } = useProjectAccess(projectId);
|
const { canView, loading: permsLoading } = useProjectAccess(projectId);
|
||||||
const canRegularize = useHasUserPermission(REGULARIZE_ATTENDANCE);
|
|
||||||
const canTeamAttendance = useHasUserPermission(TEAM_ATTENDANCE);
|
|
||||||
const canSelfAttendance = useHasUserPermission(SELF_ATTENDANCE);
|
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!projectId && projectNames.length > 0) {
|
if (!projectId && projectNames.length > 0) {
|
||||||
@ -89,16 +82,13 @@ const ProjectDetails = () => {
|
|||||||
<div className="row">
|
<div className="row">
|
||||||
<div className="col-lg-4 col-md-5 mt-2">
|
<div className="col-lg-4 col-md-5 mt-2">
|
||||||
<AboutProject />
|
<AboutProject />
|
||||||
<div className="card"><ProjectStatistics project={projectId} /></div>
|
<ProjectOverview project={projectId} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-lg-8 col-md-7 mt-2">
|
<div className="col-lg-8 col-md-7 mt-2">
|
||||||
<ProjectProgressChart ShowAllProject="false" DefaultRange="1M" />
|
<ProjectProgressChart ShowAllProject="false" DefaultRange="1M" />
|
||||||
{(canRegularize || canTeamAttendance || canSelfAttendance) && (
|
<div className="mt-5">
|
||||||
<div className="mt-5">
|
<AttendanceOverview />
|
||||||
<AttendanceOverview />
|
</div>
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,133 +0,0 @@
|
|||||||
import React, { createContext, useContext, useState } from "react";
|
|
||||||
import Breadcrumb from "../../components/common/Breadcrumb";
|
|
||||||
import showToast from "../../services/toastService";
|
|
||||||
import GlobalModel from "../../components/common/GlobalModel";
|
|
||||||
import ManagePurchase from "../../components/purchase/ManagePurchase";
|
|
||||||
import PurchaseList from "../../components/purchase/PurchaseList";
|
|
||||||
import ViewPurchase from "../../components/purchase/ViewPurchase";
|
|
||||||
import DeliveryChallane from "../../components/purchase/DeliveryChallane";
|
|
||||||
|
|
||||||
export const PurchaseContext = createContext();
|
|
||||||
export const usePurchaseContext = () => {
|
|
||||||
let context = useContext(PurchaseContext);
|
|
||||||
|
|
||||||
if (!context) {
|
|
||||||
showToast("Please use Innne cntext", "warning");
|
|
||||||
window.location = "/dashboard";
|
|
||||||
}
|
|
||||||
return context;
|
|
||||||
};
|
|
||||||
const PurchasePage = () => {
|
|
||||||
const [searchText, setSearchText] = useState("");
|
|
||||||
const [addChallan, setChallan] = useState({
|
|
||||||
isOpen: false,
|
|
||||||
purchaseId: null,
|
|
||||||
});
|
|
||||||
const [managePurchase, setManagePurchase] = useState({
|
|
||||||
isOpen: false,
|
|
||||||
purchaseId: null,
|
|
||||||
});
|
|
||||||
const [viewPurchaseState, setViewPurchase] = useState({
|
|
||||||
isOpen: false,
|
|
||||||
purchaseId: null,
|
|
||||||
});
|
|
||||||
|
|
||||||
const contextValue = {
|
|
||||||
setViewPurchase,
|
|
||||||
setManagePurchase,
|
|
||||||
setChallan,
|
|
||||||
};
|
|
||||||
return (
|
|
||||||
<PurchaseContext.Provider value={contextValue}>
|
|
||||||
<div className="container-fluid">
|
|
||||||
<Breadcrumb
|
|
||||||
data={[
|
|
||||||
{ label: "Home", link: "/dashboard" },
|
|
||||||
{ label: "Procurement & Inventory", link: "/purchase-invoice" },
|
|
||||||
{ label: "Purchase" },
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
<div className="card px-sm-4 my-3">
|
|
||||||
<div className="row p-2">
|
|
||||||
<div className="col-12 col-sm-6 text-start">
|
|
||||||
{" "}
|
|
||||||
<label className="mb-0">
|
|
||||||
<input
|
|
||||||
type="search"
|
|
||||||
value={searchText}
|
|
||||||
onChange={(e) => setSearchText(e.target.value)}
|
|
||||||
className="form-control form-control-sm"
|
|
||||||
placeholder="Search Purchase"
|
|
||||||
aria-controls="DataTables_Table_0"
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<di className="col-sm-6 text-end">
|
|
||||||
<button
|
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
onClick={() =>
|
|
||||||
setManagePurchase({
|
|
||||||
isOpen: true,
|
|
||||||
purchaseId: null,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<i className="bx bx-plus-circle me-2"></i>Add
|
|
||||||
</button>
|
|
||||||
</di>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<PurchaseList searchString={searchText} />
|
|
||||||
{managePurchase.isOpen && (
|
|
||||||
<GlobalModel
|
|
||||||
isOpen={managePurchase.isOpen}
|
|
||||||
size="lg"
|
|
||||||
closeModal={() =>
|
|
||||||
setManagePurchase({
|
|
||||||
isOpen: false,
|
|
||||||
purchaseId: null,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<ManagePurchase
|
|
||||||
onClose={() =>
|
|
||||||
setManagePurchase({
|
|
||||||
isOpen: false,
|
|
||||||
purchaseId: null,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
purchaseId={managePurchase.purchaseId}
|
|
||||||
/>
|
|
||||||
</GlobalModel>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{viewPurchaseState.isOpen && (
|
|
||||||
<GlobalModel
|
|
||||||
isOpen={viewPurchaseState.isOpen}
|
|
||||||
size="lg"
|
|
||||||
closeModal={() =>
|
|
||||||
setViewPurchase({ isOpen: false, purchaseId: null })
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<ViewPurchase purchaseId={viewPurchaseState.purchaseId} />
|
|
||||||
</GlobalModel>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{addChallan.isOpen && (
|
|
||||||
<GlobalModel size="xl"
|
|
||||||
isOpen={addChallan.isOpen}
|
|
||||||
closeModal={() => setChallan({ isOpen: false, purchaseId: null })}
|
|
||||||
>
|
|
||||||
<DeliveryChallane
|
|
||||||
purchaseId={addChallan.purchaseId}
|
|
||||||
onClose={() => setChallan({ isOpen: false, purchaseId: null })}
|
|
||||||
/>
|
|
||||||
</GlobalModel>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</PurchaseContext.Provider>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PurchasePage;
|
|
||||||
@ -157,7 +157,4 @@ export const MasterRespository = {
|
|||||||
),
|
),
|
||||||
|
|
||||||
getTeamRole: () => api.get(`/api/Master/team-roles/list`),
|
getTeamRole: () => api.get(`/api/Master/team-roles/list`),
|
||||||
|
|
||||||
|
|
||||||
getInvoiceAttachmentTypes:()=>api.get("/api/Master/invoice-attachment-type/list")
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -2,9 +2,8 @@ import { api } from "../utils/axiosClient";
|
|||||||
|
|
||||||
const OrganizationRepository = {
|
const OrganizationRepository = {
|
||||||
createOrganization: (data) => api.post("/api/Organization/create", data),
|
createOrganization: (data) => api.post("/api/Organization/create", data),
|
||||||
updateOrganizaion: (id, data) =>
|
updateOrganizaion:(id,data)=>api.put(`/api/Organization/edit/${id}`,data),
|
||||||
api.put(`/api/Organization/edit/${id}`, data),
|
getOrganizaion:(id)=>api.get(`/api/Organization/details/${id}`),
|
||||||
getOrganizaion: (id) => api.get(`/api/Organization/details/${id}`),
|
|
||||||
getOrganizationList: (pageSize, pageNumber, active, sprid, searchString) => {
|
getOrganizationList: (pageSize, pageNumber, active, sprid, searchString) => {
|
||||||
return api.get(
|
return api.get(
|
||||||
`/api/Organization/list?pageSize=${pageSize}&pageNumber=${pageNumber}&active=${active}&${
|
`/api/Organization/list?pageSize=${pageSize}&pageNumber=${pageNumber}&active=${active}&${
|
||||||
@ -40,13 +39,6 @@ const OrganizationRepository = {
|
|||||||
|
|
||||||
return api.get(url);
|
return api.get(url);
|
||||||
},
|
},
|
||||||
|
|
||||||
getGlobalOrganization: (pageSize, pageNumber, searchString, id) =>
|
|
||||||
api.get(
|
|
||||||
`/api/Organization/list/basic?pageSize=${pageSize}&pageNumber=${pageNumber}${
|
|
||||||
id ? `&id=${id}` : ""
|
|
||||||
}&searchString=${searchString}`
|
|
||||||
),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default OrganizationRepository;
|
export default OrganizationRepository;
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
import { api } from "../utils/axiosClient";
|
|
||||||
|
|
||||||
export const PurchaseRepository = {
|
|
||||||
CreatePurchase: (data) => api.post("/api/PurchaseInvoice/create", data),
|
|
||||||
GetPurchaseList: (pageSize, pageNumber, isActive, filter, searchString) =>
|
|
||||||
api.get(
|
|
||||||
`/api/PurchaseInvoice/list?pageSize=${pageSize}&pageNumber=${pageNumber}&isActive=${isActive}&filter=${filter}&searchString=${searchString}`
|
|
||||||
),
|
|
||||||
|
|
||||||
GetPurchase: (id) => api.get(`/api/PurchaseInvoice/details/${id}`),
|
|
||||||
UpdatePurchase: (id, data) =>
|
|
||||||
api.patch(`/api/PurchaseInvoice/edit/${id}`, data),
|
|
||||||
GetDeliveryChallan: (purchaseInvoiceId) =>
|
|
||||||
api.get(`/api/PurchaseInvoice/delivery-challan/list/${purchaseInvoiceId}`),
|
|
||||||
addDelievryChallan: (data) =>
|
|
||||||
api.post(`/api/PurchaseInvoice/delivery-challan/create`, data),
|
|
||||||
};
|
|
||||||
|
|
||||||
// const filterPayload = JSON.stringify({
|
|
||||||
// sortFilters,
|
|
||||||
// groupByColumn: groupBy || null,
|
|
||||||
// });
|
|
||||||
@ -62,7 +62,6 @@ import AdvancePaymentPage from "../pages/AdvancePayment/AdvancePaymentPage";
|
|||||||
import ServiceProjectDetail from "../pages/ServiceProject/ServiceProjectDetail";
|
import ServiceProjectDetail from "../pages/ServiceProject/ServiceProjectDetail";
|
||||||
import ManageJob from "../components/ServiceProject/ServiceProjectJob/ManageJob";
|
import ManageJob from "../components/ServiceProject/ServiceProjectJob/ManageJob";
|
||||||
import AdvancePaymentPage1 from "../pages/AdvancePayment/AdvancePaymentPage1";
|
import AdvancePaymentPage1 from "../pages/AdvancePayment/AdvancePaymentPage1";
|
||||||
import PurchasePage from "../pages/purchase/PurchasePage";
|
|
||||||
const router = createBrowserRouter(
|
const router = createBrowserRouter(
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
@ -114,8 +113,6 @@ const router = createBrowserRouter(
|
|||||||
{ path: "/activities/task", element: <TaskPlannng /> },
|
{ path: "/activities/task", element: <TaskPlannng /> },
|
||||||
{ path: "/activities/reports", element: <Reports /> },
|
{ path: "/activities/reports", element: <Reports /> },
|
||||||
{ path: "/gallary", element: <ImageGalleryPage /> },
|
{ path: "/gallary", element: <ImageGalleryPage /> },
|
||||||
|
|
||||||
// Finance
|
|
||||||
{ path: "/expenses/:status?/:project?", element: <ExpensePage /> },
|
{ path: "/expenses/:status?/:project?", element: <ExpensePage /> },
|
||||||
{ path: "/expenses", element: <ExpensePage /> },
|
{ path: "/expenses", element: <ExpensePage /> },
|
||||||
{ path: "/payment-request", element: <PaymentRequestPage /> },
|
{ path: "/payment-request", element: <PaymentRequestPage /> },
|
||||||
@ -123,10 +120,6 @@ const router = createBrowserRouter(
|
|||||||
{ path: "/advance-payment", element: <AdvancePaymentPage1 /> },
|
{ path: "/advance-payment", element: <AdvancePaymentPage1 /> },
|
||||||
{ path: "/advance-payment/:employeeId", element: <AdvancePaymentPage /> },
|
{ path: "/advance-payment/:employeeId", element: <AdvancePaymentPage /> },
|
||||||
{ path: "/collection", element: <CollectionPage /> },
|
{ path: "/collection", element: <CollectionPage /> },
|
||||||
|
|
||||||
// Purchases and Inventory
|
|
||||||
{ path: "/purchase-invoice", element: <PurchasePage /> },
|
|
||||||
// Administration
|
|
||||||
{ path: "/masters", element: <MasterPage /> },
|
{ path: "/masters", element: <MasterPage /> },
|
||||||
{ path: "/tenants", element: <TenantPage /> },
|
{ path: "/tenants", element: <TenantPage /> },
|
||||||
{ path: "/tenants/new-tenant", element: <CreateTenant /> },
|
{ path: "/tenants/new-tenant", element: <CreateTenant /> },
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
export const FILE_UPLOAD_INFO = `
|
|
||||||
If you want to upload a document, please select a document type
|
|
||||||
before uploading the document.
|
|
||||||
`;
|
|
||||||
Loading…
x
Reference in New Issue
Block a user