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 +