diff --git a/src/components/Dashboard/CollectionOverview.jsx b/src/components/Dashboard/CollectionOverview.jsx index 34f0504b..f6c0f774 100644 --- a/src/components/Dashboard/CollectionOverview.jsx +++ b/src/components/Dashboard/CollectionOverview.jsx @@ -276,8 +276,7 @@ export const TopicBarChart = ({ data,isLoading }) => {
- {/*

Top Client

- {data.topClient.name} */} + Overdue Days
{/* 0–30 Days */} diff --git a/src/components/ServiceProject/ServiceProjectBranch/ViewBranchDetails.jsx b/src/components/ServiceProject/ServiceProjectBranch/ViewBranchDetails.jsx index af75cab2..075e5118 100644 --- a/src/components/ServiceProject/ServiceProjectBranch/ViewBranchDetails.jsx +++ b/src/components/ServiceProject/ServiceProjectBranch/ViewBranchDetails.jsx @@ -49,7 +49,7 @@ const ViewBranchDetails = ({ BranchToEdit }) => {
-
+ {/*
-
+
*/}
)) diff --git a/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx b/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx index d166ba4a..bc393591 100644 --- a/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx +++ b/src/components/ServiceProject/ServiceProjectJob/ManageJob.jsx @@ -89,7 +89,7 @@ const ManageJob = ({ Job }) => { })); const updatedEmployees = [...oldEmployees, ...newEmployees]; - + const payload = [ { op: "replace", @@ -128,6 +128,11 @@ const ManageJob = ({ Job }) => { value: formData.statusId, }, ]; + if(payload.length === 0){ + showToast("Please change any field value", "warning"); + return; + } + UpdateJob({ id: Job, payload }); } else { formData.assignees = formData.assignees.map((emp) => ({ diff --git a/src/components/collections/CollectionList.jsx b/src/components/collections/CollectionList.jsx index ad1ff5c0..6663bebd 100644 --- a/src/components/collections/CollectionList.jsx +++ b/src/components/collections/CollectionList.jsx @@ -225,7 +225,7 @@ const CollectionList = ({ fromDate, toDate, isPending, searchString }) => { className="dropdown-item cursor-pointer" onClick={() => setViewCollection(row.id)} > - + View @@ -245,7 +245,7 @@ const CollectionList = ({ fromDate, toDate, isPending, searchString }) => { }) } > - + Add Payment @@ -263,7 +263,7 @@ const CollectionList = ({ fromDate, toDate, isPending, searchString }) => { }) } > - + Mark Payment diff --git a/src/hooks/useServiceProject.jsx b/src/hooks/useServiceProject.jsx index bac567c2..f9ded0e0 100644 --- a/src/hooks/useServiceProject.jsx +++ b/src/hooks/useServiceProject.jsx @@ -274,17 +274,19 @@ export const useUpdateServiceProjectJob = (onSuccessCallback) => { return { resp, isArchiveAction }; }, - onSuccess: ({ isArchiveAction }) => { + onSuccess: (data, variable) => { queryClient.invalidateQueries({ queryKey: ["serviceProjectJobs"] }); queryClient.invalidateQueries({ queryKey: ["service-job"] }); - - if (onSuccessCallback) onSuccessCallback(); - - if (isArchiveAction) { - showToast("Job archived successfully", "success"); + if (variable.payload.length >= 1) { + showToast("Job Updated successfully", "success"); } else { - showToast("Job restored successfully", "success"); + if (variable.isArchiveAction) { + showToast("Job archived successfully", "success"); + } else { + showToast("Job restored successfully", "success"); + } } + if (onSuccessCallback) onSuccessCallback(); }, onError: (error) => {