Siddhesh.More/tanami-admin-panel
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

Yasin #11

Merged
Siddhesh.More merged 2 commits from Yasin into release/sprint-8 2024-11-21 12:14:25 +00:00
Conversation 0 Commits 2 Files Changed 6 +109 -89
6 changed files with 109 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
View File

@@ -47,7 +47,7 @@ const formatCurrency = (value) => {
return decimal ? `${formattedInteger}.${decimal}` : formattedInteger;
};
const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
const params = useParams();
const toast = useToast();
const id = params?.id;
@@ -131,7 +131,11 @@ const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
Total_Amount: IODetails?.totalAmtInvestmentInUSD,
});
};
console.log(
"=========hitttt",
IODetails?.ioTransactionRecords?.Approved?.[0]?.transactionAmount
);
return (
<Modal isOpen={isOpen} onClose={onClose}>
@@ -151,7 +155,9 @@ const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
</FormLabel>
<Input
type="text"
value={formatDate(IODetails?.ioTransactionRecords?.Approved?.[0]?.createdAt)}
value={formatDate(
IODetails?.ioTransactionRecords?.Approved?.[0]?.createdAt
)}
size="sm"
rounded={"sm"}
textAlign={"end"}
@@ -162,64 +168,67 @@ const ViewAmountInvested = ({ isOpen, onClose, id:investorId }) => {
</FormControl>
<FormControl
mb={"15px"}
isInvalid={!!errors.Total_Amount}
isReadOnly
>
<FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
Amount
</FormLabel>
<Input
type="text"
value={formatCurrency(watch("Total_Amount"))}
size="sm"
rounded={"sm"}
textAlign={"end"}
focusBorderColor="forestGreen.300"
fontSize={"sm"}
readOnly
/>
</FormControl>
mb={"15px"}
isInvalid={!!errors.Total_Amount}
isReadOnly
>
<FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
Amount
</FormLabel>
<Input
type="text"
value={formatCurrency(watch("Total_Amount") || 0)}
size="sm"
rounded={"sm"}
textAlign={"end"}
focusBorderColor="forestGreen.300"
fontSize={"sm"}
readOnly
/>
</FormControl>
<FormControl
mb={"15px"}
isInvalid={!!errors.amountInvested}
isRequired
>
<FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
Amount to invest
</FormLabel>
<Input
type="text"
value={formatCurrency(IODetails?.ioTransactionRecords?.Approved?.[0]?.transactionAmount || 0)}
size="sm"
rounded={"sm"}
textAlign={"end"}
focusBorderColor="forestGreen.300"
fontSize={"sm"}
readOnly
/>
</FormControl>
<FormControl mb={"15px"} isInvalid={!!errors.IoCash}>
<FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
IO Cash
</FormLabel>
<Input
type="text"
value={formatCurrency(
(watch("Total_Amount") || 0) -
(IODetails?.ioTransactionRecords?.Approved?.[0]?.transactionAmount || 0)
)}
size="sm"
rounded={"sm"}
focusBorderColor="forestGreen.300"
fontSize={"sm"}
textAlign={"right"}
readOnly
/>
</FormControl>
<FormControl
mb={"15px"}
isInvalid={!!errors.amountInvested}
isRequired
>
<FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
Amount to invest
</FormLabel>
<Input
type="text"
value={formatCurrency(
IODetails?.ioTransactionRecords?.Pending?.[0]
?.transactionAmount || 0
)}
size="sm"
rounded={"sm"}
textAlign={"end"}
focusBorderColor="forestGreen.300"
fontSize={"sm"}
readOnly
/>
</FormControl>
<FormControl mb={"15px"} isInvalid={!!errors.IoCash}>
<FormLabel as={"label"} fontSize={"sm"} fontWeight={500}>
IO Cash
</FormLabel>
<Input
type="text"
value={formatCurrency(
(watch("Total_Amount") || 0) -
(IODetails?.ioTransactionRecords?.Pending?.[0]
?.transactionAmount || 0)
)}
size="sm"
rounded={"sm"}
focusBorderColor="forestGreen.300"
fontSize={"sm"}
textAlign={"right"}
readOnly
/>
</FormControl>
<ModalFooter>
<Box display={"flex"} justifyContent={"center"} gap={2}>

18
src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
View File

@@ -86,15 +86,15 @@ import RequestRejectModal from "./RequestRejectModal";
resolver: yupResolver(investorExit),
});
useEffect(() => {
console.log("hiit useEffectc");
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
reset({
amount: IODetails?.ioMVNAV,
});
}, [IODetails, id]);
// useEffect(() => {
// console.log("hiit useEffectc");
// handleCalculate(id, {
// amount: IODetails?.ioMVNAV,
// });
// reset({
// amount: IODetails?.ioMVNAV,
// });
// }, [IODetails, id]);
const handleCalculate = async (id, data) => {
try {

18
src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
View File

@@ -70,15 +70,15 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
resolver: yupResolver(investorExit),
});
useEffect(() => {
console.log("hiit useEffectc");
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
reset({
amount: IODetails?.ioMVNAV,
});
}, [IODetails, id]);
// useEffect(() => {
// console.log("hiit useEffectc");
// handleCalculate(id, {
// amount: IODetails?.ioMVNAV,
// });
// reset({
// amount: IODetails?.ioMVNAV,
// });
// }, [IODetails, id]);
const handleCalculate = async (id, data) => {
try {

18
src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
View File

@@ -76,15 +76,15 @@ import RequestRejectModal from "./RequestRejectModal";
resolver: yupResolver(),
});
useEffect(() => {
console.log("hiit useEffectc");
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
reset({
amount: IODetails?.ioMVNAV,
});
}, [IODetails, id]);
// useEffect(() => {
// console.log("hiit useEffectc");
// handleCalculate(id, {
// amount: IODetails?.ioMVNAV,
// });
// reset({
// amount: IODetails?.ioMVNAV,
// });
// }, [IODetails, id]);
const handleCalculate = async (id, data) => {
try {

15
src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
View File

@@ -54,7 +54,7 @@ const ViewIOdata = () => {
const tabs = [
{ label: "IO Details", content: <ViewIOdetails data={data?.data} /> },
{
label: "Investment documents",
label: "Investment documents",
content: <InvestmentDocument data={data?.data} />,
},
{ label: "Key merits", content: <KeyMerits data={data?.data} /> },
@@ -103,10 +103,21 @@ const ViewIOdata = () => {
index === 1 ||
index === 2 ||
index === 3 ||
index === 4
index === 4 ||
index === 8
? false
: !IODetails?.isInvestedAmount
}
// isDisabled={
// index === 0 ||
// index === 1 ||
// index === 2 ||
// index === 3 ||
// index === 4
// ? false
// : !IODetails?.isInvestedAmount
// }
key={index}
fontSize={"xs"}
_selected={{

2
src/Services/io.service.js
View File

@@ -225,7 +225,7 @@ export const ioService = createApi({
invalidatesTags: ["getIOById"],
}),
// ======== [ Distribution Transaction ] ========
// ======== [ Distribution Transaction ] ========
getDistributionInvestor: builder.mutation({
query: ({ id, data }) => ({