From 6e42bc0adb13095ff8e185dca2536b03a48083b3 Mon Sep 17 00:00:00 2001 From: Swapnil Date: Sat, 4 Jan 2025 21:05:49 +0530 Subject: [PATCH 1/8] [FIXED] - notification --- src/Pages/Admin/Notification.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Pages/Admin/Notification.jsx b/src/Pages/Admin/Notification.jsx index 19e3d80..23af1eb 100644 --- a/src/Pages/Admin/Notification.jsx +++ b/src/Pages/Admin/Notification.jsx @@ -23,7 +23,7 @@ import ToastBox from "../../Components/ToastBox"; import NormalTable from "../../Components/DataTable/NormalTable"; import GlobalStateContext from "../../Contexts/GlobalStateContext"; import { useGetInvestorsQuery } from "../../Services/investor.details.service"; -import { TABLE_PAGINATION } from "../../Constants/Paginations"; +import { INVESTOR_TABLE_PAGINATION, TABLE_PAGINATION } from "../../Constants/Paginations"; import { formatDate, generateSerialNumber } from "../../Constants/Constants"; import { ViewIcon } from "@chakra-ui/icons"; import { useGetUnbanInvestorQuery } from "../../Services/ban.investor.service"; @@ -66,8 +66,8 @@ const Notification = () => { const [form, setForm] = useState({}); const [isLoading, setIsLoading] = useState(false); const [ selectedRadio, setSelectedRadio] = useState([]) - const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size); - const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page); + const [pageSize, setPageSize] = useState(INVESTOR_TABLE_PAGINATION?.size); + const [currentPage, setCurrentPage] = useState(INVESTOR_TABLE_PAGINATION?.page); const [searchTerm, setSearchTerm] = useState(""); const [debouncedSearchTerm, setDebouncedSearchTerm] = useState(""); @@ -116,7 +116,7 @@ const Notification = () => { refetch, } = useGetUnbanInvestorQuery({ page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search - size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search + size: debouncedSearchTerm ? undefined : 10000 || pageSize || 500, // Omit pagination for search search: debouncedSearchTerm, }, { From 45f69fe2b7c68517f642e8087375d54dc50f4f31 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:53:51 +0530 Subject: [PATCH 2/8] update KYC --- .../Investor_Management/InvestorDetails/Kyc.jsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx b/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx index 6884845..8fec7a5 100644 --- a/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx @@ -150,6 +150,22 @@ const Kyc = () => { /> + + + + PEP Status + + + + + {/* Address From 0ed01bf94f54e986a264873a385ab96e801fbfa9 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:33:54 +0530 Subject: [PATCH 3/8] [fixed] - model --- .../CreateIO/IOTransaction/ViewDistributionInvestor.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx index 5694c8c..fc1c594 100644 --- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx +++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx @@ -172,7 +172,7 @@ const ViewDistributionInvestor = ({ isOpen, onClose, id: exitId, amount }) => { "Distriution Amt($)": ( - {IODetails?.ioTransactionRecords?.Pending[index]?.transactionAmount?.toLocaleString(undefined, { + {item?.distribution_amt?.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2, })} From a07d011c8508325b7118bca4805a1806bc78b6c7 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Thu, 9 Jan 2025 20:15:06 +0530 Subject: [PATCH 4/8] [Distribution Amt] --- .../CreateIO/IOTransaction/ViewDistributionInvestor.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx index fc1c594..8316521 100644 --- a/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx +++ b/src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx @@ -108,7 +108,7 @@ const ViewDistributionInvestor = ({ isOpen, onClose, id: exitId, amount }) => { "Last Name", "Amount", "Holding (%)", - "Distriution Amt($)", + "Distribution Amt($)", "Yeild (%)", ]; @@ -169,7 +169,7 @@ const ViewDistributionInvestor = ({ isOpen, onClose, id: exitId, amount }) => { ), - "Distriution Amt($)": ( + "Distribution Amt($)": ( {item?.distribution_amt?.toLocaleString(undefined, { From 84dc47b4478b41f2c0114fdb1943f1bea17fce45 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:28:26 +0530 Subject: [PATCH 5/8] =?UTF-8?q?done=20changes=20and=20bug=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Components/FormField.jsx | 2 +- .../IO_Management/InvestmentDocuments.jsx | 4 +- .../ViewIO/HeaderModal/UpdateIOStatus.jsx | 48 +++++++++++++++---- .../InvestorDetails/BankDetails.jsx | 2 +- .../InvestorDetails/InvestorDetails.jsx | 3 +- src/Services/io.service.js | 3 +- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/Components/FormField.jsx b/src/Components/FormField.jsx index 2c67452..0853ad2 100644 --- a/src/Components/FormField.jsx +++ b/src/Components/FormField.jsx @@ -520,7 +520,7 @@ const FormField = ({ ps={1} {...field} {...props} size='md' colorScheme='forestGreen'> - Is This Sharia Compliant + Is This Shariah Compliant );} else{ diff --git a/src/Pages/IO_Management/InvestmentDocuments.jsx b/src/Pages/IO_Management/InvestmentDocuments.jsx index f89958f..92633cf 100644 --- a/src/Pages/IO_Management/InvestmentDocuments.jsx +++ b/src/Pages/IO_Management/InvestmentDocuments.jsx @@ -60,9 +60,9 @@ export const investmentDocSchema = yup.object().shape({ // return value && value.size <= 2 * 1024 * 1024; // 2MB in bytes // }) fileName: yup.string().required("File name is required") - .max(30, "File name must be at most 30 characters"), // Maximum length validation, + .max(35, "File name must be at most 30 characters"), // Maximum length validation, documentNameArabic: yup.string().required("File name Arabic is required") - .max(25, "File name must be at most 30 characters"), + .max(25, "File name must be at most 35 characters"), }); const InvestmentDocuments = ({ diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx index 6327f52..1a3a60f 100644 --- a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx +++ b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIOStatus.jsx @@ -17,6 +17,9 @@ import { ModalHeader, ModalOverlay, FormErrorMessage, + Text, + Textarea, + Box, } from "@chakra-ui/react"; import { useGetIOprepopulateDataQuery, @@ -37,6 +40,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { const { data } = useGetIOprepopulateDataQuery(); const [updateStatusIo] = useUpdateStatusIoMutation(); const [updateCancleStatus] = useUpdateCancleStatusToMutation(); + const [message, setMessage] = useState(null); + const [messageError, setMessageError] = useState(null); // useEffect(() => { // setSelectedStatusId(status?.[0]?.id); @@ -47,11 +52,14 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { setSelectedStatusId(id); }; - const handleSubmit = async () => { + const handleSubmit = async (data) => { if (!selectedStatusId) { setError("Please select status"); return; } + if (!message) { + return setMessageError("message is required"); + } setError(""); setIsLoading(true); try { @@ -60,9 +68,10 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { // If selectedItem is 'Cancelled', make the updateCancelStatus API call if (selectedItem === import.meta.env.VITE_STATUS_CANCELLED) { res = await updateCancleStatus({ - id + id: selectedStatusId, + data: { comments: message }, }); - } + } // Otherwise, make the updateStatusIo API call else { res = await updateStatusIo({ @@ -72,7 +81,7 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { id, }); } - + console.log("API Response:", res); setIsLoading(false); handleClose(); @@ -84,6 +93,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { const handleClose = () => { setSelectedItem(null); setSelectedStatusId(null); + setMessage(null); + setMessageError(null); onClose(); setError(""); }; @@ -121,7 +132,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { colorScheme={ selectedItem === import.meta.env.VITE_STATUS_DRAFT ? "gray" - : selectedItem === import.meta.env.VITE_STATUS_PROCESSING + : selectedItem === + import.meta.env.VITE_STATUS_PROCESSING ? "yellow" : selectedItem === import.meta.env.VITE_STATUS_OPEN ? "blue" @@ -154,7 +166,7 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { { colorScheme={ statusAdmin === import.meta.env.VITE_STATUS_DRAFT ? "gray" - : statusAdmin === import.meta.env.VITE_STATUS_PROCESSING + : statusAdmin === + import.meta.env.VITE_STATUS_PROCESSING ? "yellow" : statusAdmin === import.meta.env.VITE_STATUS_OPEN ? "blue" @@ -171,7 +184,8 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { ? "green" : statusAdmin === import.meta.env.VITE_STATUS_EXITED ? "red" - : statusAdmin === import.meta.env.VITE_STATUS_CANCELLED + : statusAdmin === + import.meta.env.VITE_STATUS_CANCELLED ? "orange" : "purple" } @@ -191,6 +205,24 @@ const UpdateIOStatus = ({ isOpen, onClose, status }) => { {error} + {selectedItem === import.meta.env.VITE_STATUS_CANCELLED && ( + + + Message + +