diff --git a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
index 96bc711..c51491d 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
@@ -24,6 +24,7 @@ import { useForm } from "react-hook-form";
import { useGetDepositRequestByIdQuery, useUpdateDepositRequestMutation } from "../../../Services/deposit.request.service";
import FullscreenLoaders from "../../../Components/Loaders/FullscreenLoaders";
import ToastBox from "../../../Components/ToastBox";
+import { useGetDrawalRequestQuery } from "../../../Services/drawal.request.service";
const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"];
@@ -44,7 +45,13 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa
const fileredData = requestData?.find((item)=> item?.id === id)
console.log(fileredData);
+ const {
+ data,
+ isLoading: drawalRequestLoading,
+ error,
+ } = useGetDrawalRequestQuery();
+ console.log(data?.data?.rows);
const [ updateDepositRequest ] = useUpdateDepositRequestMutation()
@@ -107,10 +114,10 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id, data:requestDa
setFile(selectedFile);
};
- const { data, isLoading } =
- (id, {
- skip: !id,
- });
+ // const { data, isLoading } =
+ // (id, {
+ // skip: !id,
+ // });
useEffect(() => {
if (data) {
diff --git a/src/Pages/IO_Management/CreateIO/AddIONav.jsx b/src/Pages/IO_Management/CreateIO/AddIONav.jsx
index ad7c533..98acdf5 100644
--- a/src/Pages/IO_Management/CreateIO/AddIONav.jsx
+++ b/src/Pages/IO_Management/CreateIO/AddIONav.jsx
@@ -85,10 +85,10 @@ import { formatDatee } from "../../../Components/FormField";
});
handleClose()
}else if(res?.error?.status === 400){
- setIsLoading(false);
toast({
render: () => ,
});
+ handleClose()
}
@@ -110,6 +110,7 @@ import { formatDatee } from "../../../Components/FormField";
};
const handleClose = () => {
+ setIsLoading(false);
setAlert(false)
onClose()
reset({
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
index beaaeec..dd3159d 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
@@ -183,6 +183,8 @@ const IONAVDetails = () => {
*/}
+ {IODetails?.isInvestedAmount ? :null}
+
{IODetails?.isInvestedAmount ? :null}
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
index a3f7287..750ddc1 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
@@ -108,7 +108,7 @@ const ViewIOdetails = () => {
descriptionArabic: IObyID?.data?.descriptionArabic,
goalAmount: removeTrailingZeros(IObyID?.data?.goalAmount),
closingDate: IObyID?.data?.closingDate,
- holdingPeriod: IObyID?.data?.holdingPeriod,
+ holdingPeriod: IObyID?.dpata?.holdingPeriod,
ISIN: IObyID?.data?.ISIN,
comment: IObyID?.data?.comment,
expectedReturn: IObyID?.data?.expectedReturn,
diff --git a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx
index e7ea978..3374ad7 100644
--- a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestApprove.jsx
@@ -25,6 +25,7 @@ import {
import { useGetDepositRequestByIdQuery, useUpdateDepositRequestMutation } from "../../../Services/deposit.request.service";
import FullscreenLoaders from "../../../Components/Loaders/FullscreenLoaders";
import ToastBox from "../../../Components/ToastBox";
+import { useUpdateDrawalRequestMutation } from "../../../Services/drawal.request.service";
const FILE_TYPES = ["image/jpeg", "image/png", "image/gif"];
@@ -43,7 +44,10 @@ import {
- const [ updateDepositRequest ] = useUpdateDepositRequestMutation()
+ const [ updateDrawalRequest ] = useUpdateDrawalRequestMutation()
+
+ console.log(updateDrawalRequest);
+
const {
register,
@@ -73,7 +77,7 @@ import {
try {
- const res = await updateDepositRequest({ id ,data: formData})
+ const res = await updateDrawalRequest({ id ,data: formData})
if (res?.error) {
@@ -116,6 +120,7 @@ import {
});
}
}, [data, reset]);
+
const heandleOnClose = () =>{
reset()
@@ -155,27 +160,27 @@ import {
Investor Account Details
- Account Name:
+ Account Name:
John David
- Account No:
+ Account No:
100000345779
- IBAN:
+ IBAN:
BH 23 BBKU 00200 00048 0779
- SWIFT Code:
+ SWIFT Code:
BBKUBHBM
- Bank Name:
+ Bank Name:
Bank of Bahrain and Kuwait B.S.C
- Bank Address:
+ Bank Address:
43 Government Avenue, Manama, Kingdom of Bahrain
diff --git a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
new file mode 100644
index 0000000..5e83932
--- /dev/null
+++ b/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
@@ -0,0 +1,164 @@
+import {
+ Box,
+ Button,
+ FormControl,
+ FormLabel,
+ Input,
+ Modal,
+ ModalBody,
+ ModalCloseButton,
+ ModalContent,
+ ModalFooter,
+ ModalHeader,
+ ModalOverlay,
+ Text,
+ Textarea,
+ useDisclosure,
+ useToast,
+ } from "@chakra-ui/react";
+ import React, { useEffect, useState } from "react";
+ import * as yup from "yup";
+ import { yupResolver } from "@hookform/resolvers/yup";
+ import { useForm } from "react-hook-form";
+ import { useDepositRejectMutation } from "../../../Services/deposit.request.service";
+ import ToastBox from "../../../Components/ToastBox";
+
+ export const conformModalSchema = yup.object().shape({
+ comments: yup.string().required("Comment is required"),
+ });
+
+ const DrawalRequestReject = ({ isOpen, onClose, firstField ,id}) => {
+ const [isBtnLoading , setIsBtnLoading] = useState(false)
+
+ const toast = useToast()
+
+ const {
+ register,
+ reset,
+ handleSubmit,
+ formState: { errors },
+ } = useForm({
+ resolver: yupResolver(conformModalSchema),
+ });
+
+ const [ depositReject ] = useDepositRejectMutation()
+
+
+ const onSubmit = async(data) => {
+ setIsBtnLoading(true)
+ try {
+ const res = await depositReject({ id ,data})
+
+ if (res?.error) {
+ toast({
+ render: () => (
+
+ ),
+ });
+ setIsBtnLoading(false)
+ onClose();
+
+ }else if(res?.data?.statusCode === 200) {
+ toast({
+ render: () => (
+
+ ),
+ });
+ setIsBtnLoading(false)
+ onClose();
+
+ }
+
+ } catch (error) {
+ console.log(error);
+
+ }
+
+ };
+
+ const handleFileChange = (event) => {
+ const selectedFile = event.target.files[0];
+ setFile(selectedFile);
+ };
+
+
+ const { data, isLoading } =
+ (id, {
+ skip: !id,
+ });
+
+ useEffect(() => {
+ if (data) {
+ reset({
+ investorAmount: data?.data?.investorAmount,
+ });
+ }
+ }, [data, reset]);
+
+ const heandleOnClose = () =>{
+ reset()
+ onClose()
+ }
+
+ return (
+
+
+
+ Reject
+
+ {isLoading ? (
+
+ ) : (
+
+
+
+ Comment
+
+ {errors.comments && (
+
+ {errors.comments.message}
+
+ )}
+
+
+
+
+
+
+
+ )}
+
+
+ );
+ };
+
+ export default DrawalRequestReject;
+
\ No newline at end of file
diff --git a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
index 881b666..e2f616e 100644
--- a/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
+++ b/src/Pages/WithDrawal/DrawalRequest/PendingRequest.jsx
@@ -19,7 +19,11 @@ import CustomAlertDialog from "../../../Components/CustomAlertDialog";
import { formatDate } from "../../../Components/Functions/UTCConvertor";
import { CheckIcon, CloseIcon } from "@chakra-ui/icons";
import DrawalRequestApprove from "./DrawalRequestApprove";
-// import { formatDate } from "../../Components/Functions/UTCConvertor";
+import DrawalRequestReject from "./DrawalRequestReject";
+import { useGetDrawalRequestQuery } from "../../../Services/drawal.request.service";
+import { TABLE_PAGINATION } from "../../../Constants/Paginations";
+import NormalTable from "../../../Components/DataTable/NormalTable";
+// import DrawalRequestApprove from "./DrawalRequestApprove";
const PendingRequest = () => {
const toast = useToast();
@@ -32,11 +36,29 @@ const PendingRequest = () => {
const [mouseEntered, setMouseEntered] = useState(false);
const [mouseEnteredId, setMouseEnteredId] = useState("");
+ const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
+ const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
+
const {
isOpen: isConfirmOpen,
onOpen: onConfirmOpen,
onClose: onConfirmClose,
} = useDisclosure();
+ const {
+ isOpen: isRejectOpen,
+ onOpen: onRejectOpen,
+ onClose: onRejectClose,
+ } = useDisclosure();
+
+ const {
+ data,
+ isLoading: drawalRequestLoading,
+ error,
+ } = useGetDrawalRequestQuery({ page: currentPage, size: pageSize });
+
+ console.log(data?.data?.rows);
+
+
useEffect(() => {
@@ -50,9 +72,9 @@ const PendingRequest = () => {
}, []);
// ====================================================[Table Filter]================================================================
- const filteredData = pendingRequest.filter((item) => {
+ const filteredData = data?.data?.rows.filter((item) => {
// Filter by name (case insensitive)
- const name = item.clientId;
+ const name = item.firstName;
const searchLower = searchTerm.toLowerCase();
const nameMatches = name.toLowerCase().includes(searchLower);
@@ -66,6 +88,8 @@ const PendingRequest = () => {
// (statusFilter === "inactive" && status === false);
return nameMatches;
+
+
});
// ====================================================[Table Setup]================================================================
@@ -77,14 +101,15 @@ const PendingRequest = () => {
"Last Name",
"Country",
"Phone Number",
+ "Amount in Investor currency",
"Currency",
"Withdrawal Amount",
- "Amount in Investor currency",
"Action",
];
- const [extractedArray, setExtractedArray] = useState(
- filteredData?.map((item, index) => ({
+
+
+ const extractedArray = filteredData?.map((item, index) => ({
// id: item?.id,
"Sr.no": (
{
fontWeight={"500"}
className="d-flex align-items-center web-text-small"
>
- {item.date}
+ {formatDate(item?.createdAt)}
),
"Client ID": (
@@ -119,7 +144,7 @@ const PendingRequest = () => {
fontWeight={"500"}
className="d-flex align-items-center web-text-small"
>
- {item.clientId}
+ {item.clientReference_id}
),
"First Name": (
@@ -139,40 +164,41 @@ const PendingRequest = () => {
Country: (
- {item.country}
+ {item.countryName}
),
"Phone Number": (
- {item.phoneNumber}
+ {item.mobileNumber}
),
Currency: (
-
+
- {item.currency}
+ {/* {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} */}
+ {item?.currencyCode}
),
"Withdrawal Amount": (
-
+
- {item.withDrawalAmount}
+ {item.USDAmount}💲
),
"Amount in Investor currency": (
- {item.amountcurrency}
+ {item.investorAmount}
),
Action: (
-
+
{
color={"green.500"}
placement="left-start"
>
- {
- // setActionId(item.id);
- onConfirmOpen();
- }}
- colorScheme="forestGreen"
- color="green.500"
+
+
+
{
color={"red.500"}
placement="left-start"
>
- {
+ setActionId(item.id);
+ onRejectOpen();
+ }}
py={1}
+ // variant={"solid"}
>
-
-
+
+
),
- }))
- );
+ }));
const handleDelete = () => {
const updatedSponsors = sponser.filter(
@@ -261,16 +294,22 @@ const PendingRequest = () => {
/>
-
+
- {
id={actionId}
// firstField={firstField}
/>
+
);
};
diff --git a/src/Services/drawal.request.service.js b/src/Services/drawal.request.service.js
index 7867fed..9264f52 100644
--- a/src/Services/drawal.request.service.js
+++ b/src/Services/drawal.request.service.js
@@ -13,22 +13,22 @@ export const drawalRequest = createApi({
endpoints: (builder) => ({
getDrawalRequest: builder.query({
- query: () => `/deposit/admin/pending-requests`,
- providesTags: ["getDepositRequest"],
+ query: () => `/withdrawal/admin`,
+ providesTags: ["getDrawalRequest"],
}),
// getDepositRequestById: builder.query({
// query: (id) => `/deposit/admin/getById/${id}`,
// }),
- // updateDepositRequest: builder.mutation({
- // query: ({ id, data }) => ({
- // url: `/deposit/admin/approved/${id}`,
- // method: "PATCH",
- // body: data,
- // }),
- // invalidatesTags: ["getDepositRequest", "getDepositHistory"],
- // }),
+ updateDrawalRequest: builder.mutation({
+ query: ({ id, data }) => ({
+ url: `/withdrawal/admin/updateApprove/${id}`,
+ method: "PATCH",
+ body: data,
+ }),
+ invalidatesTags: ["getDrawalRequest", "getDepositHistory"],
+ }),
// depositReject: builder.mutation({
// query: ({ id, data }) => ({
@@ -48,5 +48,6 @@ export const drawalRequest = createApi({
// Export hooks for usage in functional components
export const {
- useGetDepositRequestQuery,
+ useGetDrawalRequestQuery,
+ useUpdateDrawalRequestMutation,
} = drawalRequest;