+ setRotation((prev) => prev + 90)}
+ >
+
+
+
{loading && (
- 
setLoading(false)}
- />
+
+
+
);
};
diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index 2a459b94..3c4b5f86 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -26,23 +26,29 @@ const Header = () => {
const dispatch = useDispatch();
const { data, loading } = useMaster();
const navigate = useNavigate();
- const { onOpen } = useAuthModal()
- const { onOpen: changePass } = useModal("ChangePassword");
+ const {onOpen} = useAuthModal()
+ const { onOpen:changePass } = useModal("ChangePassword");
const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT);
- const { mutate: logout, isPending: logouting } = useLogout()
+ const { mutate : logout,isPending:logouting} = useLogout()
const isDashboardPath =
/^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname);
const isProjectPath = /^\/projects$/.test(location.pathname);
+ const isCollectionPath =
+ /^\/collection$/.test(location.pathname) || /^\/$/.test(location.pathname);
const showProjectDropdown = (pathname) => {
- // Paths where we DON'T want to show the project dropdown
- const excludedPaths = ["/directory", "/expenses", "/employee"];
+ const isDirectoryPath = /^\/directory$/.test(pathname);
- // Check if pathname starts with any of the excluded paths
- return !excludedPaths.some((path) => pathname.startsWith(path));
+ // const isProfilePage = /^\/employee$/.test(location.pathname);
+ const isProfilePage =
+ /^\/employee\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
+ pathname
+ );
+ const isExpensePage = /^\/expenses$/.test(pathname);
+
+ return !(isDirectoryPath || isProfilePage || isExpensePage);
};
-
const allowedProjectStatusIds = [
"603e994b-a27f-4e5d-a251-f3d69b0498ba",
"cdad86aa-8a56-4ff4-b633-9c629057dfef",
@@ -55,9 +61,9 @@ const Header = () => {
return role ? role.name : "User";
};
+
-
-
+
const handleProfilePage = () => {
navigate(`/employee/${profile?.employeeInfo?.id}`);
@@ -70,8 +76,8 @@ const Header = () => {
const projectsForDropdown = isDashboardPath
? projectNames
: projectNames?.filter((project) =>
- allowedProjectStatusIds.includes(project.projectStatusId)
- );
+ allowedProjectStatusIds.includes(project.projectStatusId)
+ );
let currentProjectDisplayName;
if (projectLoading) {
@@ -187,63 +193,63 @@ const Header = () => {
>
- Loading...
-
+ Loading...
)}
-
+ setLoading(false)}
+ />
+
+
+
+
+
{showProjectDropdown(location.pathname) && (
-
-
-
- {shouldShowDropdown ? (
-
- ) : (
-
- {currentProjectDisplayName}
-
- )}
+
+ )}
+
+
- )}
+
+ {shouldShowDropdown ? (
+
+ ) : (
+
+ {currentProjectDisplayName}
+
+ )}
- {shouldShowDropdown &&
- projectsForDropdown &&
- projectsForDropdown.length > 0 && (
-
+ ))}
+
+ )}
-
- {isDashboardPath && (
-
-
+ {shouldShowDropdown &&
+ projectsForDropdown &&
+ projectsForDropdown.length > 0 && (
+
-
+ {(isDashboardPath|| isCollectionPath) &&(
+
- + + + )} + {[...projectsForDropdown] + .sort((a, b) => a?.name?.localeCompare(b.name)) + .map((project) => ( +
- - )} - {[...projectsForDropdown] - .sort((a, b) => a?.name?.localeCompare(b.name)) - .map((project) => ( -
- - - - ))} -
-
@@ -393,7 +399,7 @@ const Header = () => {
- -
- onOpen()}> +
- onOpen()}> {" "} { - +
- @@ -439,10 +445,10 @@ const Header = () => { logout()} + onClick={()=>logout()} > - {logouting ? "Please Wait" : <> - SignOut} + {logouting ? "Please Wait":<> + SignOut}
+
+
+
+
+ {isLoading ? (
+
+ );
+};
+
+export default AddPayment;
diff --git a/src/components/collections/CollectionList.jsx b/src/components/collections/CollectionList.jsx
new file mode 100644
index 00000000..6f64808d
--- /dev/null
+++ b/src/components/collections/CollectionList.jsx
@@ -0,0 +1,296 @@
+import React, { useState } from "react";
+import { useCollections } from "../../hooks/useCollections";
+import {
+ ADDPAYMENT_COLLECTION,
+ ADMIN_COLLECTION,
+ CREATE_COLLECTION,
+ EDIT_COLLECTION,
+ ITEMS_PER_PAGE,
+ VIEW_COLLECTION,
+} from "../../utils/constants";
+import { formatFigure, localToUtc, useDebounce } from "../../utils/appUtils";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
+import Pagination from "../common/Pagination";
+import { useCollectionContext } from "../../pages/collections/CollectionPage";
+import { CollectionTableSkeleton } from "./CollectionSkeleton";
+import { useSelectedProject } from "../../slices/apiDataManager";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+
+const CollectionList = ({ fromDate, toDate, isPending, searchString }) => {
+ const [currentPage, setCurrentPage] = useState(1);
+
+ const isAdmin = useHasUserPermission(ADMIN_COLLECTION);
+ const canAddPayment = useHasUserPermission(ADDPAYMENT_COLLECTION);
+ const canViewCollection = useHasUserPermission(VIEW_COLLECTION);
+ const canEditCollection = useHasUserPermission(EDIT_COLLECTION);
+ const canCreate = useHasUserPermission(CREATE_COLLECTION);
+
+ const selectedProject = useSelectedProject();
+ const searchDebounce = useDebounce(searchString, 500);
+
+ const { data, isLoading, isError, error } = useCollections(
+ ITEMS_PER_PAGE,
+ currentPage,
+ localToUtc(fromDate),
+ localToUtc(toDate),
+ isPending,
+ true,
+ selectedProject,
+ searchDebounce
+ );
+ const { setProcessedPayment, setAddPayment, setViewCollection } =
+ useCollectionContext();
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+
+ const collectionColumns = [
+ {
+ key: "invoiceDate",
+ label: "Invoice Date",
+ getValue: (col) => (
+
+ {formatUTCToLocalTime(col.invoiceDate)}
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "invoiceId",
+ label: "Invoice No",
+ getValue: (col) => (
+
+ {col?.invoiceNumber ?? "-"}
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "project",
+ label: "Project",
+ getValue: (col) => (
+
+ {col?.project?.name ?? "-"}
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "submittedDate",
+ label: "Submission Date",
+ getValue: (col) => (
+
+ {formatUTCToLocalTime(col.createdAt)}
+
+ ),
+ align: "text-center",
+ },
+ {
+ key: "expectedSubmittedDate",
+ label: "Expected Payment Date",
+ getValue: (col) => (
+
+ {formatUTCToLocalTime(col.exceptedPaymentDate) ?? "-"}
+
+ ),
+ align: "text-center",
+ },
+ {
+ key: "amount",
+ label: "Total Amount",
+ getValue: (col) => (
+
+ {formatFigure(col?.basicAmount + col?.taxAmount, {
+ type: "currency",
+ currency: "INR",
+ }) ?? 0}
+
+ ),
+ align: "text-end",
+ },
+ {
+ key: "balance",
+ label: "Balance",
+ getValue: (col) => (
+
+ {formatFigure(col?.balanceAmount, {
+ type: "currency",
+ currency: "INR",
+ }) ?? 0}
+
+ ),
+ align: "text-end",
+ },
+ ];
+
+ if (isLoading) return Add Payment
+
+
+ )
+ )}
+
+ History
+
+
+
+ {data.receivedInvoicePayments
+ .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
+ .map((payment, index) => (
+
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+ Transaction Date:
+ {" "}
+ {formatUTCToLocalTime(payment.paymentReceivedDate)}
+
+
+ {formatFigure(payment.amount, {
+ type: "currency",
+ currency: "INR",
+ })}
+
+
+
+ Updated By:
+ {" "}
+
+
+
+
+
+ + + Transaction ID: + {" "} + {payment.transactionId} +
+
+
+
+ {payment?.paymentAdjustmentHead?.name}
+
+ {formatFigure(payment.amount, {
+ type: "currency",
+ currency: "INR",
+ })}
+
+
+ + {payment?.comment} +
+{error.message}
; + + return ( +
+
+ );
+};
+
+export default CollectionList;
diff --git a/src/components/collections/CollectionSkeleton.jsx b/src/components/collections/CollectionSkeleton.jsx
new file mode 100644
index 00000000..82878454
--- /dev/null
+++ b/src/components/collections/CollectionSkeleton.jsx
@@ -0,0 +1,211 @@
+import React from "react";
+
+const SkeletonLine = ({ height = 20, width = "100%", className = "" }) => (
+
+);
+
+export const PaymentHistorySkeleton = ({ count = 2 }) => {
+ return (
+
+
+
+
+
+
+ {data?.data?.length > 0 && (
+
+ | + {col.label} + | + ))} + {(isAdmin || + canAddPayment || + canViewCollection || + canEditCollection || + canCreate) &&Action | } +
|---|---|
| + {col.getValue(row)} + | + ))} + {(isAdmin || + canAddPayment || + canViewCollection || + canEditCollection || + canCreate) && ( +
+
+
+
+
+
|
+ )}
+
| + No Collections Found + | +
+
+ )}
+
+ {[...Array(count)].map((_, idx) => (
+
+ );
+};
+
+export const CollectionDetailsSkeleton = () => {
+ return (
+
+
+ ))}
+
+ {/* Top Row: Date + Amount */}
+
+
+
+
+
+ {/* Transaction ID */}
+
+
+
+
+ {/* Received By (Avatar + Name) */}
+
+
+
+ {/* Title */}
+
+ );
+};
+
+export const CollectionTableSkeleton = () => {
+ const columnCount = 8;
+
+ return (
+
+
+
+ {/* Project */}
+
+
+
+
+
+
+
+ {/* Invoice & E-Invoice */}
+
+
+
+
+
+ {/* Invoice Date & Client Submitted */}
+
+
+
+
+
+
+
+ {/* Expected Payment & Mark as Completed */}
+
+
+
+
+
+
+
+ {/* Basic & Tax Amount */}
+
+
+
+
+
+
+
+ {/* Balance & Created At */}
+
+
+
+
+
+
+
+ {/* Created By */}
+
+
+
+
+
+
+
+ {/* Description */}
+
+
+
+
+
+ {/* Attachments */}
+
+
+
+
+
+ {/* Tabs */}
+
+ {[...Array(3)].map((_, idx) => (
+
+
+
+
+ {/* Tab Content (Comments / Payments) */}
+
+
+
+
+ );
+};
diff --git a/src/components/collections/Comment.jsx b/src/components/collections/Comment.jsx
new file mode 100644
index 00000000..ec483593
--- /dev/null
+++ b/src/components/collections/Comment.jsx
@@ -0,0 +1,85 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import React from "react";
+import { useForm } from "react-hook-form";
+import { CommentSchema } from "./collectionSchema";
+import { useAddComment } from "../../hooks/useCollections";
+import Avatar from "../common/Avatar";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
+import moment from "moment";
+
+const Comment = ({ invoice }) => {
+ const {
+ register,
+ reset,
+ handleSubmit,
+ formState: { errors },
+ } = useForm({
+ resolver: zodResolver(CommentSchema),
+ defaultValues: { comment: "" },
+ });
+
+ const { mutate: AddComment, isPending } = useAddComment(() => {
+ reset();
+ });
+
+ const onSubmit = (formData) => {
+ const payload = { ...formData, invoiceId: invoice?.id };
+ AddComment(payload);
+ };
+ return (
+
+
+
+
+
+
+
+ {/* Pagination Skeleton */}
+
+ |
+ |
+ ))}
+
+ |
+
|---|---|
|
+ |
+ ))}
+
+ |
+
+
+
+
+ {invoice?.comments?.length > 0 ? (
+ invoice.comments.map((comment, index) => (
+
+ )}
+
+ );
+};
+
+export default Comment;
diff --git a/src/components/collections/ManageCollection.jsx b/src/components/collections/ManageCollection.jsx
new file mode 100644
index 00000000..68667d61
--- /dev/null
+++ b/src/components/collections/ManageCollection.jsx
@@ -0,0 +1,445 @@
+import React, { useEffect } from "react";
+import { useModal } from "../../hooks/useAuth";
+import Modal from "../common/Modal";
+import { FormProvider, useForm } from "react-hook-form";
+import Label from "../common/Label";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { defaultCollection, newCollection } from "./collectionSchema";
+import SelectMultiple from "../common/SelectMultiple";
+import { useProjectName } from "../../hooks/useProjects";
+import DatePicker from "../common/DatePicker";
+import {
+ useCollection,
+ useCreateCollection,
+ useUpdateCollection,
+} from "../../hooks/useCollections";
+import { formatFileSize, localToUtc } from "../../utils/appUtils";
+import { useCollectionContext } from "../../pages/collections/CollectionPage";
+import { formatDate } from "../../utils/dateUtils";
+
+const ManageCollection = ({ collectionId, onClose }) => {
+ const { data, isError, isLoading, error } = useCollection(collectionId);
+ const { projectNames, projectLoading } = useProjectName(true);
+ const methods = useForm({
+ resolver: zodResolver(newCollection),
+ defaultValues: defaultCollection,
+ });
+ const {
+ control,
+ watch,
+ register,
+ setValue,
+ handleSubmit,
+ reset,
+ formState: { errors },
+ } = methods;
+
+ const { mutate: createNewCollection, isPending } = useCreateCollection(() => {
+ handleClose();
+ });
+ const { mutate: UpdateCollection } = useUpdateCollection(() => {
+ handleClose();
+ });
+
+ const files = watch("attachments");
+ 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,
+ };
+ })
+ );
+
+ 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 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 removeFile = (index) => {
+ if (collectionId) {
+ const newFiles = files.map((file, i) => {
+ if (file.documentId !== index) return file;
+ return {
+ ...file,
+ isActive: false,
+ };
+ });
+ setValue("attachments", newFiles, { shouldValidate: true });
+ } else {
+ const newFiles = files.filter((_, i) => i !== index);
+ setValue("attachments", newFiles, { shouldValidate: true });
+ }
+ };
+
+ const onSubmit = (formData) => {
+ const payload = {
+ ...formData,
+ clientSubmitedDate: localToUtc(formData.clientSubmitedDate),
+ invoiceDate: localToUtc(formData.invoiceDate),
+ exceptedPaymentDate: localToUtc(formData.exceptedPaymentDate),
+ };
+
+ if (collectionId) {
+ UpdateCollection({
+ collectionId,
+ payload: { ...payload, id: collectionId },
+ });
+ } else {
+ createNewCollection(payload);
+ }
+ };
+
+ const handleClose = () => {
+ reset(defaultCollection);
+ onClose();
+ };
+
+ useEffect(() => {
+ if (data && collectionId) {
+ reset({
+ projectId: data?.project?.id,
+ invoiceNumber: data?.invoiceNumber,
+ eInvoiceNumber: data?.eInvoiceNumber,
+ title: data?.title,
+ clientSubmitedDate: formatDate(data?.clientSubmitedDate),
+ invoiceDate: formatDate(data?.invoiceDate),
+ exceptedPaymentDate: formatDate(data?.exceptedPaymentDate),
+ taxAmount: data?.taxAmount,
+ basicAmount: data?.basicAmount,
+ description: data?.description,
+ attachments: data.attachments
+ ? data.attachments.map((doc) => ({
+ fileName: doc.fileName,
+ base64Data: null,
+ contentType: doc.contentType,
+ documentId: doc.documentId,
+ fileSize: 0,
+ description: "",
+ preSignedUrl: doc.preSignedUrl,
+ isActive: doc.isActive ?? true,
+ }))
+ : [],
+ });
+ }
+ }, [data]);
+ if (isLoading) return
+
+
+ ))
+ ) : (
+
+
+
+
+
+
+
+ {moment.utc(comment?.createdAt).local().fromNow()}
+
+ {comment?.comment}
No comments yet.
Loading....
;
+ if (isError) return {error.message}
;
+ return (
+
+
+
+
+
+ );
+};
+
+export default ManageCollection;
diff --git a/src/components/collections/PaymentHistoryTable.jsx b/src/components/collections/PaymentHistoryTable.jsx
new file mode 100644
index 00000000..e7b31fc9
--- /dev/null
+++ b/src/components/collections/PaymentHistoryTable.jsx
@@ -0,0 +1,53 @@
+import React from 'react'
+import { formatUTCToLocalTime } from '../../utils/dateUtils'
+import { formatFigure } from '../../utils/appUtils'
+import Avatar from '../common/Avatar'
+
+const PaymentHistoryTable = ({data}) => {
+ return (
+
+ {collectionId ? "Update" : "New"} Collection
+
+
+
+ {data?.receivedInvoicePayments?.length > 0 ? (
+ )}
+
+ )
+}
+
+export default PaymentHistoryTable
diff --git a/src/components/collections/ViewCollection.jsx b/src/components/collections/ViewCollection.jsx
new file mode 100644
index 00000000..799033e5
--- /dev/null
+++ b/src/components/collections/ViewCollection.jsx
@@ -0,0 +1,258 @@
+import React, { useState } from "react";
+import { useCollectionContext } from "../../pages/collections/CollectionPage";
+import { useCollection } from "../../hooks/useCollections";
+import { formatUTCToLocalTime } from "../../utils/dateUtils";
+import { formatFigure, getIconByFileType } from "../../utils/appUtils";
+import Avatar from "../common/Avatar";
+import PaymentHistoryTable from "./PaymentHistoryTable";
+import Comment from "./Comment";
+import { CollectionDetailsSkeleton } from "./CollectionSkeleton";
+import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import { ADMIN_COLLECTION, EDIT_COLLECTION } from "../../utils/constants";
+
+const ViewCollection = ({ onClose }) => {
+ const [activeTab, setActiveTab] = useState("payments");
+ const isAdmin = useHasUserPermission(ADMIN_COLLECTION);
+ const canEditCollection = useHasUserPermission(EDIT_COLLECTION);
+ const { viewCollection, setCollection, setDocumentView } =
+ useCollectionContext();
+ const { data, isLoading, isError, error } = useCollection(viewCollection);
+
+ const handleEdit = () => {
+ setCollection({ isOpen: true, invoiceId: viewCollection });
+ onClose();
+ };
+
+ if (isLoading) return
+
+
+
+
+ ):(| Sr.No | +Transaction ID | +Received Date | +Payment Adjustment-Head | +Amount | +Updated By | +
|---|---|---|---|---|---|
| {index + 1} | +{payment.transactionId} | +{formatUTCToLocalTime(payment.paymentReceivedDate)} | +{payment?.paymentAdjustmentHead?.name ?? "--"} | ++ {formatFigure(payment.amount, { + type: "currency", + currency: "INR", + })} + | +
+
+
+ {payment.createdBy?.firstName}{" "}
+ {payment.createdBy?.lastName}
+
+ |
+
No History
{error.message}
;
+
+ return (
+
+
+ );
+};
+
+export default ViewCollection;
diff --git a/src/components/collections/collectionSchema.jsx b/src/components/collections/collectionSchema.jsx
new file mode 100644
index 00000000..bb97fede
--- /dev/null
+++ b/src/components/collections/collectionSchema.jsx
@@ -0,0 +1,101 @@
+import { z } from "zod";
+
+const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
+const ALLOWED_TYPES = [
+ "application/pdf",
+ "application/doc",
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ "image/png",
+ "image/jpg",
+ "image/jpeg",
+ "application/vnd.ms-excel",
+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+];
+
+
+export const newCollection = z.object({
+ title: z.string().trim().min(1, { message: "Title is required" }),
+ projectId: z.string().trim().min(1, { message: "Project is required" }),
+ invoiceDate: z.string().min(1, { message: "Date is required" }),
+ description: z.string().trim().optional(),
+ clientSubmitedDate: z.string().min(1, { message: "Date is required" }),
+ exceptedPaymentDate: z.string().min(1, { message: "Date is required" }),
+ invoiceNumber: z
+ .string()
+ .trim()
+ .min(1, { message: "Invoice is required" })
+ .max(17, { message: "Invalid Number" }),
+ eInvoiceNumber: z
+ .string()
+ .trim()
+ .min(1, { message: "E-Invoice No is required" }),
+ taxAmount: z.coerce
+ .number({
+ invalid_type_error: "Amount is required and must be a number",
+ })
+ .min(1, "Amount must be Enter")
+ .refine((val) => /^\d+(\.\d{1,2})?$/.test(val.toString()), {
+ message: "Amount must have at most 2 decimal places",
+ }),
+ basicAmount: z.coerce
+ .number({
+ invalid_type_error: "Amount is required and must be a number",
+ })
+ .min(1, "Amount must be Enter")
+ .refine((val) => /^\d+(\.\d{1,2})?$/.test(val.toString()), {
+ message: "Amount must have at most 2 decimal places",
+ }),
+ attachments: z
+ .array(
+ z.object({
+ 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",
+ }),
+ documentId: z.string().optional(),
+ fileSize: z.number().max(MAX_FILE_SIZE, {
+ message: "File size must be less than or equal to 5MB",
+ }),
+ description: z.string().optional(),
+ isActive: z.boolean().default(true),
+ })
+ )
+ .nonempty({ message: "At least one file attachment is required" }),
+});
+
+export const defaultCollection = {
+ projectId: "",
+ invoiceNumber: " ",
+ eInvoiceNumber: "",
+ title: "",
+ clientSubmitedDate: null,
+ invoiceDate: null,
+ exceptedPaymentDate: null,
+ taxAmount: "",
+ basicAmount: "",
+ description: "",
+ attachments: [],
+};
+
+export const paymentSchema = z.object({
+ paymentReceivedDate: z.string().min(1, { message: "Date is required" }),
+ transactionId: z.string().min(1, "Transaction ID is required"),
+ amount: z.number().min(1, "Amount must be greater than zero"),
+ comment:z.string().min(1,{message:"Comment required"}),
+ paymentAdjustmentHeadId:z.string().min(1,{message:"Payment Type required"})
+});
+
+// Default Value
+export const defaultPayment = {
+ paymentReceivedDate: null,
+ transactionId: "",
+ amount: 0,
+ comment:"",
+ paymentAdjustmentHeadId:""
+};
+
+
+export const CommentSchema = z.object({
+ comment:z.string().min(1,{message:"Comment required"})
+})
diff --git a/src/components/common/AccessDenied.jsx b/src/components/common/AccessDenied.jsx
new file mode 100644
index 00000000..62cc5f4e
--- /dev/null
+++ b/src/components/common/AccessDenied.jsx
@@ -0,0 +1,22 @@
+import React from "react";
+import Breadcrumb from "./Breadcrumb";
+
+const AccessDenied = ({data}) => {
+ return (
+ Collection Details
+
+
+
+
+
+
+
+ {data?.project?.name}
+
+ {" "}
+
+ {data?.isActive ? "Active" : "Inactive"}
+
+ {(isAdmin || canEditCollection) &&
+ !data?.receivedInvoicePayments && (
+
+
+
+ )}
+
+
+
+
+
+ Title :
+ {data?.title}
+
+
+ {/* Row 2: E-Invoice Number + Project */}
+
+
+ Invoice Number:
+ {data?.invoiceNumber}
+
+
+
+ {/* Row 3: Invoice Date + Client Submitted Date */}
+
+
+ E-Invoice Number:
+ {data?.eInvoiceNumber}
+
+
+
+
+ Invoice Date:
+
+ {formatUTCToLocalTime(data?.invoiceDate)}
+
+
+
+ {/* Row 4: Expected Payment Date + Mark as Completed */}
+
+
+ Client Submission Date:
+
+ {formatUTCToLocalTime(data?.clientSubmitedDate)}
+
+
+
+
+ {/* Row 5: Basic Amount + Tax Amount */}
+
+
+ Expected Payment Date:
+
+ {formatUTCToLocalTime(data?.exceptedPaymentDate)}
+
+
+
+
+
+ Basic Amount :
+
+ {formatFigure(data?.basicAmount, {
+ type: "currency",
+ currency: "INR",
+ })}
+
+
+
+ {/* Row 6: Balance Amount + Created At */}
+
+
+ Tax Amount :
+
+ {formatFigure(data?.taxAmount, {
+ type: "currency",
+ currency: "INR",
+ })}
+
+
+
+
+
+ Balance Amount :
+
+ {formatFigure(data?.balanceAmount, {
+ type: "currency",
+ currency: "INR",
+ })}
+
+
+
+ {/* Row 7: Created By */}
+
+
+ Created At :
+ {formatUTCToLocalTime(data?.createdAt)}
+
+
+ {/* Description */}
+
+
+ Created By :
+
+
+
+
+
+ Description :
+ {data?.description}
+
+
+
+
+
+
+ {data?.attachments?.map((doc) => {
+ const isImage = doc.contentType?.includes("image");
+
+ return (
+
+ {
+ if (isImage) {
+ setDocumentView({
+ IsOpen: true,
+ Image: doc.preSignedUrl,
+ });
+ }
+ }}
+ >
+
+
+ {doc.fileName}
+
+
+ );
+ }) ?? "No Attachment"}
+
+ {/* Tabs Navigation */}
+
+ -
+
- + + +
- + + +
+ {activeTab === "payments" && (
+
+
+
+ )}
+
+ {activeTab === "details" && (
+
+
+ )}
+
+
+ );
+};
+
+export default AccessDenied;
diff --git a/src/components/common/Avatar.jsx b/src/components/common/Avatar.jsx
index 5c3f25e6..04b36f3c 100644
--- a/src/components/common/Avatar.jsx
+++ b/src/components/common/Avatar.jsx
@@ -51,7 +51,7 @@ const Avatar = ({ firstName, lastName, size = "sm", classAvatar }) => {
return (
+
+
+
+ + Access Denied: You don't have permission to perform this action ! +
+
-
+
{generateAvatarText(firstName, lastName)}
diff --git a/src/components/common/ConfirmModal.jsx b/src/components/common/ConfirmModal.jsx
index 037c6a59..dd0158eb 100644
--- a/src/components/common/ConfirmModal.jsx
+++ b/src/components/common/ConfirmModal.jsx
@@ -13,19 +13,18 @@ const ConfirmModal = ({
if (!isOpen) return null;
const TypeofIcon = () => {
- if (type === "delete") {
- return (
-
- );
+ switch (type) {
+ case "delete":
+ return ;
+ case "success":
+ return ;
+ case "warning":
+ return ;
+ default:
+ return null;
}
- return null;
};
- const modalSize = type === "delete" ? "sm" : "md";
-
return (
-
+
diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index ec8c36e9..5bc1894d 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -88,7 +88,6 @@ export default DateRangePicker;
-
export const DateRangePicker1 = ({
startField = "startDate",
endField = "endDate",
@@ -98,6 +97,7 @@ export const DateRangePicker1 = ({
resetSignal,
defaultRange = true,
maxDate = null,
+ howManyDay = 6,
...rest
}) => {
const inputRef = useRef(null);
@@ -107,12 +107,13 @@ export const DateRangePicker1 = ({
field: { ref },
} = useController({ name: startField, control });
+ // Apply default range
const applyDefaultDates = () => {
const today = new Date();
- const past = new Date();
- past.setDate(today.getDate() - 6);
+ const past = new Date(today.getTime());
+ past.setDate(today.getDate() - howManyDay);
- const format = (d) => flatpickr.formatDate(d, "d-m-Y");
+ const format = (d) => window.flatpickr.formatDate(d, "d-m-Y");
const formattedStart = format(past);
const formattedEnd = format(today);
@@ -127,15 +128,19 @@ export const DateRangePicker1 = ({
useEffect(() => {
if (!inputRef.current || inputRef.current._flatpickr) return;
- const instance = flatpickr(inputRef.current, {
+ if (defaultRange && !getValues(startField) && !getValues(endField)) {
+ applyDefaultDates();
+ }
+
+ const instance = window.flatpickr(inputRef.current, {
mode: "range",
dateFormat: "d-m-Y",
allowInput: allowText,
- maxDate ,
+ maxDate,
onChange: (selectedDates) => {
if (selectedDates.length === 2) {
const [start, end] = selectedDates;
- const format = (d) => flatpickr.formatDate(d, "d-m-Y");
+ const format = (d) => window.flatpickr.formatDate(d, "d-m-Y");
setValue(startField, format(start), { shouldValidate: true });
setValue(endField, format(end), { shouldValidate: true });
} else {
@@ -148,12 +153,10 @@ export const DateRangePicker1 = ({
const currentStart = getValues(startField);
const currentEnd = getValues(endField);
- if (defaultRange && !currentStart && !currentEnd) {
- applyDefaultDates();
- } else if (currentStart && currentEnd) {
+ if (currentStart && currentEnd) {
instance.setDate([
- flatpickr.parseDate(currentStart, "d-m-Y"),
- flatpickr.parseDate(currentEnd, "d-m-Y"),
+ window.flatpickr.parseDate(currentStart, "d-m-Y"),
+ window.flatpickr.parseDate(currentEnd, "d-m-Y"),
]);
}
@@ -161,20 +164,19 @@ export const DateRangePicker1 = ({
}, []);
useEffect(() => {
- if (resetSignal !== undefined) {
- if (defaultRange) {
- applyDefaultDates();
- } else {
- setValue(startField, "", { shouldValidate: true });
- setValue(endField, "", { shouldValidate: true });
+ if (resetSignal !== undefined) {
+ if (defaultRange) {
+ applyDefaultDates();
+ } else {
+ setValue(startField, "", { shouldValidate: true });
+ setValue(endField, "", { shouldValidate: true });
- if (inputRef.current?._flatpickr) {
- inputRef.current._flatpickr.clear();
+ if (inputRef.current?._flatpickr) {
+ inputRef.current._flatpickr.clear();
+ }
}
}
- }
-}, [resetSignal, defaultRange, setValue, startField, endField]);
-
+ }, [resetSignal, defaultRange, setValue, startField, endField]);
const start = getValues(startField);
const end = getValues(endField);
@@ -186,7 +188,7 @@ export const DateRangePicker1 = ({
type="text"
className="form-control form-control-sm"
placeholder={placeholder}
- defaultValue={formattedValue}
+ value={formattedValue}
ref={(el) => {
inputRef.current = el;
ref(el);
diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index b26d6de4..569ea854 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -16,10 +16,10 @@ import ManageDocumentCategory from "./ManageDocumentCategory";
import ManageDocumentType from "./ManageDocumentType";
import ManageServices from "./Services/ManageServices";
import ServiceGroups from "./Services/ServicesGroups";
+import ManagePaymentHead from "./paymentAdjustmentHead/ManagePaymentHead";
const MasterModal = ({ modaldata, closeModal }) => {
if (!modaldata?.modalType || modaldata.modalType === "delete") {
-
return null;
}
@@ -33,7 +33,7 @@ const MasterModal = ({ modaldata, closeModal }) => {
- ),
+ Services:
{header && {header}}
-
{TypeofIcon()}
-
+
+
+ {TypeofIcon()}
+
+
{message}
-
{
const [plans, setPlans] = useState([]);
const [frequency, setFrequency] = useState(1);
+ const { data, isLoading, isError, error } = useSubscription(frequency);
const [loading, setLoading] = useState(false);
- useEffect(() => {
- const fetchPlans = async () => {
- try {
- setLoading(true);
- const res = await axios.get(
- `http://localhost:5032/api/market/list/subscription-plan?frequency=${frequency}`,
- { headers: { "Content-Type": "application/json" } }
- );
- setPlans(res.data?.data || []);
- } catch (err) {
- console.error("Error fetching plans:", err);
- } finally {
- setLoading(false);
- }
- };
- fetchPlans();
- }, [frequency]);
+
const frequencyLabel = (freq) => {
switch (freq) {
- case 0: return "1 mo";
- case 1: return "3 mo";
- case 2: return "6 mo";
- case 3: return "1 yr";
- default: return "mo";
+ case 0:
+ return "1 mo";
+ case 1:
+ return "3 mo";
+ case 2:
+ return "6 mo";
+ case 3:
+ return "1 yr";
+ default:
+ return "mo";
}
};
@@ -41,38 +32,49 @@ const SubscriptionPlans = () => {
{/* Frequency Switcher */}
{/* Cards */}
-
);
};
diff --git a/src/components/master/paymentAdjustmentHead/ManagePaymentHead.jsx b/src/components/master/paymentAdjustmentHead/ManagePaymentHead.jsx
new file mode 100644
index 00000000..1afba4ab
--- /dev/null
+++ b/src/components/master/paymentAdjustmentHead/ManagePaymentHead.jsx
@@ -0,0 +1,107 @@
+import React, { useEffect } from "react";
+import { z } from "zod";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import Label from "../../common/Label";
+import { useCreatePaymentAjustmentHead, useUpdatePaymentAjustmentHead } from "../../../hooks/masterHook/useMaster";
+
+export const simpleFormSchema = z.object({
+ name: z.string().min(1, "Name is required"),
+ description: z.string().min(1, "Description is required"),
+});
+
+const ManagePaymentHead = ({ data, onClose }) => {
+ const {
+ register,
+ handleSubmit,
+ reset,
+ formState: { errors },
+ } = useForm({
+ resolver: zodResolver(simpleFormSchema),
+ defaultValues: {
+ name: "",
+ description: "",
+ },
+ });
+
+ const {mutate:CreateAjustmentHead,isPending} = useCreatePaymentAjustmentHead(()=>{
+ handleClose?.()
+ });
+ const {mutate:UpdateAjustmentHead,isPending:isUpdating} = useUpdatePaymentAjustmentHead(()=>{
+ handleClose?.()
+ })
+ const onSubmit = (formData) => {
+ if(data){
+ let id = data?.id;
+ const payload = {
+ ...formData,
+ id:id,
+ }
+ UpdateAjustmentHead({id:id,payload:payload})
+ }else{
+ let payload={
+ ...formData
+ }
+ CreateAjustmentHead(payload)
+ }
+ };
+
+ useEffect(() => {
+ if (data) {
+ reset({
+ name: data.name,
+ description: data.description,
+ });
+ }
+ }, [data]);
+ const handleClose = () => {
+ reset();
+ onClose();
+ };
+ return (
+ {`${masterType, " ", modalType}`}
+
+
- { modalComponents[modalType] || null}
-
+
+ {modalComponents[modalType] || null}
{`${(masterType, " ", modalType)}`}
+
+
+
+ );
+};
+
+export default ManagePaymentHead;
diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js
index 3487b60b..c9c9216a 100644
--- a/src/hooks/masterHook/useMaster.js
+++ b/src/hooks/masterHook/useMaster.js
@@ -10,6 +10,14 @@ import {
} from "@tanstack/react-query";
import showToast from "../../services/toastService";
+export const usePaymentAjustmentHead = (isActive) => {
+ return useQuery({
+ queryKey: ["paymentType",isActive],
+ queryFn: async () => await MasterRespository.getPaymentAdjustmentHead(isActive),
+
+ });
+};
+
export const useServices = () => {
return useQuery({
queryKey: ["services"],
@@ -28,9 +36,8 @@ export const useActivitiesByGroups = (groupId) => {
return useQuery({
queryKey: ["activties", groupId],
queryFn: async () => await MasterRespository.getActivitesByGroup(groupId),
-
+
enabled: !!groupId,
-
});
};
export const useGlobalServices = () => {
@@ -296,6 +303,8 @@ const fetchMasterData = async (masterType) => {
return (await MasterRespository.getDocumentTypes()).data;
case "Document Category":
return (await MasterRespository.getDocumentCategories()).data;
+ case "Payment Adjustment Head":
+ return (await MasterRespository.getPaymentAdjustmentHead(true)).data;
case "Status":
return [
{
@@ -448,8 +457,6 @@ export const useUpdateApplicationRole = (onSuccessCallback) => {
});
};
-
-
//-----Create work Category-------------------------------
export const useCreateWorkCategory = (onSuccessCallback) => {
const queryClient = useQueryClient();
@@ -703,13 +710,11 @@ export const useCreateService = (onSuccessCallback) => {
return useMutation({
mutationFn: async (payload) => {
-
const resp = await MasterRespository.createService(payload);
-
+
return resp.data;
},
onSuccess: (data) => {
-
queryClient.invalidateQueries({ queryKey: ["masterData", "Services"] });
showToast(data?.message || "Service added successfully", "success");
@@ -717,8 +722,12 @@ export const useCreateService = (onSuccessCallback) => {
if (onSuccessCallback) onSuccessCallback(data?.data);
},
onError: (error) => {
-
- showToast( error?.response?.data?.message || error?.message || "Something went wrong", "error");
+ showToast(
+ error?.response?.data?.message ||
+ error?.message ||
+ "Something went wrong",
+ "error"
+ );
},
});
};
@@ -741,7 +750,12 @@ export const useUpdateService = (onSuccessCallback) => {
if (onSuccessCallback) onSuccessCallback(data);
},
onError: (error) => {
- showToast(error?.response?.data?.message || error?.message || "Something went wrong", "error");
+ showToast(
+ error?.response?.data?.message ||
+ error?.message ||
+ "Something went wrong",
+ "error"
+ );
},
});
};
@@ -759,15 +773,22 @@ export const useCreateActivityGroup = (onSuccessCallback) => {
queryKey: ["groups"],
});
- showToast( data?.message ||
- data?.response?.data?.message || "Activity Group created successfully.",
+ showToast(
+ data?.message ||
+ data?.response?.data?.message ||
+ "Activity Group created successfully.",
"success"
);
if (onSuccessCallback) onSuccessCallback(data);
},
onError: (error) => {
- showToast(error?.response?.data?.message || error?.message || "Something went wrong", "error");
+ showToast(
+ error?.response?.data?.message ||
+ error?.message ||
+ "Something went wrong",
+ "error"
+ );
},
});
};
@@ -775,8 +796,8 @@ export const useUpdateActivityGroup = (onSuccessCallback) => {
const queryClient = useQueryClient();
return useMutation({
- mutationFn: async ({id,payload}) => {
- const response = await MasterRespository.updateActivityGrop(id,payload);
+ mutationFn: async ({ id, payload }) => {
+ const response = await MasterRespository.updateActivityGrop(id, payload);
return response;
},
onSuccess: (data, variables) => {
@@ -786,7 +807,8 @@ export const useUpdateActivityGroup = (onSuccessCallback) => {
showToast(
data?.message ||
- data?.response?.data?.message|| "Activity Group Updated successfully.",
+ data?.response?.data?.message ||
+ "Activity Group Updated successfully.",
"success"
);
@@ -812,7 +834,12 @@ export const useCreateActivity = (onSuccessCallback) => {
if (onSuccessCallback) onSuccessCallback(data);
},
onError: (error) => {
- showToast(error?.response?.data?.message || error?.message || "Something went wrong", "error");
+ showToast(
+ error?.response?.data?.message ||
+ error?.message ||
+ "Something went wrong",
+ "error"
+ );
},
});
};
@@ -834,7 +861,12 @@ export const useUpdateActivity = (onSuccessCallback) => {
if (onSuccessCallback) onSuccessCallback(data);
},
onError: (error) => {
- showToast(error?.response?.data?.message || error?.message || "Something went wrong", "error");
+ showToast(
+ error?.response?.data?.message ||
+ error?.message ||
+ "Something went wrong",
+ "error"
+ );
},
});
};
@@ -968,7 +1000,52 @@ export const useUpdateDocumentType = (onSuccessCallback) => {
},
});
};
-// -Delete Master --------
+// ------------------------------x-x--------x-x------------------------------------
+
+// ==============================Payment Adjustment Head =============================
+export const useCreatePaymentAjustmentHead = (onSuccessCallback) => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async (payload) => {
+ const resp = await MasterRespository.createPaymentAjustmentHead(payload);
+ return resp.data;
+ },
+ onSuccess: (data) => {
+ queryClient.invalidateQueries({
+ queryKey: ["masterData", "Payment Adjustment Head"],
+ });
+ showToast("Payment Ajustment Head successfully", "success");
+ if (onSuccessCallback) onSuccessCallback(data);
+ },
+ onError: (error) => {
+ showToast(error.message || "Something went wrong", "error");
+ },
+ });
+};
+export const useUpdatePaymentAjustmentHead = (onSuccessCallback) => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async ({ id, payload }) => {
+ const resp = await MasterRespository.updatePaymentAjustmentHead(id, payload);
+ return resp.data;
+ },
+ onSuccess: (data) => {
+ queryClient.invalidateQueries({
+ queryKey: ["masterData", "Payment Adjustment Head"],
+ });
+ showToast("Payment Ajustment Head Updated successfully", "success");
+ if (onSuccessCallback) onSuccessCallback(data);
+ },
+ onError: (error) => {
+ showToast(error.message || "Something went wrong", "error");
+ },
+ });
+};
+// ====================x=x====================x=x==================================
+
+// --------Delete Master --------
export const useDeleteMasterItem = () => {
const queryClient = useQueryClient();
@@ -1001,14 +1078,12 @@ export const useDeleteMasterItem = () => {
});
};
-
-export const useDeleteServiceGroup =()=>{
- const queryClient = useQueryClient();
+export const useDeleteServiceGroup = () => {
+ const queryClient = useQueryClient();
return useMutation({
- mutationFn: async (id)=>await MasterRespository.deleteActivityGroup(id),
- onSuccess: ({_,variable}) => {
-
+ mutationFn: async (id) => await MasterRespository.deleteActivityGroup(id),
+ onSuccess: ({ _, variable }) => {
queryClient.invalidateQueries({ queryKey: ["groups"] });
showToast(`Group deleted successfully.`, "success");
@@ -1022,15 +1097,13 @@ export const useDeleteServiceGroup =()=>{
showToast(message, "error");
},
});
-}
-export const useDeleteActivity =()=>{
- const queryClient = useQueryClient();
+};
+export const useDeleteActivity = () => {
+ const queryClient = useQueryClient();
return useMutation({
- mutationFn: async (id)=>await MasterRespository.deleteActivity(id),
- onSuccess: ({_,variable}) => {
-
-
+ mutationFn: async (id) => await MasterRespository.deleteActivity(id),
+ onSuccess: ({ _, variable }) => {
queryClient.invalidateQueries({ queryKey: ["activties"] });
showToast(`Acivity deleted successfully.`, "success");
@@ -1044,4 +1117,4 @@ export const useDeleteActivity =()=>{
showToast(message, "error");
},
});
-}
+};
diff --git a/src/hooks/useAuth.jsx b/src/hooks/useAuth.jsx
index c9e763f9..ded67e13 100644
--- a/src/hooks/useAuth.jsx
+++ b/src/hooks/useAuth.jsx
@@ -32,6 +32,16 @@ export const useModal = (modalType) => {
return { isOpen, onOpen, onClose, onToggle };
};
+export const useSubscription = (frequency) => {
+ return useQuery({
+ queryKey: ["subscriptionPlans", frequency],
+ queryFn: async () => {
+ debugger
+ const resp = await AuthRepository.getSubscription(frequency);
+ return resp.data;
+ },
+ });
+};
// -------------------APIHook-------------------------------------
@@ -85,8 +95,8 @@ export const useAuthModal = () => {
export const useLogout = () => {
const queryClient = useQueryClient();
- const naviget = useNavigate()
- const dispatch = useDispatch()
+ const naviget = useNavigate();
+ const dispatch = useDispatch();
return useMutation({
mutationFn: async () => {
@@ -99,12 +109,12 @@ export const useLogout = () => {
},
onSuccess: (data) => {
- queryClient.clear()
+ queryClient.clear();
removeSession();
- dispatch(cacheProfileData(null))
+ dispatch(cacheProfileData(null));
// window.location.href = "/auth/login";
- naviget("/auth/login",{replace:true})
+ naviget("/auth/login", { replace: true });
if (onSuccessCallBack) onSuccessCallBack();
},
diff --git a/src/hooks/useCollections.jsx b/src/hooks/useCollections.jsx
new file mode 100644
index 00000000..c300462d
--- /dev/null
+++ b/src/hooks/useCollections.jsx
@@ -0,0 +1,152 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { CollectionRepository } from "../repositories/ColllectionRepository";
+import showToast from "../services/toastService";
+
+export const useCollections = (
+ pageSize,
+ pageNumber,
+ fromDate,
+ toDate,
+ isPending,
+ isActive,
+ projectId,
+ searchString
+) => {
+ return useQuery({
+ queryKey: [
+ "collections",
+ pageSize,
+ pageNumber,
+ fromDate,
+ toDate,
+ isPending,
+ isActive,
+ projectId,
+ searchString,
+ ],
+
+ queryFn: async () => {
+ const response = await CollectionRepository.getCollections(
+ pageSize,
+ pageNumber,
+ fromDate,
+ toDate,
+ isPending,
+ isActive,
+ projectId,
+ searchString
+ );
+ return response.data;
+ },
+
+ keepPreviousData: true,
+ staleTime: 1000 * 60 * 1,
+ });
+};
+
+
+export const useCollection =(collectionId)=>{
+ return useQuery({
+ queryKey:["collection",collectionId],
+ queryFn:async()=> {
+ const resp = await CollectionRepository.getCollection(collectionId);
+ return resp.data
+ },
+ enabled:!!collectionId
+ })
+}
+
+
+// =========================Mutation======================
+
+export const useCreateCollection = (onSuccessCallBack) => {
+ const clinent = useQueryClient();
+ return useMutation({
+ mutationFn: async (payload) =>
+ await CollectionRepository.createNewCollection(payload),
+ onSuccess: (_, variables) => {
+ showToast("New Collection created Successfully", "success");
+ clinent.invalidateQueries({ queryKey: ["collections"] });
+ if (onSuccessCallBack) onSuccessCallBack();
+ },
+ onError: (error) => {
+ showToast(
+ error.response.data.message || error.message || "Something Went wrong"
+ );
+ },
+ });
+};
+
+export const useMarkedPaymentReceived = (onSuccessCallBack) => {
+ const client = useQueryClient();
+ return useMutation({
+ mutationFn: async (payload) =>
+ await CollectionRepository.markPaymentReceived(payload),
+ onSuccess: async () => {
+ client.invalidateQueries({ queryKey: ["collections"] });
+ showToast("Payment Received marked Successfully", "success");
+ if (onSuccessCallBack) onSuccessCallBack();
+ },
+ onError: (error) => {
+ showToast(
+ error.response.data.message || error.message || "Something Went wrong"
+ );
+ },
+ });
+};
+
+export const useAddPayment = (onSuccessCallBack) => {
+ const client = useQueryClient();
+
+ return useMutation({
+ mutationFn: (payload) => CollectionRepository.makeReceivePayment(payload),
+ onSuccess: () => {
+ client.invalidateQueries({ queryKey: ["collections"] });
+ client.invalidateQueries({ queryKey: ["collection"] });
+ showToast("Payment Received marked Successfully", "success");
+ if (onSuccessCallBack) onSuccessCallBack();
+ },
+ onError: (error) => {
+ showToast(
+ error?.response?.data?.message || error.message || "Something Went wrong"
+ );
+ },
+ });
+};
+
+export const useAddComment = (onSuccessCallBack) => {
+ const client = useQueryClient();
+
+ return useMutation({
+ mutationFn: (payload) => CollectionRepository.addComment(payload),
+ onSuccess: () => {
+ client.invalidateQueries({ queryKey: ["collections"] });
+ client.invalidateQueries({ queryKey: ["collection"] });
+ showToast("Comment Successfully", "success");
+ if (onSuccessCallBack) onSuccessCallBack();
+ },
+ onError: (error) => {
+ showToast(
+ error?.response?.data?.message || error.message || "Something Went wrong"
+ );
+ },
+ });
+};
+
+export const useUpdateCollection =(onSuccessCallBack)=>{
+ const client = useQueryClient();
+ return useMutation({
+ mutationFn:async({collectionId,payload})=> await CollectionRepository.updateCollection(collectionId,payload),
+ onSuccess: () => {
+ client.invalidateQueries({ queryKey: ["collections"] });
+ client.invalidateQueries({ queryKey: ["collection"] });
+ showToast("Collection Updated Successfully", "success");
+ if (onSuccessCallBack) onSuccessCallBack();
+ },
+ onError: (error) => {
+ showToast(
+ error?.response?.data?.message || error.message || "Something Went wrong"
+ );
+ },
+ })
+}
\ No newline at end of file
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index d540a3ce..7175bb94 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -153,7 +153,7 @@ export const useProjectsAllocationByEmployee = (employeeId) => {
return { projectList, loading: isLoading, error, refetch };
};
-export const useProjectName = () => {
+export const useProjectName = (provideAll=false) => {
const {
data = [],
isLoading,
@@ -161,9 +161,9 @@ export const useProjectName = () => {
refetch,
isError,
} = useQuery({
- queryKey: ["basicProjectNameList"],
+ queryKey: ["basicProjectNameList",provideAll],
queryFn: async () => {
- const res = await ProjectRepository.projectNameList();
+ const res = await ProjectRepository.projectNameList(provideAll);
return res.data || res;
},
onError: (error) => {
diff --git a/src/pages/Home/LandingPage.jsx b/src/pages/Home/LandingPage.jsx
index 35b01202..d3288a9d 100644
--- a/src/pages/Home/LandingPage.jsx
+++ b/src/pages/Home/LandingPage.jsx
@@ -206,8 +206,8 @@ const LandingPage = () => {
navigation={false}
modules={[EffectFlip, Autoplay, Pagination, Navigation]}
className="mySwiper"
- onSlideChange={() => console.log("slide change")}
- onSwiper={(swiper) => console.log(swiper)}
+ onSlideChange={() => {}}
+ onSwiper={(swiper) => {}}
>
- {["Monthly", "Quarterly", "Half-Yearly", "Yearly"].map((label, idx) => (
-
- ))}
+ {["Monthly", "Quarterly", "Half-Yearly", "Yearly"].map(
+ (label, idx) => (
+
+ )
+ )}
- {loading ? (
+ {isLoading ? (
// Show 3 skeletons
<>
+
+ );
+};
+
+export default CollectionPage;
diff --git a/src/repositories/AuthRepository.jsx b/src/repositories/AuthRepository.jsx
index 700020fd..ba68946e 100644
--- a/src/repositories/AuthRepository.jsx
+++ b/src/repositories/AuthRepository.jsx
@@ -10,6 +10,7 @@ const AuthRepository = {
verifyOTP: (data) => api.postPublic("/api/auth/login-otp", data),
register: (data) => api.postPublic("/api/auth/register", data),
sendMail: (data) => api.postPublic("/api/auth/sendmail", data),
+ getSubscription:(frequency)=> api.getPublic(`/api/market/list/subscription-plan?frequency=${frequency}`),
// Protected routes (require auth token)
logout: (data) => api.post("/api/auth/logout", data),
@@ -17,7 +18,9 @@ const AuthRepository = {
changepassword: (data) => api.post("/api/auth/change-password", data),
appmenu: () => api.get('/api/appmenu/get/menu'),
selectTenant: (tenantId) => api.post(`/api/Auth/select-tenant/${tenantId}`),
- getTenantList: () => api.get("/api/Auth/get/user/tenants"),
+ getTenantList: () => api.get("/api/Auth/get/user/tenants"),
+
+ //
};
diff --git a/src/repositories/ColllectionRepository.jsx b/src/repositories/ColllectionRepository.jsx
new file mode 100644
index 00000000..8eb512da
--- /dev/null
+++ b/src/repositories/ColllectionRepository.jsx
@@ -0,0 +1,29 @@
+import { api } from "../utils/axiosClient";
+import { DirectoryRepository } from "./DirectoryRepository";
+
+export const CollectionRepository = {
+ createNewCollection: (data) =>
+ api.post(`/api/Collection/invoice/create`, data),
+ updateCollection:(id,data)=>{
+ api.put(`/api/Collection/invoice/edit/${id}`,data)
+ },
+ getCollections: (pageSize, pageNumber,fromDate,toDate, isPending,isActive,projectId, searchString) => {
+ let url = `/api/Collection/invoice/list?pageSize=${pageSize}&pageNumber=${pageNumber}&isPending=${isPending}&isActive=${isActive}&searchString=${searchString}`;
+
+ const params = [];
+ if (fromDate) params.push(`fromDate=${fromDate}`);
+ if (toDate) params.push(`toDate=${toDate}`);
+ if(projectId) params.push(`projectId=${projectId}`)
+
+ if (params.length > 0) {
+ url += `&${params.join("&")}`;
+ }
+ return api.get(url);
+ },
+
+ makeReceivePayment:(data)=> api.post(`/api/Collection/invoice/payment/received`,data),
+ markPaymentReceived:(invoiceId)=>api.put(`/api/Collection/invoice/marked/completed/${invoiceId}`),
+ getCollection:(id)=>api.get(`/api/Collection/invoice/details/${id}`),
+ addComment:(data)=>api.post(`/api/Collection/invoice/add/comment`,data)
+};
+
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index 3e9fac8f..d197c11c 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -58,6 +58,7 @@ export const MasterRespository = {
"Document Type": (id) => api.delete(`/api/Master/document-type/delete/${id}`),
"Document Category": (id) =>
api.delete(`/api/Master/document-category/delete/${id}`),
+ "Payment Adjustment Head":(id,isActive)=>api.delete(`/api/Master/payment-adjustment-head/delete/${id}`,(isActive=false)),
getWorkCategory: () => api.get(`/api/master/work-categories`),
createWorkCategory: (data) => api.post(`/api/master/work-category`, data),
@@ -124,10 +125,15 @@ export const MasterRespository = {
api.put(`/api/Master/activity-group/edit/${serviceId}`, data),
getActivitesByGroup: (activityGroupId) =>
api.get(`api/master/activities?activityGroupId=${activityGroupId}`),
- deleteActivityGroup:(id)=>api.delete(`/api/Master/activity-group/delete/${id}`),
+ deleteActivityGroup: (id) =>
+ api.delete(`/api/Master/activity-group/delete/${id}`),
-
- deleteActivity:(id)=>api.delete(`/api/Master/activity/delete/${id}`),
+ deleteActivity: (id) => api.delete(`/api/Master/activity/delete/${id}`),
getOrganizationType: () => api.get("/api/Master/organization-type/list"),
+
+ getPaymentAdjustmentHead: (isActive) =>
+ api.get(`/api/Master/payment-adjustment-head/list?isActive=${isActive}`),
+ createPaymentAjustmentHead:(data)=>api.post(`/api/Master/payment-adjustment-head`, data),
+ updatePaymentAjustmentHead:(id,data)=>api.put(`/api/Master/payment-adjustment-head/edit/${id}`, data)
};
diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx
index 8f21acb4..06d33c58 100644
--- a/src/repositories/ProjectRepository.jsx
+++ b/src/repositories/ProjectRepository.jsx
@@ -40,7 +40,7 @@ const ProjectRepository = {
api.get(`/api/project/allocation-histery/${id}`),
updateProjectsByEmployee: (id, data) =>
api.post(`/api/project/assign-projects/${id}`, data),
- projectNameList: () => api.get("/api/project/list/basic"),
+ projectNameList: (provideAll) => api.get(`/api/project/list/basic?provideAll=${provideAll}`),
getProjectDetails: (id) => api.get(`/api/project/details/${id}`),
diff --git a/src/router/AppRoutes.jsx b/src/router/AppRoutes.jsx
index 37904f98..712f3eaf 100644
--- a/src/router/AppRoutes.jsx
+++ b/src/router/AppRoutes.jsx
@@ -53,6 +53,7 @@ import DailyProgrssReport from "../pages/DailyProgressReport/DailyProgrssReport"
import ProjectPage from "../pages/project/ProjectPage";
import { ComingSoonPage } from "../pages/Misc/ComingSoonPage";
import ImageGalleryPage from "../pages/Gallary/ImageGallaryPage";
+import CollectionPage from "../pages/collections/CollectionPage";
const router = createBrowserRouter(
[
{
@@ -96,6 +97,7 @@ const router = createBrowserRouter(
{ path: "/gallary", element:
No plans found
+ ) : isError ? (
+
+
) : (
- plans.map((plan) => (
+ data.map((plan) => (
{error.message}
+{error.name}
+
{/* Header */}
@@ -133,7 +137,6 @@ const SubscriptionPlans = () => {
))
)}
-
-
@@ -80,7 +82,9 @@ const SubscriptionPlans = () => {
{plan.planName}
++ {plan.planName} +
{plan.description}
{plan.currency?.symbol} {plan.price} - / {frequencyLabel(frequency)} + + / {frequencyLabel(frequency)} +
Checking access...
;
+}
+
+if (!isAdmin && !canAddPayment && !canEditCollection && !canViewCollection && !canCreate) {
+ return
+ setCollection({ isOpen: false, invoiceId: null })}
+ >
+ setCollection({ isOpen: false, invoiceId: null })}
+ />
+
+ )}
+
+ {addPayment.isOpen && (
+ setAddPayment({ isOpen: false, invoiceId: null })}
+ >
+ setAddPayment({ isOpen: false, invoiceId: null })}
+ />
+
+ )}
+
+ {viewCollection && (
+ setViewCollection(null)}
+ >
+ setViewCollection(null)} />
+
+ )}
+
+ {ViewDocument.IsOpen && (
+ setDocumentView({ IsOpen: false, Image: null })}
+ >
+
+ )}
+
+ handleMarkedPayment(processedPayment?.invoiceId)}
+ onClose={() => setProcessedPayment(null)}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ setShowPending(e.target.checked)}
+ />
+
+
+
+
+
+ {" "}
+ setSearchText(e.target.value)}
+ placeholder="search Collection"
+ className="form-control form-control-sm"
+ />
+
+ { (canCreate || isAdmin) && (
+
+)}
+
+