DigiFi/digifi-FirstOffice
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Loan details updates

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-11-02 12:12:08 -05:00
parent 2852d5654e
commit dfc2165432
4 changed files with 226 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/home/HomeCom.jsx
+168 -156
View File
@@ -1,13 +1,13 @@
import React from 'react' import React from 'react'
import {Link} from 'react-router-dom' import {Link} from 'react-router-dom'
import { useQuery } from "@tanstack/react-query"; import {useQuery} from "@tanstack/react-query";
import BreadcrumbCom from '../../components/breadcrumb/BreadcrumbCom' import BreadcrumbCom from '../../components/breadcrumb/BreadcrumbCom'
import CustomCounter from '../../components/CustomCounter' import CustomCounter from '../../components/CustomCounter'
import Icons from '../../components/Icons' import Icons from '../../components/Icons'
import formatNumber from '../../helpers/formatNumber' import formatNumber from '../../helpers/formatNumber'
import queryKeys from '../../services/queryKeys' import queryKeys from '../../services/queryKeys'
import { getDashData } from '../../services/siteServices' import {getDashData} from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString'; import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString'; import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
import localImgLoader from '../../helpers/localImageLoader'; import localImgLoader from '../../helpers/localImageLoader';
@@ -15,174 +15,186 @@ import RouteLinks from '../../RouteLinks';
export default function HomeCom() { export default function HomeCom() {
const {data, isFetching, isError, error} = useQuery({ const {data, isFetching, isError, error} = useQuery({
queryKey: queryKeys.dashboard, queryKey: queryKeys.dashboard,
queryFn: () => getDashData(), queryFn: () => getDashData(),
}) })
const dashData = data?.data // DASHBOARD DATA const dashData = data?.data // DASHBOARD DATA
// console.log('dashData', dashData) // console.log('dashData', dashData)
// loans, payments, recent_transactions [], request_summary // loans, payments, recent_transactions [], request_summary
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Dashboard' paths={['Home', 'Dashboard']} /> <BreadcrumbCom title='Dashboard' paths={['Home', 'Dashboard']}/>
{(isFetching || isError) ? {(isFetching || isError) ?
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'> <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
{isError ? <p className='text-red-500'>{error.message}</p> : <p className='text-slate-800'>Loading...</p>} {isError ? <p className='text-red-500'>{error.message}</p> :
</div> <p className='text-slate-800'>Loading...</p>}
: </div>
<div className='grid grid-cols-1 gap-8'> :
<div className='w-full grid grid-cols-1 xl:grid-cols-3 gap-8'> <div className='grid grid-cols-1 gap-8'>
<div className='box min-h-[230] justify-between bg-[#F7D9E3] dark:bg-black-box text-black-body dark:text-white-body'> <div className='w-full grid grid-cols-1 xl:grid-cols-3 gap-8'>
<p className='text-base sm:text-lg font-bold hover:text-primary'>Loans</p> <div
<div className='flex flex-wrap gap-2 items-end font-bold'> className='box min-h-[230] justify-between bg-[#F7D9E3] dark:bg-black-box text-black-body dark:text-white-body'>
{/* <p className='text-3xl sm:text-[39px]'><span className='text-xl sm:text-2xl'>{dashData?.loans?.currency_text}</span><CustomCounter targetNumber={dashData?.loans?.value} timeInSeconds='1' /></p> */} <p className='text-base sm:text-lg font-bold hover:text-primary'>Loans</p>
<p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'> <div className='flex flex-wrap gap-2 items-end font-bold'>
{/* <p className='text-3xl sm:text-[39px]'><span className='text-xl sm:text-2xl'>{dashData?.loans?.currency_text}</span><CustomCounter targetNumber={dashData?.loans?.value} timeInSeconds='1' /></p> */}
<p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
{dashData?.loans?.currency_text} {dashData?.loans?.currency_text}
</span><CustomCounter targetNumber={formatNumber(dashData?.loans?.value)} timeInSeconds='1' /> </span><CustomCounter targetNumber={formatNumber(dashData?.loans?.value)} timeInSeconds='1'/>
</p> </p>
<p className='sm:text-[13.9px]'>{dashData?.loans?.text}</p> <p className='sm:text-[13.9px]'>{dashData?.loans?.text}</p>
</div> </div>
</div> </div>
<div className='box min-h-[230] justify-between bg-[#CBF0F5] dark:bg-black-box text-black-body dark:text-white-body'> <div
<p className='text-base sm:text-lg font-bold hover:text-primary'>Payments</p> className='box min-h-[230] justify-between bg-[#CBF0F5] dark:bg-black-box text-black-body dark:text-white-body'>
<div className='flex flex-wrap gap-2 items-end font-bold'> <p className='text-base sm:text-lg font-bold hover:text-primary'>Payments</p>
<p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'> <div className='flex flex-wrap gap-2 items-end font-bold'>
<p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
{dashData?.payments?.currency_text} {dashData?.payments?.currency_text}
</span><CustomCounter targetNumber={formatNumber(dashData?.payments?.value)} timeInSeconds='1' /> </span><CustomCounter targetNumber={formatNumber(dashData?.payments?.value)} timeInSeconds='1'/>
</p> </p>
<p className='sm:text-[13.9px]'>{dashData?.payments?.text}</p> <p className='sm:text-[13.9px]'>{dashData?.payments?.text}</p>
</div> </div>
</div> </div>
<div className='box min-h-[230] justify-between bg-[#CBD4F4] dark:bg-black-box text-black-body dark:text-white-body'> <div
<p className='mb-4 text-base sm:text-lg font-bold hover:text-primary'>Request Summary</p> className='box min-h-[230] justify-between bg-[#CBD4F4] dark:bg-black-box text-black-body dark:text-white-body'>
<div className='grid grid-cols-2 gap-4 font-bold'> <p className='mb-4 text-base sm:text-lg font-bold hover:text-primary'>Request Summary</p>
{ <div className='grid grid-cols-2 gap-4 font-bold'>
Object.values(dashData?.request_summary).map((item, index) => { {
return ( Object.values(dashData?.request_summary).map((item, index) => {
<div key={index} className='flex items-center gap-2'> return (
<div className='min-w-10 min-h-10 bg-white-body dark:bg-black-box dark:shadow-[0_0_0_1px_#f9f9f9] rounded-md flex justify-center items-center'> <div key={index} className='flex items-center gap-2'>
<Icons name='sales' /> <div
className='min-w-10 min-h-10 bg-white-body dark:bg-black-box dark:shadow-[0_0_0_1px_#f9f9f9] rounded-md flex justify-center items-center'>
<Icons name='sales'/>
</div>
<div>
<p className='font-bold text-base'><CustomCounter
targetNumber={Object.values(item)[0]} timeInSeconds='1'/></p>
<p className='text-12 text-slate-500'>{Object.keys(item)[0]}</p>
</div>
</div>
)
})
}
</div>
</div>
</div> </div>
<div>
<p className='font-bold text-base'><CustomCounter targetNumber={Object.values(item)[0]} timeInSeconds='1' /></p>
<p className='text-12 text-slate-500'>{Object.keys(item)[0]}</p>
</div>
</div>
)
})
}
</div>
</div>
</div>
<div className='w-full'> <div className='w-full'>
<div className='box gap-8 bg-white dark:bg-black-box text-black-body dark:text-white-body'> <div className='box gap-8 bg-white dark:bg-black-box text-black-body dark:text-white-body'>
<div className='grid grid-cols-1 xs:grid-cols-2 gap-4'> <div className='grid grid-cols-1 xs:grid-cols-2 gap-4'>
<div className='flex flex-col gap-1 order-2 xs:order-1'> <div className='flex flex-col gap-1 order-2 xs:order-1'>
<p className='font-bold text-base'>Recent Request</p> <p className='font-bold text-base'>Recent Request</p>
{/* <p className='text-12'>Over 500 members</p> */} {/* <p className='text-12'>Over 500 members</p> */}
</div> </div>
{/* <div className='order-1 xs:order-2 text-left xs:text-right'> {/* <div className='order-1 xs:order-2 text-left xs:text-right'>
<button className='font-bold bg-white-aside text-black-body text-12 px-4 py-2 hover:text-primary hover:bg-sky-50 dark:hover:text-white dark:hover:bg-primary dark:text-white-body dark:bg-black-body rounded-md'>+ New Member</button> <button className='font-bold bg-white-aside text-black-body text-12 px-4 py-2 hover:text-primary hover:bg-sky-50 dark:hover:text-white dark:hover:bg-primary dark:text-white-body dark:bg-black-body rounded-md'>+ New Member</button>
</div> */} </div> */}
</div> </div>
<table className="py-2 w-full text-sm"> <table className="py-2 w-full text-sm">
<thead className="py-2 text-sm text-slate-500 text-left font-semibold"> <thead className="py-2 text-sm text-slate-500 text-left font-semibold">
<tr> <tr>
<th scope="col" className="px-2 py-2"> <th scope="col" className="px-2 py-2">
Request Request
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Account Account
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Activity Channel
</th> </th>
<th scope="col" className="px-2 text-right"> <th scope="col" className="px-2 text-right">
Action Action
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{(dashData?.recent_transactions && dashData?.recent_transactions.length > 0) ? dashData?.recent_transactions?.map((item, index) => { {(dashData?.recent_transactions && dashData?.recent_transactions.length > 0) ? dashData?.recent_transactions?.map((item, index) => {
if(index <= 10) { if (index <= 10) {
return ( return (
<tr key={item?.id} className="py-2 border-t border-dashed border-slate-300"> <tr key={item?.id} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2"> <td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'> <div
<img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" /> className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left"> <img className="w-10 h-10 rounded-md"
<div className="text-base font-semibold">{item?.transaction_id}</div> src={localImgLoader(`loan_icons/${item?.type}.png`)}
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div> alt="Icon"/>
</div> <div className="text-left">
</div> <div
</td> className="text-base font-semibold">{item?.transaction_id}</div>
<td className="px-2"> <div
<div className="text-left"> className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
<div className="text-base font-semibold">{item?.account_id}</div> </div>
<div className="font-normal text-gray-500">{item?.type}</div> </div>
</div> </td>
</td> <td className="px-2">
<td className="px-2"> <div className="text-left">
<div className="text-left"> <div
<div className="font-normal text-gray-500">50%</div> className="text-base font-semibold">{item?.account_id}</div>
<div className="relative h-[6px] w-full bg-white-body dark:bg-black-body rounded-full overflow-hidden"> <div className="font-normal text-gray-500">{item?.type}</div>
<div className={`absolute left-0 h-full w-1/2 bg-emerald-600`}></div> </div>
</div> </td>
</div> <td className="px-2">
</td> <div className="text-left">
<td className="px-2 text-right"> <div className="text-base font-semibold">{item?.channel}</div>
<div className='flex items-center justify-end gap-3 md:gap-4'> </div>
{/* <div className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'> </td>
<td className="px-2 text-right">
<div className='flex items-center justify-end gap-3 md:gap-4'>
{/* <div className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
<Icons name='edit' /> <Icons name='edit' />
</div> */} </div> */}
<div className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'> <div
<Link to={RouteLinks.transaction_details_page} state={{transactionID: item?.transaction_id}}> className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
<Icons name='eye' /> <Link to={RouteLinks.transaction_details_page}
</Link> state={{transactionID: item?.transaction_id}}>
</div> <Icons name='eye'/>
{/* <div className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'> </Link>
</div>
{/* <div className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
<Icons name='trash' /> <Icons name='trash' />
</div> */} </div> */}
</div> </div>
</td> </td>
</tr> </tr>
) )
} }
} }
) )
: :
<tr className="py-2 border-t border-dashed border-slate-300"> <tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={4}> <td className="px-3 py-2" colSpan={4}>
<div className="flex justify-center items-center"> <div className="flex justify-center items-center">
No Record Found No Record Found
</div> </div>
</td> </td>
</tr> </tr>
} }
<> <>
{dashData?.recent_transactions.length > 10 && {dashData?.recent_transactions.length > 10 &&
<tr className="py-2 border-t border-dashed text-right text-primary border-slate-300"> <tr className="py-2 border-t border-dashed text-right text-primary border-slate-300">
<td className="px-3 py-2" colSpan={4}> <td className="px-3 py-2" colSpan={4}>
<Link to={RouteLinks.transactionsPage} className="flex justify-end items-center"> <Link to={RouteLinks.transactionsPage}
More ... className="flex justify-end items-center">
</Link> More ...
</td> </Link>
</tr> </td>
} </tr>
</> }
</tbody> </>
</table> </tbody>
</table>
</div> </div>
</div>
</div>
}
</div> </div>
</div> )
}
</div>
)
} }
src/components/layouts/rightaside/Orders.jsx
+29 -29
View File
@@ -5,35 +5,35 @@ import CustomCounter from '../../CustomCounter'
export default function Orders() { export default function Orders() {
return ( return (
<div className='h-full p-2 sm:p-4 large:p-8 flex flex-col gap-16 overflow-y-auto aside-scroll-design'> <div className='h-full p-2 sm:p-4 large:p-8 flex flex-col gap-16 overflow-y-auto aside-scroll-design'>
<div className='flex flex-col gap-4'> {/*<div className='flex flex-col gap-4'>*/}
<p className='text-base text-white-body font-bold'>Recent Eligibility</p> {/* <p className='text-base text-white-body font-bold'>Recent Eligibility</p>*/}
<div className='grid grid-cols-2 gap-4 sm:gap-6 large:gap-8'> {/* <div className='grid grid-cols-2 gap-4 sm:gap-6 large:gap-8'>*/}
<div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'> {/* <div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'>*/}
<p className='text-base font-bold text-white-body'> {/* <p className='text-base font-bold text-white-body'>*/}
<CustomCounter targetNumber={18} timeInSeconds={1} /> {/* <CustomCounter targetNumber={18} timeInSeconds={1} />*/}
</p> {/* </p>*/}
<p className='text-sm text-slate-500'>Pending</p> {/* <p className='text-sm text-slate-500'>Pending</p>*/}
</div> {/* </div>*/}
<div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'> {/* <div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'>*/}
<p className='text-base font-bold text-white-body'> {/* <p className='text-base font-bold text-white-body'>*/}
<CustomCounter targetNumber={5} timeInSeconds={1} /> {/* <CustomCounter targetNumber={5} timeInSeconds={1} />*/}
</p> {/* </p>*/}
<p className='text-sm text-slate-500'>Approved</p> {/* <p className='text-sm text-slate-500'>Approved</p>*/}
</div> {/* </div>*/}
<div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'> {/* <div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'>*/}
<p className='text-base font-bold text-white-body'> {/* <p className='text-base font-bold text-white-body'>*/}
<CustomCounter targetNumber={1} timeInSeconds={1} /> {/* <CustomCounter targetNumber={1} timeInSeconds={1} />*/}
</p> {/* </p>*/}
<p className='text-sm text-slate-500'>Rejected</p> {/* <p className='text-sm text-slate-500'>Rejected</p>*/}
</div> {/* </div>*/}
<div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'> {/* <div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'>*/}
<p className='text-base font-bold text-white-body'> {/* <p className='text-base font-bold text-white-body'>*/}
<CustomCounter targetNumber={1} timeInSeconds={1} /> {/* <CustomCounter targetNumber={1} timeInSeconds={1} />*/}
</p> {/* </p>*/}
<p className='text-sm text-slate-500'>Created</p> {/* <p className='text-sm text-slate-500'>Created</p>*/}
</div> {/* </div>*/}
</div> {/* </div>*/}
</div> {/*</div>*/}
<div className='flex flex-col gap-4'> <div className='flex flex-col gap-4'>
<p className='text-base text-white-body font-bold'>Recent Loans</p> <p className='text-base text-white-body font-bold'>Recent Loans</p>
<div className='flex flex-col gap-4'> <div className='flex flex-col gap-4'>
src/components/layouts/rightaside/RightAsideBar.jsx
+9 -9
View File
@@ -20,18 +20,18 @@ export default function RightAsideBar() {
<button name='orders' onClick={() => handleActiveMenu('orders')} className={`flex justify-center items-center px-2 py-3 large:px-4 large:py-5 rounded-md shadow-round_white bg-[#0E172E] text-white-body hover:scale-[1.1] ${active == 'orders' && 'scale-[1.2]'}`}> <button name='orders' onClick={() => handleActiveMenu('orders')} className={`flex justify-center items-center px-2 py-3 large:px-4 large:py-5 rounded-md shadow-round_white bg-[#0E172E] text-white-body hover:scale-[1.1] ${active == 'orders' && 'scale-[1.2]'}`}>
<Icons name='dashboard' className='text-3xl' /> <Icons name='dashboard' className='text-3xl' />
</button> </button>
<button name='tickets' onClick={() => handleActiveMenu('tickets')} className={`flex justify-center items-center px-2 py-3 large:px-4 large:py-5 rounded-md shadow-round_white bg-[#0E172E] text-white-body hover:scale-[1.1] ${active == 'tickets' && 'scale-[1.2]'}`}> {/*<button name='tickets' onClick={() => handleActiveMenu('tickets')} className={`flex justify-center items-center px-2 py-3 large:px-4 large:py-5 rounded-md shadow-round_white bg-[#0E172E] text-white-body hover:scale-[1.1] ${active == 'tickets' && 'scale-[1.2]'}`}>*/}
<Icons name='settings' className='text-3xl' /> {/* <Icons name='settings' className='text-3xl' />*/}
</button> {/*</button>*/}
<button name='tasks' onClick={() => handleActiveMenu('tasks')} className={`flex justify-center items-center px-2 py-3 large:px-4 large:py-5 rounded-md shadow-round_white bg-[#0E172E] text-white-body hover:scale-[1.1] ${active == 'tasks' && 'scale-[1.2]'}`}> {/*<button name='tasks' onClick={() => handleActiveMenu('tasks')} className={`flex justify-center items-center px-2 py-3 large:px-4 large:py-5 rounded-md shadow-round_white bg-[#0E172E] text-white-body hover:scale-[1.1] ${active == 'tasks' && 'scale-[1.2]'}`}>*/}
<Icons name='dashboard' className='text-3xl' /> {/* <Icons name='dashboard' className='text-3xl' />*/}
</button> {/*</button>*/}
</div> </div>
{/* Body */} {/* Body */}
{active == 'orders' && <Orders />} {active === 'orders' && <Orders />}
{active == 'tickets' && <Tickets />} {/*{active == 'tickets' && <Tickets />}*/}
{active == 'tasks' && <Tasks />} {/*{active == 'tasks' && <Tasks />}*/}
</div> </div>
) )
} }
src/components/transactionDetails/LoanDetails.jsx
+20 -3
View File
@@ -20,6 +20,11 @@ export default function LoanDetails({transactionID}) {
const loans = allLoans?.data?.loans // LOANS LIST const loans = allLoans?.data?.loans // LOANS LIST
// const loansCount = allLoans?.data?.count // LOANS LIST COUNT // const loansCount = allLoans?.data?.count // LOANS LIST COUNT
const handleClick = (transactioID) => {
alert(transactioID)
console.log('Button clicked!');
};
return ( return (
<> <>
{isFetching ? {isFetching ?
@@ -119,8 +124,20 @@ export default function LoanDetails({transactionID}) {
<tr> <tr>
<td colSpan="8"> <td colSpan="8">
<div> <div>
<p className='pb-4 font-bold text-base'>Loans Disbursement <div style={{display: 'flex'}}>
Details</p> <div style={{width: '50%'}}>
<p className='pb-4 font-bold text-base'>Loans Disbursement
Details</p>
</div>
<div style={{width: '50%', textAlign: 'right'}}>
<button
className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 roundede"
onClick={() => handleClick(item?.transaction_id)}>
Retry Disbursement
</button>
</div>
</div>
<div className="font-bold text-blue-500">Disburse Date <div className="font-bold text-blue-500">Disburse Date
: {getDateFromDateString(item?.disburseDate)} {getTimeFromDateString(item?.disburseDate)} </div> : {getDateFromDateString(item?.disburseDate)} {getTimeFromDateString(item?.disburseDate)} </div>
<div className="font-bold text-gray-500">Disburse Description <div className="font-bold text-gray-500">Disburse Description
@@ -129,7 +146,7 @@ export default function LoanDetails({transactionID}) {
: {item?.disburseResult}</div> : {item?.disburseResult}</div>
<div><br/></div> <div><br/></div>
<div className="font-bold text-blue-500">Disburse Verify <div className="font-bold text-blue-500">Disburse Verify
Date: {getDateFromDateString(item?.disburseVerify)} {getTimeFromDateString(item?.disburseVerify)} </div> Date: {getDateFromDateString(item?.disburseVerify)} {getTimeFromDateString(item?.disburseVerify)} </div>
<div className="font-bold text-gray-500">Verify Description <div className="font-bold text-gray-500">Verify Description
: {item?.verifyDescription}</div> : {item?.verifyDescription}</div>
<div className="font-bold text-red-500">Verify Result <div className="font-bold text-red-500">Verify Result