Merge branch 'dev' of http://git.wdipl.com/Siddhesh.More/tanami-admin-panel

2024-08-23 12:24:19 +05:30
parent b7ce3de128 97cfd45545
commit e3ccc3efbc
8 changed files with 283 additions and 59 deletions
--- 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) {
--- 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: () => <ToastBox message={res?.error?.data?.message } status={"error"} />,
          });
+          handleClose()
        }
  
  
@@ -110,6 +110,7 @@ import { formatDatee } from "../../../Components/FormField";
    };
  
    const handleClose = () => {
+      setIsLoading(false);
      setAlert(false)
      onClose()
      reset({
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
@@ -183,6 +183,8 @@ const IONAVDetails = () => {
          <Pagination totalItems={10} />
        </HStack> */}

+          {IODetails?.isInvestedAmount ? <Button onClick={onOpen} leftIcon={<AddIcon/>} colorScheme="forestGreen" size={'sm'} rounded={'sm'} fontSize={'xs'} >Add IO Cash</Button>:null}
+

 {IODetails?.isInvestedAmount ? <Button onClick={onOpen} leftIcon={<AddIcon/>} colorScheme="forestGreen" size={'sm'} rounded={'sm'} fontSize={'xs'} >Add IO Nav</Button>:null}

--- 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,
--- 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 {
                </FormControl>
                  <Heading fontSize="sm" fontWeight={600} mb={4}>Investor Account Details</Heading>
                  <Box display={"flex"} mb={3}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}>Account Name:</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2} w={"110px"}>Account Name:</Text>
                    <Text fontSize="xs" mb={0}>John David</Text>
                  </Box>
                  <Box display={"flex"} mb={3}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}>Account No:</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>Account No:</Text>
                    <Text fontSize="xs" mb={0}>100000345779</Text>
                  </Box>
                  <Box display={"flex"} mb={3}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}>IBAN:</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>IBAN:</Text>
                    <Text fontSize="xs" mb={0}>BH 23 BBKU 00200 00048 0779</Text>
                  </Box>
                  <Box display={"flex"} mb={3}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}>SWIFT Code:</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>SWIFT Code:</Text>
                    <Text fontSize="xs" mb={0}>BBKUBHBM</Text>
                  </Box>
                  <Box display={"flex"} mb={3}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}>Bank Name:</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"110px"}>Bank Name:</Text>
                    <Text fontSize="xs" mb={0}>Bank of Bahrain and Kuwait B.S.C</Text>
                  </Box>
                  <Box display={"flex"} mb={5}>
-                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}>Bank Address:</Text>
+                    <Text fontSize="xs" mb={0} fontWeight={500} me={2}  w={"120px"}>Bank Address:</Text>
                    <Text fontSize="xs" mb={0}>43 Government Avenue, Manama, Kingdom of Bahrain</Text>
                  </Box>
                <FormControl mb={4}>
--- a/src/Pages/WithDrawal/DrawalRequest/DrawalRequestReject.jsx
+++ 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: () => (
+              <ToastBox message={res?.error?.data?.message} status={"error"} />
+            ),
+          });
+          setIsBtnLoading(false)
+          onClose();
+          
+        }else if(res?.data?.statusCode === 200) {
+          toast({
+            render: () => (
+              <ToastBox message={res?.data?.message} />
+            ),
+          });
+          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 (
+      <Modal isOpen={isOpen} onClose={heandleOnClose} initialFocusRef={firstField}>
+        <ModalOverlay />
+        <ModalContent pb={4}>
+          <ModalHeader fontSize={"md"}>Reject</ModalHeader>
+          <ModalCloseButton />
+          {isLoading ? (
+            <FullscreenLoaders height={"50vh"} />
+          ) : (
+          <Box as="form" onSubmit={handleSubmit(onSubmit)}>
+            <ModalBody>
+              <FormControl mb={4} isRequired>
+                <FormLabel fontSize="sm">Comment</FormLabel>
+                <Textarea
+                  rows={6}
+                  focusBorderColor="green.400"
+                  name="comments"
+                  {...register("comments")}
+                  fontSize="sm"
+                  type="textarea"
+                  size="md"
+                  placeholder={"Enter your comments...."}
+                  rounded={"md"}
+                  resize={"none"}
+                />
+                {errors.comments && (
+                  <Text fontSize="xs" color="red">
+                    {errors.comments.message}
+                  </Text>
+                )}
+              </FormControl>
+            </ModalBody>
+            <ModalFooter>
+              <Button
+                colorScheme="gray"
+                mr={3}
+                onClick={onClose}
+                size={"sm"}
+                rounded={"sm"}
+              >
+                Cancel
+              </Button>
+              <Button
+                colorScheme="forestGreen"
+                variant="solid"
+                size={"sm"}
+                rounded={"sm"}
+                isLoading={isBtnLoading}
+                type="submit"
+              >
+                Send
+              </Button>
+            </ModalFooter>
+          </Box>
+          )}
+        </ModalContent>
+      </Modal>
+    );
+  };
+  
+  export default DrawalRequestReject;
+  
--- 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": (
        <Text
@@ -107,7 +132,7 @@ const PendingRequest = () => {
          fontWeight={"500"}
          className="d-flex align-items-center web-text-small"
        >
-          {item.date}
+         {formatDate(item?.createdAt)}
        </Text>
      ),
      "Client ID": (
@@ -119,7 +144,7 @@ const PendingRequest = () => {
          fontWeight={"500"}
          className="d-flex align-items-center web-text-small"
        >
-          {item.clientId}
+          {item.clientReference_id}
        </Text>
      ),
      "First Name": (
@@ -139,40 +164,41 @@ const PendingRequest = () => {
      Country: (
        <Box w={"70px"} isTruncated={true}>
          <Text as={"span"} color={"teal.900"}>
-            {item.country}
+            {item.countryName}
          </Text>
        </Box>
      ),
      "Phone Number": (
        <Box w={"70px"} isTruncated={true}>
          <Text as={"span"} color={"teal.900"}>
-            {item.phoneNumber}
+            {item.mobileNumber}
          </Text>
        </Box>
      ),
      Currency: (
-        <Box w={"50px"} isTruncated={true}>
+        <Box w={"60px"} isTruncated={true}>
          <Text as={"span"} color={"teal.900"}>
-            <Badge px={2} py={1}>{item.currency}</Badge>
+          {/* {parseFloat(item?.investorAmount||0).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} */}
+          <Badge ms={1} colorScheme="green">{item?.currencyCode}</Badge>  
          </Text>
        </Box>
      ),
      "Withdrawal Amount": (
-        <Box w={"50px"} isTruncated={true}>
+        <Box w={"80px"} isTruncated={true}>
          <Text as={"span"} color={"teal.900"}>
-            {item.withDrawalAmount}
+            {item.USDAmount}💲
          </Text>
        </Box>
      ),
      "Amount in Investor currency": (
        <Box w={"70px"} isTruncated={true}>
          <Text as={"span"} color={"teal.900"}>
-            {item.amountcurrency}
+            {item.investorAmount}
          </Text>
        </Box>
      ),
      Action: (
-        <Box display={"flex"} justifyContent={"space-around"} gap={2}>
+        <Box display={"flex"} justifyContent={"center"} gap={2}>
          <Tooltip
            rounded={"sm"}
            fontSize={"xs"}
@@ -181,22 +207,25 @@ const PendingRequest = () => {
            color={"green.500"}
            placement="left-start"
          >
-            <Badge
-             onClick={() => {
-              // setActionId(item.id);
-              onConfirmOpen();
-            }}
-              colorScheme="forestGreen"
-              color="green.500"
+            <Button
+              // colorScheme="forestGreen"
+              // color="green.500"
              rounded={"sm"}
              size={"xs"}
              textTransform={"inherit"}
              fontWeight={500}
              px={2}
              py={1}
+              onClick={() => {
+                setActionId(item.id);
+                onConfirmOpen();
+              }}
+              colorScheme="green"
+              variant={"solid"}
+              cursor={"pointer"}
            >
-              <CheckIcon fontSize={'12px'} />
-            </Badge>
+              <CheckIcon fontSize={"12px"} />
+            </Button>
          </Tooltip>
          <Tooltip
            rounded={"sm"}
@@ -206,23 +235,27 @@ const PendingRequest = () => {
            color={"red.500"}
            placement="left-start"
          >
-            <Badge
+            <Button
              colorScheme="red"
-              color="red.500"
+              // color="red.500"
              rounded={"sm"}
              size={"xs"}
              textTransform={"inherit"}
              fontWeight={500}
              px={2}
+              onClick={() => {
+                setActionId(item.id);
+                onRejectOpen();
+              }}
              py={1}
+            // variant={"solid"}
            >
-              <CloseIcon fontSize={'10px'} />
-            </Badge>
+              <CloseIcon fontSize={"10px"} />
+            </Button>
          </Tooltip>
        </Box>
      ),
-    }))
-  );
+    }));

  const handleDelete = () => {
    const updatedSponsors = sponser.filter(
@@ -261,16 +294,22 @@ const PendingRequest = () => {
          />

          <HStack display={"flex"} alignItems={"center"}>
-            <Pagination totalItems={10} />
+            <Pagination
+              isLoading={drawalRequestLoading}
+              pageSize={pageSize}
+              currentPage={currentPage}
+              setPageSize={setPageSize}
+              setCurrentPage={setCurrentPage}
+             />
          </HStack>
        </HStack>
      </Box>

-      <DataTable
+      <NormalTable
+        isLoading={drawalRequestLoading}
        emptyMessage={`We don't have any Sponers `}
        tableHeadRow={tableHeadRow}
        data={extractedArray}
-        isLoading={isLoading}
        viewActionId={actionId}
        setViewActionId={setActionId}
        // totalPages={10}
@@ -293,6 +332,11 @@ const PendingRequest = () => {
        id={actionId}
      // firstField={firstField}
      />
+      <DrawalRequestReject
+        isOpen={isRejectOpen}
+        onClose={onRejectClose}
+        id={actionId} 
+      />
    </Box>
  );
 };
--- 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;