{tableHeadRow.map((_, i) => (
{
+
+ // Customize colors and series titles here
+ const [options] = useState({
+ chart: {
+ width: 600,
+ type: 'donut',
+ },
+ plotOptions: {
+ pie: {
+ startAngle: -90,
+ endAngle: 270,
+ donut: {
+ size: '45%' // Adjust the donut size here (percentage of chart size)
+ }
+ }
+ },
+ labels:data?.labels,
+ dataLabels: {
+ enabled: false
+ },
+ fill: {
+ type: 'gradient',
+ },
+ colors: data?.backgroundColor, // Customize your colors here
+ legend: {
+ show: false,
+ position: 'right',
+ labels: {
+ colors: ['#000'], // Customize the color of the legend labels
+ useSeriesColors: true
+ }
+ },
+ responsive: [{
+ breakpoint: 480,
+ options: {
+ chart: {
+ width: 500
+ },
+ legend: {
+ position: 'center'
+ }
+ }
+ }]
+ });
+
+ return (
+
+ );
+};
+
+export default ApexChart;
diff --git a/src/Components/Doughnut/ApexLine.jsx b/src/Components/Doughnut/ApexLine.jsx
new file mode 100644
index 0000000..1f1ddf9
--- /dev/null
+++ b/src/Components/Doughnut/ApexLine.jsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import ReactApexChart from 'react-apexcharts';
+
+const ApexLine = () => {
+ const [series] = React.useState([{
+ name: 'Rate',
+ data: [45, 23, 70, 65, 5, 34, 32]
+ }]);
+
+ const options = {
+ chart: {
+ height: 350,
+ type: 'line',
+ toolbar: {
+ show: false // Hide the action icons
+ }
+ },
+ stroke: {
+ width: 5,
+ curve: 'smooth',
+ colors: ['#598369'], // Customize the line color here
+ markers: {
+ size: 6, // Size of markers
+ colors: ['#FF0000'], // Marker (dot) color
+ strokeColor: '#000000', // Stroke color of the marker
+ strokeWidth: 2
+ }
+ },
+ xaxis: {
+ type: 'category', // Change from 'datetime' to 'category'
+ categories: ['BH', 'KW', 'OM', 'QA', 'SA', 'UAE', 'IND'],
+ tickAmount: 7
+ },
+ title: {
+ text: 'Exchange rate currency', // Adjust the title if needed
+ align: 'left',
+ style: {
+ fontSize: '15px',
+ color: '#000',
+ fontWeight:400
+ }
+ },
+ fill: {
+ type: 'gradient',
+ gradient: {
+ shade: 'dark',
+ gradientToColors: ['#004017'],
+ shadeIntensity: 4,
+ type: 'horizontal',
+ opacityFrom: 1,
+ opacityTo: 1,
+ stops: [0, 100] // Gradient stops
+ },
+ }
+ };
+
+ return (
+
+ );
+};
+
+export default ApexLine;
diff --git a/src/Components/Doughnut/DonutChart.jsx b/src/Components/Doughnut/DonutChart.jsx
index 1ffa8b9..57a9e74 100644
--- a/src/Components/Doughnut/DonutChart.jsx
+++ b/src/Components/Doughnut/DonutChart.jsx
@@ -14,7 +14,7 @@ const DonutChart = ({ data, width = 300, height = 250 }) => {
data: data.values,
backgroundColor: [ '#3182ce', '#004118', '#D69E2E', '#E53E3E' ],
borderColor: ['#FFF'],
- borderWidth: 1,
+ borderWidth: 2,
},
],
};
diff --git a/src/Components/Doughnut/LineChart.jsx b/src/Components/Doughnut/LineChart.jsx
index 010b90f..db31867 100644
--- a/src/Components/Doughnut/LineChart.jsx
+++ b/src/Components/Doughnut/LineChart.jsx
@@ -70,7 +70,6 @@ const LineChart = ({ width = 300, height = 250 }) => {
]
};
- console.log(data);
return (
diff --git a/src/Components/DummyComponent.jsx b/src/Components/DummyComponent.jsx
index 8858bb5..56f9d5a 100644
--- a/src/Components/DummyComponent.jsx
+++ b/src/Components/DummyComponent.jsx
@@ -12,9 +12,7 @@ const DummyComponent = () => {
const handleToggle = () => {
setIsSwitchOn(!isSwitchOn);
if(audio.current){
- console.log("hit");
audio.current.play();
- console.log( audio.current);
}
};
diff --git a/src/Components/FormField.jsx b/src/Components/FormField.jsx
index 6136a90..62e6710 100644
--- a/src/Components/FormField.jsx
+++ b/src/Components/FormField.jsx
@@ -27,6 +27,7 @@ import { Controller } from "react-hook-form";
import { TiWarning } from "react-icons/ti";
import { motion } from "framer-motion";
import { AddIcon, CloseIcon } from "@chakra-ui/icons";
+import CurrencyInput from "./CurrencyInput";
const today = new Date().toISOString().split("T")[0];
@@ -474,7 +475,7 @@ const FormField = ({
{...field}
{...props}
placeholder={placeHolder ? placeHolder : label}
- textAlign={arabic || type === "number" ? "right" : align ? align : "left"}
+ textAlign={arabic ? "right" : align ? align : "left"}
_placeholder={{ fontSize: "sm" }}
min={type === "date" ? today : undefined}
maxLength={maxLength}
@@ -485,7 +486,27 @@ const FormField = ({
/>
);
- } else{
+ }else if(type === 'number'){
+ return (
+
+ );} else{
return (
{Object?.entries(groupedFields, groupedFieldsTwo).map(
([section, fields], index) => (
-
+
{section}
{/* */}
-
+
{fields.map(
({ value, label, id, width, btn, arabic, type, align }, key) =>
type === "table" ? (
-
+
{value?.map((item, index) => (
@@ -121,7 +121,7 @@ const FormInputView = ({
) : (
-
+
{label}
diff --git a/src/Components/HeaderMain.jsx b/src/Components/HeaderMain.jsx
index 5ab28c1..167754d 100644
--- a/src/Components/HeaderMain.jsx
+++ b/src/Components/HeaderMain.jsx
@@ -35,7 +35,7 @@ const HeaderMain = ({
return (
{
+ const countdown = getCountdownTimer(utcDateString);
+ console.log(countdown);
+ };
+
+ // Update countdown immediately
+ updateCountdown();
+
+ // Set up interval to update countdown every minute (60000 milliseconds)
+ setInterval(updateCountdown, 60000);
+}
+
export const getFileNameFromPath = (filePath) => {
const parts = filePath?.split("/");
return parts?.[parts?.length - 1];
diff --git a/src/Contexts/GlobalStateProvider.jsx b/src/Contexts/GlobalStateProvider.jsx
index 8b1503a..2649016 100644
--- a/src/Contexts/GlobalStateProvider.jsx
+++ b/src/Contexts/GlobalStateProvider.jsx
@@ -46,7 +46,6 @@ const GlobalStateProvider = ({ children }) => {
const [slideFromRight, setSlideFormRight] = useState(false);
const { colorMode, toggleColorMode } = useColorMode();
const [sponser, setSponser] = useState([]);
- const [ioStatus, setIoStatus] = useState([]);
const [investors, setInvestors] = useState([
{
@@ -1450,7 +1449,6 @@ const GlobalStateProvider = ({ children }) => {
},
]);
- const [IODetails, setIODetails] = useState({});
const [depositRequest, setDepositRequest] = useState([
{
@@ -1724,6 +1722,17 @@ const GlobalStateProvider = ({ children }) => {
},
]);
+
+
+
+
+
+
+
+ // ==============[ prod state ]===============================
+ const [IODetails, setIODetails] = useState(null);
+ const [ IOStatus, setIoStatus ] = useState(null)
+
return (
{
setAcademicDocuments,
iOArtifactsTwo,
setIOArtifactsTwo,
- ioStatus,
- setIoStatus,
+
+
+
+
+ IOStatus,
+ setIoStatus
}}
>
{children}
diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx
index 3bebca4..b657b98 100644
--- a/src/Layout/DefaultLayout.jsx
+++ b/src/Layout/DefaultLayout.jsx
@@ -72,6 +72,7 @@ import shield from "../assets/shield.png";
import SplashScreen from "../Pages/SplashScreen";
import CutomBreadcrumb from "../Components/CutomBreadcrumb";
import CustomBreadcrumb from "../Components/CutomBreadcrumb";
+import { getCountdownTimer } from "../Constants/Constants";
const DashboardLayout = ({ isOnline }) => {
const navigate = useNavigate();
@@ -121,6 +122,9 @@ const DashboardLayout = ({ isOnline }) => {
// dispach(loginUser(false));
setIsAuthenticate(false);
Cookies.remove("isAuthenticated");
+ localStorage.removeItem('refreshToken')
+ localStorage.removeItem('accessToken')
+ localStorage.removeItem('refreshTokenExp')
navigate("/login");
};
@@ -598,7 +602,7 @@ const DashboardLayout = ({ isOnline }) => {
-
+ */}
+ {getCountdownTimer(localStorage.getItem('accessTokenExp'))}
-
)}
diff --git a/src/Pages/Admin/BankDetails/BankDetails.jsx b/src/Pages/Admin/BankDetails/BankDetails.jsx
index 8266930..cae6253 100644
--- a/src/Pages/Admin/BankDetails/BankDetails.jsx
+++ b/src/Pages/Admin/BankDetails/BankDetails.jsx
@@ -64,7 +64,6 @@ const BankDetails = () => {
error,
} = useGetBankQuery({ page: 1, size: 10 });
- console.log(bankDetails?.data);
useEffect(() => {
// Simulate loading
@@ -115,8 +114,7 @@ const BankDetails = () => {
return nameMatches;
});
-
- console.log(bankDetails);
+
const extractedArray = filteredData?.map((item) => ({
id: item?.id,
diff --git a/src/Pages/Admin/Contact.jsx b/src/Pages/Admin/Contact.jsx
index de72d0d..e0d2fa0 100644
--- a/src/Pages/Admin/Contact.jsx
+++ b/src/Pages/Admin/Contact.jsx
@@ -120,7 +120,6 @@ const Contact = () => {
setIsLoading(true)
try {
const res = await updateContact(data)
- console.log(res?.data?.statusCode);
if (res?.data?.statusCode === 200) {
toast({
render: () => ,
diff --git a/src/Pages/Dashbaord.jsx b/src/Pages/Dashbaord.jsx
index a28aad1..cfeea3c 100644
--- a/src/Pages/Dashbaord.jsx
+++ b/src/Pages/Dashbaord.jsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Icon, Text } from '@chakra-ui/react'
+import { Box, HStack, Icon, position, Text, VStack } from '@chakra-ui/react'
import React from 'react'
import { HiOutlineChartSquareBar } from 'react-icons/hi'
import { RiMoneyDollarBoxLine } from 'react-icons/ri'
@@ -13,6 +13,9 @@ import { GoDotFill } from "react-icons/go";
import { useNavigate } from 'react-router-dom'
import LineChart from '../Components/Doughnut/LineChart'
import { PiChartLineUpDuotone } from 'react-icons/pi'
+import ApexChart from '../Components/Doughnut/ApexDonut'
+import ApexLine from '../Components/Doughnut/ApexLine'
+import ReactApexChart from 'react-apexcharts'
const Dashbaord = () => {
const navigate = useNavigate()
@@ -48,15 +51,61 @@ const Dashbaord = () => {
values: [statusData?.draft?.length, statusData?.open?.length, statusData?.processing?.length, statusData?.closed?.length]
};
+
+
+ const series1= [{
+ data: [25, 66, 41, 89, 63, 25, 44, 12, 36, 9, 54]
+ }]
+ const options1= {
+ chart: {
+ type: 'line',
+ position:"absolute",
+ right:0,
+ width: 100,
+ height: 35,
+ sparkline: {
+ enabled: true
+ }
+ },
+ tooltip: {
+ fixed: {
+ enabled: false
+ },
+ x: {
+ show: false
+ },
+ y: {
+ title: {
+ formatter: function (seriesName) {
+ return ''
+ }
+ }
+ },
+ marker: {
+ show: false
+ }
+ }
+ }
+
+
+
+
+
+
+
+
return (
isIoPreLoading || isIoLoading || isInvestorLoading ? :
- navigate("/investor-details")} boxShadow={'lg'} color={"#fff"} p={4} rounded={'xl'} w={'25%'} display={'flex'} bg={'#004118'} flexDirection={'column'} alignItems={'start'} >
+ navigate("/investor-details")} boxShadow={'lg'} color={"#fff"} p={4} rounded={'xl'} w={'25%'} display={'flex'} bg={'#004118'} flexDirection={'column'} alignItems={'start'} >
Total Investors
{investorDetails?.data?.totalItems}
+
+
+ {/* */}
navigate("/view-io")} boxShadow={'lg'} bg={'#fff'} color={"#004118"} p={3} rounded={'xl'} w={'25%'} display={'flex'} flexDirection={'column'} alignItems={'start'} >
@@ -77,22 +126,34 @@ const Dashbaord = () => {
-
-
-
- Exchange rate currency
-
+
+
+
+ Exchange rate currency
+
+ {/* */}
-
+
+
+
+
+
IO Status
-
-
+
+ {/* */}
+ {/* */}
+
+
+ {/* */}
+
+ {chartData?.labels?.map((item, index) => {item})}
+
-
- {chartData?.labels?.map((item, index) => {item})}
-
+
+
+
)
diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx
index 38dbdec..e22c959 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx
@@ -69,7 +69,6 @@ const DepositRequest = () => {
error,
} = useGetDepositRequestQuery({ page: currentPage, size: pageSize });
- console.log(data?.data?.rows);
useEffect(() => {
// Simulate loading
diff --git a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
index 517ae79..f13da64 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequestApprove.jsx
@@ -63,7 +63,7 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id }) => {
try {
const res = await updateDepositRequest({ id ,data: formData})
- console.log(res);
+
if (res?.error) {
toast({
@@ -86,13 +86,11 @@ const DepositRequestApprove = ({ isOpen, onClose, firstField, id }) => {
}
heandleOnClose();
- console.log(data);
};
const handleFileChange = (event) => {
const selectedFile = event.target.files[0];
setFile(selectedFile);
- console.log(file);
};
const { data, isLoading } =
diff --git a/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx b/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx
index 4e4578f..f5e6968 100644
--- a/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx
+++ b/src/Pages/Deposit/DepositRequest/DepositRequestReject.jsx
@@ -48,7 +48,6 @@ const DepositRequestReject = ({ isOpen, onClose, firstField ,id}) => {
setIsBtnLoading(true)
try {
const res = await depositReject({ id ,data})
- console.log(res?.data?.statusCode);
if (res?.error) {
toast({
diff --git a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx
index b7dd520..058a068 100644
--- a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx
+++ b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx
@@ -63,7 +63,6 @@ const DepositHistory = () => {
isLoading: depositHistoryLoading,
} = useGetDepositHistoryQuery({ page: currentPage, size: pageSize });
- console.log(data?.data?.rows);
useEffect(() => {
// Simulate loading
diff --git a/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx b/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx
index 521eb5c..9ada2af 100644
--- a/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx
@@ -1,243 +1,248 @@
import {
- Box,
- Button,
- Drawer,
- DrawerBody,
- DrawerCloseButton,
- DrawerContent,
- DrawerFooter,
- DrawerHeader,
- DrawerOverlay,
- FormControl,
- FormErrorMessage,
- FormLabel,
- Input,
- Stack,
- Textarea,
- useToast,
- } from "@chakra-ui/react";
- import * as yup from "yup";
- import React, { useState, useEffect } from "react";
- import { useForm, Controller } from "react-hook-form";
- import { yupResolver } from "@hookform/resolvers/yup";
- import CustomAlertDialog from "../../../Components/CustomAlertDialog";
- import { v4 as uuidv4 } from "uuid";
- import { useCreateVideoArtifactsMutation, useUpdateVideoArtifactsMutation } from "../../../Services/io.service";
- import { useParams } from "react-router-dom";
- import ToastBox from "../../../Components/ToastBox";
-
- const investmentVideoSchema = yup.object().shape({
- transactionDate: yup.string().required("Artifact name is required"),
- ioTransType_xid: yup.number().required("Artifact name is required"),
- transactionAmount: yup.number().required("Artifact name is required"),
- comments: yup.string().notRequired(),
+ Box,
+ Button,
+ Drawer,
+ DrawerBody,
+ DrawerCloseButton,
+ DrawerContent,
+ DrawerFooter,
+ DrawerHeader,
+ DrawerOverlay,
+ FormControl,
+ FormErrorMessage,
+ FormLabel,
+ Input,
+ Select,
+ Stack,
+ Textarea,
+ useToast,
+} from "@chakra-ui/react";
+import * as yup from "yup";
+import React, { useState, useEffect, useContext } from "react";
+import { useForm, Controller } from "react-hook-form";
+import { yupResolver } from "@hookform/resolvers/yup";
+import CustomAlertDialog from "../../../Components/CustomAlertDialog";
+import { v4 as uuidv4 } from "uuid";
+import { useCreateIoCashMutation, useCreateVideoArtifactsMutation, useUpdateVideoArtifactsMutation } from "../../../Services/io.service";
+import { useParams } from "react-router-dom";
+import ToastBox from "../../../Components/ToastBox";
+import GlobalStateContext from "../../../Contexts/GlobalStateContext";
+import CurrencyInput from "../../../Components/CurrencyInput";
+
+const cashDetails = yup.object().shape({
+ transactionDate: yup.string().required("Artifact name is required"),
+ ioTransType_xid: yup.number().required("Artifact name is required"),
+ transactionAmount: yup.number().required("Artifact name is required"),
+ comments: yup.string().notRequired(),
+});
+
+const AddCashDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
+ const params = useParams()
+ const id = params?.id
+ const [file, setFile] = useState("");
+ const [fileName, setFileName] = useState("");
+ const [isLoading, setIsLoading] = useState(false)
+ const [alert, setAlert] = useState(false);
+ const toast = useToast();
+
+
+
+ // ======================[ Cotext Api ]
+ const { IODetails } = useContext(GlobalStateContext);
+ const found = data?.find((item) => item?.id === actionId);
+
+
+ const [createArtifactsVideo] = useCreateVideoArtifactsMutation()
+ const [updateVideoArtifacts] = useUpdateVideoArtifactsMutation()
+ // const {
+ // data
+ // } = useGetArtifactsQuery(id)
+
+ const {
+ control,
+ handleSubmit,
+ watch,
+ reset,
+ formState: { errors },
+ } = useForm({
+ resolver: yupResolver(cashDetails),
});
-
- const AddCashDetails = ({ isOpen, onClose, firstField, actionId, setActionId, data}) => {
- const params = useParams()
- const id = params?.id
- const [file, setFile] = useState("");
- const [fileName, setFileName] = useState("");
- const [ isLoading, setIsLoading] = useState(false)
- const [alert, setAlert] = useState(false);
- const toast = useToast();
-
-
- const found = data?.find((item) => item?.id === actionId);
- console.log(found);
-
- const [ createArtifactsVideo ] = useCreateVideoArtifactsMutation()
- const [ updateVideoArtifacts ] = useUpdateVideoArtifactsMutation()
- // const {
- // data
- // } = useGetArtifactsQuery(id)
-
- const {
- control,
- handleSubmit,
- watch,
- reset,
- formState: { errors },
- } = useForm({
- resolver: yupResolver(investmentVideoSchema),
- });
-
-
-
-
- const onSubmit = async (data) => {
- console.log(data);
-
- // setIsLoading(true)
-
-
-
- // try {
-
-
- // if (found) {
- // const res = await updateVideoArtifacts({data, id: found?.id})
- // if (res?.data?.statusCode === 200) {
- // toast({
- // render: () => ,
- // });
- // setAlert(false);
- // setIsLoading(false)
- // handleClose();
- // }
- // } else {
-
- // const res = await createArtifactsVideo({data, id})
- // if (res?.data?.statusCode === 200) {
- // toast({
- // render: () => ,
- // });
- // setAlert(false);
- // setIsLoading(false)
- // handleClose();
- // }
-
- // }
-
-
- // } catch (error) {
- // console.log(error);
-
- // }
-
- };
-
-
-
- const handleConfirm = () => {
- handleSubmit(onSubmit)();
- };
-
- const handleSave = () => {
- handleSubmit(onSubmit)();
- };
-
- const handleClose = () => {
- onClose()
- reset()
+
+
+ const [createIoCash] = useCreateIoCashMutation()
+
+
+ const onSubmit = async (data) => {
+
+ setIsLoading(true)
+
+ try {
+
+ const res = await createIoCash({ data, id })
+ if (res?.data?.statusCode === 200) {
+ setIsLoading(false);
+ toast({
+ render: () => ,
+ });
+ handleClose()
+ }else if(res?.error?.status === 400){
+ setIsLoading(false);
+ toast({
+ render: () => ,
+ });
+ }
+
+
+ } catch (error) {
+ console.log(error);
+
}
-
- return (
- <>
-
-
-
-
- IO Cash Details
-
-
-
-
- Date Selection
- (
-
- )}
- />
-
- {errors.transactionDate?.message}
-
-
-
-
- Cash transaction
- (
-
- )}
- />
-
- {errors.ioTransType_xid?.message}
-
-
-
-
-
-
- Transaction Amount
- (
-
- )}
- />
-
- {errors.transactionAmount?.message}
-
-
-
-
-
-
- Comments
- (
-
- )}
- />
-
- {errors.comments?.message}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- setAlert(false)}
- alertHandler={handleSave}
- message={"Are you sure you want to add cash details?"}
- isLoading={isLoading}
- />
-
- );
};
-
- export default AddCashDetails;
-
\ No newline at end of file
+
+
+
+ const handleConfirm = () => {
+ handleSubmit(onSubmit)();
+ };
+
+ const handleSave = () => {
+ handleSubmit(onSubmit)();
+ };
+
+ const handleClose = () => {
+ setAlert(false)
+ onClose()
+ reset()
+ }
+
+ return (
+ <>
+
+
+
+
+ IO Cash Details
+
+
+
+
+ Date Selection
+ (
+
+ )}
+ />
+
+ {errors.transactionDate?.message}
+
+
+
+
+
+ Cash transaction
+ (
+
+ )}
+ />
+
+ {errors.ioTransType_xid?.message}
+
+
+
+
+
+
+
+ Transaction Amount
+ (
+
+ )}
+ />
+
+ {errors.transactionAmount?.message}
+
+
+
+
+
+
+ Comments
+ (
+
+ )}
+ />
+
+ {errors.comments?.message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ setAlert(false)}
+ alertHandler={handleSave}
+ message={"Are you sure you want to add cash details?"}
+ isLoading={isLoading}
+ />
+
+ );
+};
+
+export default AddCashDetails;
diff --git a/src/Pages/IO_Management/CreateIO/CreateIO.jsx b/src/Pages/IO_Management/CreateIO/CreateIO.jsx
index 98b9f8a..039e3a9 100644
--- a/src/Pages/IO_Management/CreateIO/CreateIO.jsx
+++ b/src/Pages/IO_Management/CreateIO/CreateIO.jsx
@@ -91,15 +91,15 @@ const CreateIO = () => {
height={"100vh"}
pb={10}
>
-
+ {id &&
{/* navigate(-1)}
style={{ fontSize: "15px", cursor: "pointer" }}
>
Back
*/}
-
-
+
+ }
setActiveIndex(index)}
diff --git a/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx b/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx
index 391cdc0..850aed0 100644
--- a/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOArtifacts.jsx
@@ -107,7 +107,6 @@ const IOArtifacts = ({ enableNextTab, index, data }) => {
setIsLoadingBtn(true);
try {
const res = await deleteVideoArtifacts(id);
- console.log(res?.data?.statusCode);
if (res?.data?.statusCode === 200) {
setDeleteAlertVideo(false);
setIsLoadingBtn(false);
@@ -121,7 +120,6 @@ const IOArtifacts = ({ enableNextTab, index, data }) => {
setIsLoadingBtn(true);
try {
const res = await deleteImageArtifacts(id);
- console.log(res?.data?.statusCode);
if (res?.data?.statusCode === 200) {
setDeleteAlertImage(false);
setIsLoadingBtn(false);
diff --git a/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx b/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
index 69c3091..52d91d2 100644
--- a/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOArtifactsVideo.jsx
@@ -30,21 +30,22 @@ const investmentVideoSchema = yup.object().shape({
artifactStreamingURL: yup.string().required("Artifact streaming URL is required").url("Invalid URL format"),
});
-const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, data}) => {
+const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, data }) => {
const params = useParams()
const id = params?.id
const [file, setFile] = useState("");
const [fileName, setFileName] = useState("");
- const [ isLoading, setIsLoading] = useState(false)
+ const [isLoading, setIsLoading] = useState(false)
const [alert, setAlert] = useState(false);
const toast = useToast();
const found = data?.find((item) => item?.id === actionId);
- console.log(found);
+ console.log(actionId);
- const [ createArtifactsVideo ] = useCreateVideoArtifactsMutation()
- const [ updateVideoArtifacts ] = useUpdateVideoArtifactsMutation()
+
+ const [createArtifactsVideo] = useCreateVideoArtifactsMutation()
+ const [updateVideoArtifacts] = useUpdateVideoArtifactsMutation()
// const {
// data
// } = useGetArtifactsQuery(id)
@@ -63,7 +64,7 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, d
// useEffect to reset the form when `found` changes
useEffect(() => {
- if (found) {
+ if (found && actionId) {
reset({
artifactName: found?.artifactName,
artifactStreamingURL: found?.artifactStreamingURL,
@@ -71,8 +72,6 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, d
}
}, [found, reset]);
- console.log(watch());
-
const onSubmit = async (data) => {
setIsLoading(true)
@@ -80,38 +79,39 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, d
try {
-
+
if (found) {
- const res = await updateVideoArtifacts({data, id: found?.id})
+ const res = await updateVideoArtifacts({ data, id: found?.id })
if (res?.data?.statusCode === 200) {
toast({
render: () => ,
- });
- setAlert(false);
- setIsLoading(false)
- handleClose();
+ });
+ setAlert(false);
+ setIsLoading(false)
+ handleClose();
}
} else {
- const res = await createArtifactsVideo({data, id})
+ const res = await createArtifactsVideo({ data, id })
if (res?.data?.statusCode === 200) {
toast({
render: () => ,
- });
- setAlert(false);
- setIsLoading(false)
- handleClose();
+ });
+ setAlert(false);
+ setIsLoading(false)
+ setActionId(false);
+ handleClose();
}
-
+
}
-
+
} catch (error) {
console.log(error);
-
+
}
-
+
};
@@ -128,12 +128,16 @@ const IOArtifactsAdd = ({ isOpen, onClose, firstField, actionId, setActionId, d
onClose()
reset()
setActionId(false);
+ reset({
+ artifactName: "",
+ artifactStreamingURL: "",
+ });
}
return (
<>
-
+
setAlert(false)}
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx
index ef3cc51..4433329 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx
@@ -1,4 +1,5 @@
import {
+ Avatar,
Box,
Button,
HStack,
@@ -14,7 +15,7 @@ import {
} from "@chakra-ui/react";
import React, { useContext, useEffect, useRef, useState } from "react";
import { OPACITY_ON_LOAD } from "../../../Layout/animations";
-import DataTable from "../../../Components/DataTable/DataTable";
+import NormalTable from "../../../Components/DataTable/NormalTable";
import Pagination from "../../../Components/Pagination";
import GlobalStateContext from "../../../Contexts/GlobalStateContext";
import CustomAlertDialog from "../../../Components/CustomAlertDialog";
@@ -29,8 +30,7 @@ const IOCashDetails = () => {
const toast = useToast();
const firstField = useRef();
const { isOpen, onOpen, onClose } = useDisclosure();
- const { caseDetails, setCaseDetails, slideFromRight } =
- useContext(GlobalStateContext);
+ const { caseDetails, setCaseDetails, IODetails } = useContext(GlobalStateContext);
const [searchTerm, setSearchTerm] = useState("");
const [isLoading, setIsLoading] = useState(true);
const [deleteAlert, setDeleteAlert] = useState(false);
@@ -57,7 +57,7 @@ const IOCashDetails = () => {
// Table setup
const tableHeadRow = [
"Date",
- "Particulars",
+ "Transaction type",
"Amount",
"Comments",
"Update by ",
@@ -76,52 +76,52 @@ const IOCashDetails = () => {
}, 300);
// Table filter
- const filteredData = caseDetails.filter((item) => {
- const name = item.date;
+ const filteredData = IODetails?.ioCashHistory?.filter((item) => {
+ const name = item.transactionType;
const searchLower = searchTerm.toLowerCase();
const nameMatches = name.toLowerCase().includes(searchLower);
return nameMatches;
});
- const [ extractedArray, setExtractedArray ] = useState(filteredData?.map((item, index) => ({
+ const extractedArray = filteredData?.map((item, index) => ({
id: item?.id,
"Date": (
- {item.date}
+ {item?.transactionDate}
),
- "Particulars": (
+ "Transaction type": (
- {item.particulars}
+ {item?.transactionType}
),
"Amount": (
- {item.amount}
+ {item.transactionAmount}
),
"Comments": (
{
),
"Update by ": (
- {item.updateBy}
+
+ {item.creator?.firstName}
),
"Update On": (
{
{item.updateOn}
),
- })));
+ }));
const handleDelete = () => {
const updatedSponsors = sponser.filter(
@@ -266,17 +268,16 @@ const IOCashDetails = () => {
/>
-
+ {IODetails?.isInvestedAmount ? :null}
- {
const id = params?.id;
// ======================[ Cotext Api ]
- const { investmentType, sponser, IODetails, setIODetails } =
+ const { investmentType, sponser, setIOStatus, setIODetails } =
useContext(GlobalStateContext);
// ======================[ RTK Querry Api ]
@@ -129,6 +135,7 @@ const IODetails = ({ enableNextTab, index, data }) => {
} = useGetIOByIdQuery(id, { skip: !id });
+
const [creatIO] = useCreateIOMutation();
const [updateIO] = useUpdateIOMutation();
@@ -209,9 +216,10 @@ const IODetails = ({ enableNextTab, index, data }) => {
comment: IObyID?.data?.comment,
expectedReturn: IObyID?.data?.expectedReturn,
investmentType_xid: IObyID?.data?.investmentType_xid,
- investmentType_xid: IObyID?.data?.investmentType_xid,
InvestmentDetails: IObyID?.data?.InvestmentDetails,
minInvestmentAmount: IObyID?.data?.minInvestmentAmount,
+ holdingPeriodArabic: IObyID?.data?.minInvestmentAmount,
+ expectedReturnArabic: IObyID?.data?.minInvestmentAmount,
});
}
}, [id, IObyID]);
@@ -262,6 +270,51 @@ const IODetails = ({ enableNextTab, index, data }) => {
width: "49%",
},
+ {
+ label: "Holding Period",
+ name: "holdingPeriod",
+ type: "text",
+ placeHolder: "1Y",
+ isRequired: true,
+ section: " ",
+ width: "49%",
+ value: IObyID?.data?.holdingPeriod,
+ },
+ {
+ label: "Holding Period (Arabic)",
+ name: "holdingPeriodArabic",
+ type: "text",
+ placeHolder: "1Y",
+ isRequired: true,
+ arabic: true,
+ section: " ",
+ width: "49%",
+ value: IObyID?.data?.holdingPeriodArabic,
+ },
+
+
+ {
+ label: "Expected Return",
+ name: "expectedReturn",
+ type: "text",
+ isRequired: true,
+ section: " ",
+ width: "49%",
+ value: IObyID?.data?.expectedReturn,
+ },
+
+ {
+ label: "Expected Return (Arabic)",
+ name: "expectedReturnArabic",
+ type: "text",
+ isRequired: true,
+ arabic: true,
+ section: " ",
+ width: "49%",
+ value: IObyID?.data?.expectedReturnArabic,
+ },
+
+
{
label: "Investment Type",
placeHolder: "Select option",
@@ -305,25 +358,6 @@ const IODetails = ({ enableNextTab, index, data }) => {
dateValue:formatDatee(IObyID?.data?.closingDate),
// helperText: IObyID && `Current closing date is : ${formatDate(IObyID?.data?.closingDate)}`
},
- {
- label: "Holding Period",
- name: "holdingPeriod",
- type: "text",
- placeHolder: "1Y",
- isRequired: true,
- section: " ",
- width: "32.3%",
- value: IObyID?.data?.holdingPeriod,
- },
- {
- label: "Expected Return",
- name: "expectedReturn",
- type: "text",
- isRequired: true,
- section: " ",
- width: "32.3%",
- value: IObyID?.data?.expectedReturn,
- },
{
label: "ISIN",
placeHolder: "",
@@ -352,7 +386,6 @@ const IODetails = ({ enableNextTab, index, data }) => {
width: "100%",
isRequired: true,
options: investmentTypeOptions,
- type: "table",
handleInputChange: handleInputChange,
value: values,
},
diff --git a/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx b/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx
index 4b7f1d8..4ab2590 100644
--- a/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx
+++ b/src/Pages/IO_Management/CreateIO/InvestmentDocument.jsx
@@ -36,7 +36,6 @@ import { TbFileTypeDocx } from "react-icons/tb";
import SetDisplayOrder from "./SetDisplayOrder";
const downloadFile = (filePath, fileName) => {
- console.log("https://tanami.betadelivery.com/" + filePath);
fetch("https://tanami.betadelivery.com/" + filePath)
.then((response) => {
@@ -72,10 +71,10 @@ const downloadFile = (filePath, fileName) => {
});
};
-const InvestmentDocument = ({ control, errors, enableNextTab, index }) => {
+const InvestmentDocument = ({ control, errors, enableNextTab, index, }) => {
const params = useParams();
const id = params?.id;
- const { slideFromRight, create, setCreate } = useContext(GlobalStateContext);
+ const { slideFromRight, create, setCreate, IODetails } = useContext(GlobalStateContext);
const firstField = useRef();
const secondField = useRef();
const thirdField = useRef();
@@ -101,13 +100,18 @@ const InvestmentDocument = ({ control, errors, enableNextTab, index }) => {
const [deleteIODocs] = useDeleteIODocsMutation();
- const {
- data,
- error,
- isLoading: isIODocLoading,
- } = useGetInvestmentDocumentsQuery(id, {
- skip: !id,
- });
+ // const {
+ // data,
+ // error,
+ // isLoading: isIODocLoading,
+ // } = useGetInvestmentDocumentsQuery(id, {
+ // skip: !id,
+ // });
+
+
+
+
+
const tableHeadRow = ["Sr.no", "Type", "File Name", "Document", "Action"];
@@ -126,7 +130,7 @@ const InvestmentDocument = ({ control, errors, enableNextTab, index }) => {
});
}, 300);
- const filteredData = data?.data?.filter((item) =>
+ const filteredData = IODetails?.documents?.filter((item) =>
item?.documentName?.toLowerCase().includes(searchTerm.toLowerCase())
);
@@ -319,7 +323,7 @@ const InvestmentDocument = ({ control, errors, enableNextTab, index }) => {
secondField={secondField}
/>
{
const toast = useToast();
const params = useParams();
- // =====================[ variables ]
+ // =====================[ variables ]
const id = params?.id;
- const { data, isLoading, error } = useGetKeyMeritsQuery(id, {
- skip: !id,
- });
+ // const { data, isLoading, error } = useGetKeyMeritsQuery(id, {
+ // skip: !id,
+ // });
- console.log(data?.data);
+ const { IODetails} = useContext(GlobalStateContext);
- const { keyMerits, setKeyMerits, slideFromRight } =
- useContext(GlobalStateContext);
+
+
const firstField = useRef();
const [searchTerm, setSearchTerm] = useState("");
@@ -66,20 +66,9 @@ const KeyMerits = ({ enableNextTab, index, data: prepopData }) => {
const tableHeadRow = ["Sr.no", "Title", "Sub title", "Icon", "Action"];
- const handleUpdateStatus = debounce((id) => {
- setKeyMerits((prevKeyMerits) =>
- prevKeyMerits.map((keyMerits) =>
- keyMerits.id === id
- ? { ...keyMerits, status: !keyMerits.status }
- : keyMerits
- )
- );
- toast({
- render: () => ,
- });
- }, 300);
- const filteredData = data?.data?.filter((item) => {
+
+ const filteredData = IODetails?.keyMerits?.filter((item) => {
// Filter by name (case insensitive)
const name = item.meritsHeader;
const searchLower = searchTerm.toLowerCase();
@@ -111,7 +100,7 @@ const KeyMerits = ({ enableNextTab, index, data: prepopData }) => {
id: item.id,
"Sr.no": (
{
),
Title: (
{
),
}));
- return isLoading ? (
+ return false ? (
) : (
@@ -269,7 +258,7 @@ const KeyMerits = ({ enableNextTab, index, data: prepopData }) => {
isOpen={isEditOpen}
onClose={onEditCloseOpen}
firstField={firstField}
- data={data?.data}
+ data={IODetails?.keyMerits}
/>
{
const [updateInvestmentDocuments] = useUpdateInvestmentDocumentsMutation();
// =====================[ variables ]
- // const id = params?.id;
- console.log(id);
- console.log(data);
const filterObject = data?.find((item) => item?.id === id);
- console.log(filterObject);
-
const getFileTitle = (type) => {
switch (type) {
case "application/pdf":
@@ -74,12 +69,16 @@ const InvestmentEdit = ({ isOpen, onClose, thirdField, id, data }) => {
resolver: yupResolver(investmentDocSchema),
});
+ console.log(errors);
+
+
// useEffect to reset the form when `found` changes
useEffect(() => {
if (filterObject) {
reset({
document: filterObject?.documentPath,
fileName: filterObject?.documentName,
+ documentNameArabic: filterObject?.documentNameArabic,
});
}
}, [filterObject, reset]);
@@ -89,6 +88,7 @@ const InvestmentEdit = ({ isOpen, onClose, thirdField, id, data }) => {
reset({
fileName: filteredObject?.fileName,
document: filteredObject?.document,
+ documentNameArabic: filterObject?.documentNameArabic,
Type: filteredObject?.Type,
});
}
@@ -158,6 +158,7 @@ const InvestmentEdit = ({ isOpen, onClose, thirdField, id, data }) => {
if (Object.keys(errors).length === 0) {
const formData = new FormData();
formData.append("documentName", data.fileName);
+ formData.append("documentNameArabic", data.documentNameArabic);
typeof data?.document !== "string"
? formData.append("document", data?.document[0])
: null;
@@ -171,7 +172,6 @@ const InvestmentEdit = ({ isOpen, onClose, thirdField, id, data }) => {
setFile(selectedFile);
};
- console.log(filteredObject);
return (
{
)}
+
+
+
+
+
+ File Name ( Arabic )
+
+ {errors.documentNameArabic && (
+
+ {errors.documentNameArabic.message}
+
+ )}
+
+
Document
{
className="form-control"
type="file"
size="sm"
+ accept=".pdf, .doc, .docx"
onChange={handleFileChange}
/>
{errors.document && (
diff --git a/src/Pages/IO_Management/IOArtifactsAdd.jsx b/src/Pages/IO_Management/IOArtifactsAdd.jsx
index 513a196..c8a2ced 100644
--- a/src/Pages/IO_Management/IOArtifactsAdd.jsx
+++ b/src/Pages/IO_Management/IOArtifactsAdd.jsx
@@ -41,8 +41,6 @@ const IOArtifactsAdd = ({
setActionId,
data,
}) => {
- console.log(actionId);
- console.log(data);
const params = useParams();
const id = params?.id;
const [file, setFile] = useState(null);
@@ -55,7 +53,7 @@ const IOArtifactsAdd = ({
const [updateImageArtifacts] = useUpdateImageArtifactsMutation();
const found = data?.find((item) => item?.id === actionId);
- console.log(found);
+
const {
control,
@@ -78,7 +76,6 @@ const IOArtifactsAdd = ({
}
}, [found, reset]);
- console.log(watch());
const onSubmit = async (data) => {
setIsLoading(true);
@@ -86,19 +83,12 @@ const IOArtifactsAdd = ({
formData.append("artifactName", data.artifactName);
file && formData.append("artifactPathName", file); // Assuming artifactPathName is an array of files
-
- console.log("FormData:", formData);
- for (let [key, value] of formData.entries()) {
- console.log(`${key}:`, value);
- }
-
try {
if (found) {
const res = await updateImageArtifacts({
data: formData,
id: found?.id,
});
- console.log(res?.error);
if (res?.data?.statusCode === 200) {
toast({
render: () => ,
diff --git a/src/Pages/IO_Management/InvestmentDocuments.jsx b/src/Pages/IO_Management/InvestmentDocuments.jsx
index 3a37bb5..587c5a1 100644
--- a/src/Pages/IO_Management/InvestmentDocuments.jsx
+++ b/src/Pages/IO_Management/InvestmentDocuments.jsx
@@ -59,6 +59,7 @@ export const investmentDocSchema = yup.object().shape({
// return value && value.size <= 2 * 1024 * 1024; // 2MB in bytes
// })
fileName: yup.string().required("File name is required"),
+ documentNameArabic: yup.string().required("File name Arabic is required")
});
const InvestmentDocuments = ({
@@ -94,11 +95,10 @@ const InvestmentDocuments = ({
});
const onSubmit = async (data) => {
- console.log("sibmited");
- console.log(errors);
if (Object.keys(errors).length === 0) {
const formData = new FormData();
formData.append("documentName", data.fileName);
+ formData.append("documentNameArabic", data.documentNameArabic);
formData.append("document", data?.document[0]);
setFormData(formData);
setAlert(true);
@@ -109,7 +109,7 @@ const InvestmentDocuments = ({
setIsLoading(true);
try {
const res = await createInvestmentDocument({ data: formData, id });
- console.log(res);
+
if (res?.error) {
toast({
render: () => (
@@ -214,6 +214,27 @@ const InvestmentDocuments = ({
)}
+
+
+
+ File Name ( Arabic )
+
+ {errors.documentNameArabic && (
+
+ {errors.documentNameArabic.message}
+
+ )}
+
+
+
+
Document
{
const onSubmit = (data) => {
if (Object.keys(errors).length === 0) {
- console.log("hit");
setFormData(data);
setAlert(true);
}
@@ -135,7 +134,6 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => {
const handleFileChange = (e) => {
const file = e.target.files[0];
- console.log(file);
if (file) {
setFile(URL.createObjectURL(file));
}
@@ -296,12 +294,12 @@ const KeyMeritsAdd = ({ isOpen, onClose, firstField, id, icons }) => {
}
>
- {" "}
+ />}{" "}
{selectedIcon}
diff --git a/src/Pages/IO_Management/KeyMeritsEdit.jsx b/src/Pages/IO_Management/KeyMeritsEdit.jsx
index 6b241f4..557f8dc 100644
--- a/src/Pages/IO_Management/KeyMeritsEdit.jsx
+++ b/src/Pages/IO_Management/KeyMeritsEdit.jsx
@@ -133,7 +133,6 @@ const KeyMeritsEdit = ({
handleSubmit(onSubmit)();
};
- console.log(errors);
const handleIconSelect = (id, iconName, iconFilePath) => {
setValue("icon_xid", id);
@@ -280,12 +279,12 @@ const KeyMeritsEdit = ({
}
>
- {" "}
+ />}{" "}
{selectedIcon}
diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIONav.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIONav.jsx
index 526ab5e..ab4b400 100644
--- a/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIONav.jsx
+++ b/src/Pages/IO_Management/ViewIO/HeaderModal/UpdateIONav.jsx
@@ -2,6 +2,7 @@ import {
Box,
Button,
FormControl,
+ FormErrorMessage,
FormLabel,
Input,
Modal,
@@ -11,52 +12,168 @@ import {
ModalFooter,
ModalHeader,
ModalOverlay,
+ Select,
+ Stack,
Text,
Textarea,
+ useToast,
} from "@chakra-ui/react";
+import { useContext, useState } from "react";
+import * as yup from "yup";
+import GlobalStateContext from "../../../../Contexts/GlobalStateContext";
+import { Controller, useForm } from "react-hook-form";
+import { yupResolver } from "@hookform/resolvers/yup";
+import CurrencyInput from "../../../../Components/CurrencyInput";
+import { useCreateIoNavMutation } from "../../../../Services/io.service";
+import ToastBox from "../../../../Components/ToastBox";
+import { useParams } from "react-router-dom";
+import { formatDatee } from "../../../../Components/FormField";
+
+const ioNav = yup.object().shape({
+ transactionDate: yup.string().required("Artifact name is required"),
+ ioTransType_xid: yup.number().required("Artifact name is required"),
+ transactionAmount: yup.number().required("Artifact name is required"),
+ comments: yup.string().notRequired(),
+});
const UpdateIONav = ({ isOpen, onClose }) => {
+ const params = useParams()
+ const toast = useToast();
+ const id = params?.id
+ const { IODetails } = useContext(GlobalStateContext);
+ const [isLoading, setIsLoading] = useState(false)
+ const {
+ control,
+ handleSubmit,
+ watch,
+ reset,
+ formState: { errors },
+ } = useForm({
+ resolver: yupResolver(ioNav),
+ });
+
+
+ const [createIoNav] = useCreateIoNavMutation()
+
+
+ const onSubmit = async (data) => {
+ setIsLoading(true);
+ try {
+ const res = await createIoNav({ data, id })
+ if (res?.data?.statusCode === 201) {
+ setIsLoading(false);
+ toast({
+ render: () => ,
+ });
+ handleClose()
+ } else if (res?.error?.status === 400) {
+ setIsLoading(false);
+ toast({
+ render: () => ,
+ });
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ }
+
+
+
+
+
+ const handleClose = () => {
+ onClose()
+ reset()
+ }
+
+
+const today = formatDatee(new Date(), 'yyyy-MM-dd');
+
+
return (
-
+
Update iO NAV Transaction
-
-
- Date
-
-
-
-
- Amount
-
-
+
+
+ Date Selection
+ (
+
+ )}
+ />
+
+ {errors.transactionDate?.message}
+
+
-
-
- Comments
-
-
-
+
+
+ Cash transaction
+ (
+
+ )}
+ />
+
+ {errors.ioTransType_xid?.message}
+
+
+
+
+
+
+
+ Transaction Amount
+ (
+
+ )}
+ />
+
+ {errors.transactionAmount?.message}
+
+
+
+
+
+
+ Comments
+ (
+
+ )}
+ />
+
+ {errors.comments?.message}
+
+
+
-
),
"Goal Amount": (
-
-
- {item.goalAmount ? item.goalAmount : "---"}
+
+
+ {item.goalAmount ? formatCurrency(item.goalAmount) : "---"}
),
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
index 0f69626..607eb88 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdataHeader.jsx
@@ -40,14 +40,13 @@ import Cancle from "./HeaderModal/Cancle";
import { AddIcon } from "@chakra-ui/icons";
import { GrGallery } from "react-icons/gr";
-const ViewIOdataHeader = () => {
+const ViewIOdataHeader = ({data}) => {
const params = useParams();
const id = params?.id;
const { isOpen, onOpen, onClose } = useDisclosure();
const btnRef = useRef();
const { IODetails } = useContext(GlobalStateContext);
-
-
+
const {
isOpen: isInvestmentOpen,
onOpen: onInvestmentOpen,
@@ -88,16 +87,13 @@ const ViewIOdataHeader = () => {
onOpen: onCancleOpen,
onClose: onCancleClose,
} = useDisclosure();
-
const bg = {
bg: "#fff",
};
-
const hover = {
textDecoration: "underline",
background: "#fff",
};
-
const style = {
fontSize: "0.875rem",
fontWeight: "400",
@@ -111,45 +107,54 @@ const ViewIOdataHeader = () => {
title:"Amount Invested",
onClickFunction: onInvestmentOpen
},
- {
- id:2,
- title:"Fees & Expenses",
- onClickFunction:onFeesOpen
- },
- {
- id:3,
- title:"Distribution from Sponsors",
- onClickFunction:onDistSponsorOpen
- },
- {
- id:4,
- title:"Distribution To investors",
- onClickFunction:onDistInvestorOpen
- },
- {
- id:5,
- title:"Update iO NAV",
- onClickFunction:onUpdateNavOpen
- },
+ // {
+ // id:2,
+ // title:"Fees & Expenses",
+ // onClickFunction:onFeesOpen
+ // },
+ // {
+ // id:3,
+ // title:"Distribution From Sponsors",
+ // onClickFunction:onDistSponsorOpen
+ // },
{
id:6,
+ title:"Distribution To Investors",
+ onClickFunction:onDistInvestorOpen
+ },
+ // {
+ // id:5,
+ // title:"Update IO NAV",
+ // onClickFunction:onUpdateNavOpen
+ // },
+ {
+ id:8,
title:"Exit",
onClickFunction:onExitOpen
},
{
- id:7,
+ id:9,
title:"Cancel",
onClickFunction:onCancleOpen
},
{
- id:8,
- title:"Update iO status",
+ id:10,
+ title:"Update IO Status",
onClickFunction:onUpdateStatusOpen
},
]
+ // console.log(IODetails?.mainTranscation);
+// Extract titles from apiTransaction
+const apiTransactionTitles = IODetails?.mainTranscation?.map(transaction => transaction.id);
+// Filter menu items
+const filteredMenu = menu?.filter(item => apiTransactionTitles?.includes(item.id));
+console.log(filteredMenu);
+
+
+
@@ -202,7 +207,6 @@ const ViewIOdataHeader = () => {
)}
-
IO Name
@@ -254,6 +258,7 @@ const ViewIOdataHeader = () => {
: "---"}
+
IO NAV
@@ -262,6 +267,7 @@ const ViewIOdataHeader = () => {
{IODetails?.currentValuation ? IODetails?.currentValuation : "00.00"}
+
IO cash
@@ -270,6 +276,7 @@ const ViewIOdataHeader = () => {
{IODetails?.ioCash ? IODetails?.ioCash : "00.00"}
+
IO MV NAV
@@ -309,11 +316,9 @@ const ViewIOdataHeader = () => {
Tansaction
- {
- menu?.map(({id, title, onClickFunction})=>)}
@@ -336,10 +341,12 @@ const ViewIOdataHeader = () => {
/>
+
);
};
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
index 0ed3eb7..015655f 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx
@@ -11,6 +11,7 @@ import { useGetIOByIdQuery } from "../../../Services/io.service";
import * as yup from "yup";
import { yupResolver } from "@hookform/resolvers/yup";
import { formatDate } from "../../Master/Sponser/Sponsers";
+import { formatCurrency } from "../../../Components/CurrencyInput";
const schema = yup.object().shape({
investmentNameEnglish: yup
@@ -111,13 +112,11 @@ const ViewIOdetails = () => {
comment: IObyID?.data?.comment,
expectedReturn: IObyID?.data?.expectedReturn,
investmentType_xid: IObyID?.data?.investmentType_xid,
- investmentType_xid: IObyID?.data?.investmentType_xid,
InvestmentDetails: IObyID?.data?.InvestmentDetails,
minInvestmentAmount: IObyID?.data?.minInvestmentAmount,
});
}
}, [id, IObyID]);
- console.log(IObyID);
const minInvestmentById = IObyID?.data?.minInvestmentAmt?.map(({minInvestmentAmt, country, id})=>{
return{
@@ -177,6 +176,61 @@ const ViewIOdetails = () => {
section: " ",
width: "49%",
},
+
+ {
+ label: "Holding Period",
+ name: "holdingPeriod",
+ value: IObyID?.data?.holdingPeriod ? IObyID?.data?.holdingPeriod : "---",
+ type: "text",
+ isRequired: true,
+ placeHolder: "1Y",
+ section: " ",
+ width: "49%",
+ },
+ {
+ label: "Holding Period (Arabic)",
+ name: "holdingPeriodArabic",
+ value: IObyID?.data?.holdingPeriodArabic ? IObyID?.data?.holdingPeriodArabic : "---",
+ type: "text",
+ isRequired: true,
+ arabic: true,
+ placeHolder: "1Y",
+ section: " ",
+ width: "49%",
+ },
+
+
+
+ {
+ label: "Expected Return",
+ placeHolder: "$00.00",
+ name: "expectedReturn",
+ type: "number",
+ isRequired: true,
+ value: IObyID?.data?.expectedReturn
+ ? IObyID?.data?.expectedReturn
+ : "---",
+ section: " ",
+ width: "49%",
+ },
+
+ {
+ label: "Expected Return (Arabic)",
+ name: "expectedReturnArabic",
+ placeHolder: "$00.00",
+ type: "number",
+ isRequired: true,
+ arabic: true,
+ value: IObyID?.data?.expectedReturnArabic
+ ? IObyID?.data?.expectedReturnArabic
+ : "---",
+ section: " ",
+ width: "49%",
+ },
+
+
+
+
{
label: "Investment Type",
placeHolder: "Select option",
@@ -204,10 +258,11 @@ const ViewIOdetails = () => {
{
label: "Goal Amount",
placeHolder: "$00.00",
- value: IObyID?.data?.goalAmount ? IObyID?.data?.goalAmount : "---",
+ value: IObyID?.data?.goalAmount ? formatCurrency(IObyID?.data?.goalAmount) : "---",
name: "goalAmount",
type: "number",
isRequired: true,
+ arabic:true,
section: " ",
width: "32.3%",
},
@@ -222,28 +277,6 @@ const ViewIOdetails = () => {
section: " ",
width: "32.3%",
},
- {
- label: "Holding Period",
- name: "holdingPeriod",
- value: IObyID?.data?.holdingPeriod ? IObyID?.data?.holdingPeriod : "---",
- type: "text",
- isRequired: true,
- placeHolder: "1Y",
- section: " ",
- width: "32.3%",
- },
- {
- label: "Expected Return",
- placeHolder: "$00.00",
- name: "expectedReturn",
- type: "number",
- isRequired: true,
- value: IObyID?.data?.expectedReturn
- ? IObyID?.data?.expectedReturn
- : "---",
- section: " ",
- width: "32.3%",
- },
{
label: "ISIN",
placeHolder: "$00.00",
@@ -274,7 +307,6 @@ const ViewIOdetails = () => {
section: " ",
width: "100%",
isRequired: true,
- type: "table",
value: minInvestmentById,
},
diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
index a1f903f..ed1f7d0 100644
--- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx
@@ -68,7 +68,6 @@ const InvestorDetails = () => {
error,
} = useGetInvestorsQuery({ page: currentPage, size: pageSize });
- console.log(investorDetails);
useEffect(() => {
// Simulate loading
@@ -125,7 +124,6 @@ const InvestorDetails = () => {
return nameMatches;
});
- console.log(investorDetails);
const extractedArray = filteredData?.map((item) => ({
id: item?.id,
diff --git a/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx b/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx
index d62c179..a8be18a 100644
--- a/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx
+++ b/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx
@@ -34,7 +34,6 @@ const ProfileView = () => {
skip: !id,
});
- console.log(data?.data);
const foundObject = data?.data;
diff --git a/src/Pages/Login.jsx b/src/Pages/Login.jsx
index bfc15bf..e661667 100644
--- a/src/Pages/Login.jsx
+++ b/src/Pages/Login.jsx
@@ -59,7 +59,6 @@ const Login = () => {
setIsLoading(true);
try {
const res = await login(value).unwrap();
- console.log(res);
if (res?.statusCode === 200) {
toast({
diff --git a/src/Pages/Master/ExchangeRate/ExchangeRate.jsx b/src/Pages/Master/ExchangeRate/ExchangeRate.jsx
index c3ace31..c459a86 100644
--- a/src/Pages/Master/ExchangeRate/ExchangeRate.jsx
+++ b/src/Pages/Master/ExchangeRate/ExchangeRate.jsx
@@ -34,6 +34,7 @@ import { useGetAllExchangeRatesQuery } from "../../../Services/exchange.rate.ser
import { TABLE_PAGINATION } from "../../../Constants/Paginations";
import NormalTable from "../../../Components/DataTable/NormalTable";
import { MdHistory } from "react-icons/md";
+import { formatCurrency } from "../../../Components/CurrencyInput";
const ExchangeRate = () => {
const toast = useToast();
@@ -117,13 +118,13 @@ const ExchangeRate = () => {
),
Rate: (
- {item.rate}
+ {formatCurrency(item.rate)}
),
diff --git a/src/Services/api.service.js b/src/Services/api.service.js
index 43c9edc..ab35c3d 100644
--- a/src/Services/api.service.js
+++ b/src/Services/api.service.js
@@ -49,8 +49,8 @@ api.interceptors.response.use(
if (response.status === 200) {
// Update tokens in local storage
- localStorage.setItem("accessToken", response.data.accessToken);
- localStorage.setItem("refreshToken", response.data.refreshToken);
+ localStorage.setItem("accessTokenn", response.data.accessToken);
+ localStorage.setItem("refreshTokenn", response.data.refreshToken);
// Retry the original request with the new tokens
return api(originalRequest);
diff --git a/src/Services/io.service.js b/src/Services/io.service.js
index ff4916d..d38dd7c 100644
--- a/src/Services/io.service.js
+++ b/src/Services/io.service.js
@@ -65,7 +65,7 @@ export const ioService = createApi({
body: data,
// No need to manually set 'Content-Type'
}),
- invalidatesTags: ["getKeyMerits"],
+ invalidatesTags: ["getIOById"],
}),
deleteKeyMerits: builder.mutation({
@@ -73,7 +73,7 @@ export const ioService = createApi({
url: `/io/admin/key-merits/hard-delete/${id}`,
method: "DELETE",
}),
- invalidatesTags: ["getKeyMerits"],
+ invalidatesTags: ["getIOById"],
}),
updateKeyMerits: builder.mutation({
query: ({ data, id }) => ({
@@ -81,7 +81,7 @@ export const ioService = createApi({
method: "PATCH",
body: data,
}),
- invalidatesTags: ["getKeyMerits"],
+ invalidatesTags: ["getIOById"],
}),
// =====[getIODocument]
@@ -92,7 +92,7 @@ export const ioService = createApi({
body: data,
}),
- invalidatesTags: ["getInvestmentDocuments"],
+ invalidatesTags: ["getIOById"],
}),
updateInvestmentDocuments: builder.mutation({
@@ -101,7 +101,7 @@ export const ioService = createApi({
method: "PATCH",
body: data,
}),
- invalidatesTags: ["getInvestmentDocuments"],
+ invalidatesTags: ["getIOById"],
}),
getInvestmentDocuments: builder.query({
@@ -114,7 +114,7 @@ export const ioService = createApi({
url: `/io/admin/document/hard-delete/${id}`,
method: "DELETE",
}),
- invalidatesTags: ["getInvestmentDocuments"],
+ invalidatesTags: ["getIOById"],
}),
// =====[Artifacts]
@@ -129,7 +129,7 @@ export const ioService = createApi({
// =====[createImageArtifacts]
createImageArtifacts: builder.mutation({
query: ({ data, id }) => ({
- url: `/io/artifact/artifactImage/${id}`,
+ url: `/io/admin/artifact/image/${id}`,
method: "POST",
body: data,
}),
@@ -142,7 +142,7 @@ export const ioService = createApi({
updateImageArtifacts: builder.mutation({
query: ({ data, id }) => ({
- url: `/io/artifact/image/${id}`,
+ url: `/io/admin/artifact/image/byId/${id}`,
method: "PATCH",
body: data,
}),
@@ -155,7 +155,7 @@ export const ioService = createApi({
// =====[createVideoArtifacts]
createVideoArtifacts: builder.mutation({
query: ({ data, id }) => ({
- url: `/io/artifact/artifactVideo/${id}`,
+ url: `/io/admin/artifact/video/${id}`,
method: "POST",
body: data,
}),
@@ -163,10 +163,9 @@ export const ioService = createApi({
invalidatesTags: ["getIOById"],
}),
-
deleteVideoArtifacts: builder.mutation({
query: (id) => ({
- url: `/io/artifact/video/${id}`,
+ url: `/io/admin/artifact/video/byId/${id}`,
method: "DELETE",
}),
invalidatesTags: ["getIOById"],
@@ -174,17 +173,15 @@ export const ioService = createApi({
deleteImageArtifacts: builder.mutation({
query: (id) => ({
- url: `/io/artifact/image/${id}`,
+ url: `/io/admin/artifact/image/byId/${id}`,
method: "DELETE",
}),
invalidatesTags: ["getIOById"],
}),
-
-
-
+
updateVideoArtifacts: builder.mutation({
query: ({ data, id }) => ({
- url: `/io/artifact/video/${id}`,
+ url: `/io/admin/artifact/video/byId/${id}`,
method: "PATCH",
body: data,
}),
@@ -209,6 +206,28 @@ export const ioService = createApi({
invalidatesTags: ["getIOById", 'getIO'],
}),
+ createIoCash : builder.mutation({
+ query: ({ data, id }) => ({
+ url: `/io/admin/io-cash/${id}`,
+ method: "POST",
+ body: data,
+ }),
+
+ invalidatesTags: ["getIOById"],
+ }),
+
+
+ createIoNav : builder.mutation({
+ query: ({ data, id }) => ({
+ url: `/io/admin/io-nav/${id}`,
+ method: "POST",
+ body: data,
+ }),
+
+ invalidatesTags: ["getIOById"],
+ }),
+
+
@@ -251,6 +270,10 @@ export const {
useSetDisplayOrderMutation,
+ useCreateIoCashMutation,
+ useCreateIoNavMutation,
+
+
useUpdateStatusIoMutation
} = ioService;
diff --git a/src/Services/sponser.service.js b/src/Services/sponser.service.js
index f4747b5..d56f747 100644
--- a/src/Services/sponser.service.js
+++ b/src/Services/sponser.service.js
@@ -11,7 +11,6 @@ import { ioService } from "./io.service";
// const baseUrl = `${import.meta.env.VITE_API_BASE_URL}/${import.meta.env.VITE_API_VERSION}`
-console.log(ioService);
// Define a service using a base URL and expected endpoints
diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js
index 499400f..5c2b3f2 100644
--- a/src/Services/token.serivce.js
+++ b/src/Services/token.serivce.js
@@ -36,15 +36,17 @@ export const baseQuery = async (args, api, extraOptions) => {
const refreshResult = await fetchBaseQuery({
baseUrl: 'https://sprint4.tanami.betadelivery.com/api/v1',
})({
- url: '/refresh_token',
+ url: '/auth/user/regenerate-token',
method: 'POST',
body: { refreshToken },
}, api, extraOptions);
if (refreshResult.data) {
+
// Save new tokens
localStorage.setItem('accessToken', refreshResult.data.access.token);
localStorage.setItem('refreshToken', refreshResult.data.refresh.token);
+ localStorage.setItem('refreshTokenExp', refreshResult.data.refresh.expires);
// Retry the original request with the new token
result = await fetchBaseQuery({
@@ -85,6 +87,8 @@ export const apiSlice = createApi({
// Store tokens in local storage
localStorage.setItem('accessToken', data?.data?.access?.token) ;
localStorage.setItem('refreshToken', data?.data?.refresh?.token);
+ // localStorage.setItem('refreshTokenExp', data?.data?.refresh?.expires);
+ localStorage.setItem('accessTokenExp', data?.data?.access?.expires);
} catch (error) {
console.error('Login failed:', error);
}
@@ -92,7 +96,7 @@ export const apiSlice = createApi({
}),
refreshToken: builder.mutation({
query: (refreshToken) => ({
- url: '/refresh_token',
+ url: '/auth/user/regenerate-token',
method: 'POST',
body: { refreshToken },
}),
|