From 2b22d7132a5b31bdcdf052c526117d899c21e5d9 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 2 Nov 2025 21:23:21 -0500 Subject: [PATCH] Loan details updates --- src/assets/loans.png | Bin 0 -> 1875 bytes src/assets/loans2.png | Bin 0 -> 1611 bytes src/assets/repay.png | Bin 0 -> 1568 bytes .../loan_charges/LoanChargesCom.jsx | 217 ++++++++------- src/components/loanscom/LoansCom.jsx | 260 ++++++++++-------- src/components/repayments/RepaymentsCom.jsx | 201 +++++++------- .../transactionDetails/LoanDetails.jsx | 2 +- .../transactions/TransactionsCom.jsx | 222 ++++++++------- 8 files changed, 479 insertions(+), 423 deletions(-) create mode 100644 src/assets/loans.png create mode 100644 src/assets/loans2.png create mode 100644 src/assets/repay.png diff --git a/src/assets/loans.png b/src/assets/loans.png new file mode 100644 index 0000000000000000000000000000000000000000..b5c043530c8702deeb9a31bbc70f255aead8c5b0 GIT binary patch literal 1875 zcmV-Z2dwysP)=4bnBJCnblO*)g`+Mhc~bD2iVWkF*E zA;9iAdpT#>MNkqJl+Iuw8ZU^rAYj$0rcT<#>6kRFohD;bFR&oU#o^Xbh_xV2e_jz2dXDnb7ZufHw@4?^?FunPhS}Ug3DGhA~!z+a0 z71GpZFg=}^o>TUoi2lQcb8h!@ir2GnR$WA+-&15i2fZ&UP-%J}u{#LmrX=i#kPaaY zN)@T+07OhlB#12aJ|d*GsYM#4FJJN*E>Nyv?JqaPv~$>w-%|`w^xVr^03;q~WzNHEDw?Qkn-eI8Y21 z@{yl!gV9_V&p}+xL7d8$GFoC`=)&e(rv3t9-z1R$($uUKz$=9C z!6*4JnFS-6$k9yXcn19CZ3r*!wRuGX*t|{sg{7D-T&_(EJ`ekDs6b1aoOK1zN}#L= zhIhbZ9^Bgn69uqO376cH5<>A*L98%RG2wD;TB5zy;P}fn``X|^kCO$JVK{#t690jx zU&8E{@Z>9~-w*yGXV21einkM2_32hH^p|AVH=8`L(&y<+uzeb9gpLll@(1|386MQZ z^nQ34g%1qyCQ~&1yi^!AmZ8727z1HFW~bVE+A9I|ccAeQoI3+ehoG|n?!6Aa9-msowd$eE9k|Nc9oKOd|6 z4dk#J9=hRtzEd+o%iUlHW6VWJzd^*maSH@B`06c~&Or`lVZ~oX-0>kFcOr(%ux@R| z>Uk3}m;nQI%nJz#w8x*!{-HMkYl~P_EKFoLgJH8D$qWu2`*1#_0%q4hy z9WhdY75@ctSe52nm~_Lf?M`Jh(s?TEjSFB0pARnO!9%587EEL#hcd9bUqjr9AV#8C zT`waBGvRKIeK|3ei`AKpEcJk?uM~idxaX@ z7Y>#quQww5nvwCQ1#o47Z*T5p?z+kRwLQ%LGtBJO0%ouJv2Gqj4s;+sYd}``Kr2p9 z!-YZ=T3U*ADfB`_tP%Ow&yl-*$a6Kw+c9Ksv!l69O%BDIpgRUVEy$je$le(Awn2Xf zqCbXpE{Zff5b!!~T&)zVCBlB^GBUl1vyocbKl%a-U}g-_-;RtQOZxl-vhO6aKjye% zFoqa7iMV|NajOZ@)rfWNFxHiNtRuU@SF)Hv&$^7%Qdgr0`)AMWt*4;ov@9$?!O`|V z@np_|Z@JY!LMVzTdw7iQrT7ftaMpPTfav#$4IzhWE?G~ax z?0>p=9Y?X7f}@p(8-jHo;;U*&1Z&z*Lew6+$n@8b0SjyFGV>STMMP9NP6DXlRHTHEh1Gqw6mgX(V7TUw@K~2R$Gwqph{PdovIrIm$up0Ys*&% zv8Ubh4P|95n}b!c_q{dk^9{9a zJP8LOSRydA#nEhemy;UXRGzC;3+Z#;X*6>smx_s0T)e*T!cT5QDq9JbJfh4d`A6ee+y}O=o=r;{|EeJ^iEV4LjC{% N002ovPDHLkV1l*7ge(96 literal 0 HcmV?d00001 diff --git a/src/assets/loans2.png b/src/assets/loans2.png new file mode 100644 index 0000000000000000000000000000000000000000..7ea9e5496fb5fce2a425925e6b0d3f60723fe342 GIT binary patch literal 1611 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 SqPrsi0000 { - setFilter(prev => ({...prev, [name]:value})) + const handleFilter = ({target: {name, value}}) => { + setFilter(prev => ({...prev, [name]: value})) } const handleFilterByParams = () => { - if(filter.type && !filter.id){ + if (filter.type && !filter.id) { return - }else if(!filter.type){ + } else if (!filter.type) { setPage(1) setWillFilter(prev => !prev) setFilter({type: '', id: ''}) - }else{ + } else { setPage(1) setWillFilter(prev => !prev) } @@ -38,117 +38,130 @@ export default function LoansChargesCom() { const isFetching = allLoanCharges?.loading const isError = allLoanCharges?.error - useEffect(()=>{ - setAllLoanCharges(prev => ({...prev, loading:true})) + useEffect(() => { + setAllLoanCharges(prev => ({...prev, loading: true})) const payload = filter?.type ? {[filter?.type]: filter.id} : {} getLoanCharges({...payload, page}).then(res => { - if(res?.status != 200){ - setAllLoanCharges(prev => ({...prev, loading:false})) + if (res?.status != 200) { + setAllLoanCharges(prev => ({...prev, loading: false})) return } - setAllLoanCharges({loading:false, error:'', data:res?.data}) + setAllLoanCharges({loading: false, error: '', data: res?.data}) }).catch(err => { - setAllLoanCharges({loading:false, error:'error occurred', data:{}}) + setAllLoanCharges({loading: false, error: 'error occurred', data: {}}) console.log('ERR', err) }) - },[page, willFilter]) + }, [page, willFilter]) return (
- +
- { isError ? + {isError ?

{allLoanCharges?.error}

- : - <> - {/* filter section */} -
- -
- + : + <> + {/* filter section */} +
+ +
+ +
+
+ +
+
-
- -
- -
- {/* end of filter section */} + {/* end of filter section */} - - {({ data }) => ( - <> - - - - - {/* + + {(data && data.length > 0) ? data?.map((item, index) => ( + + + + + + + )) + : + + + + } + +
- Name - + + {({data}) => ( + <> + + + + + {/* */} - - - - - - - {(data && data.length > 0) ? data?.map((item, index) => ( - - - - - + + + - )) - : - - - - } - -
+ TransactionID/Fee Type + Loan - Amount - - Added - - Action -
-
- Jese image -
-
{item?.transaction_id || ''}
-
{item?.code}
-
-
- 		-
- {/*
{formatNumber(item?.initial_loan_amount)}
*/} -
{formatNumber(item?.amount)}
-
- 		-
-
{getDateFromDateString(item?.created_at)}
-
- 		-
-
- -
-
- 		+ Amount + + Added + + Action +
-
- No Record Found -
-
- - )} - - +
+
+ Jese image +
+
{item?.transaction_id || ''}
+
{item?.code}
+
+
+ 		+
+ {/*
{formatNumber(item?.initial_loan_amount)}
*/} +
#{formatNumber(item?.amount)}
+
+ 		+
+
{getDateFromDateString(item?.created_at)}
+
+ 		+
+
+ +
+
+
+
+ No Record Found +
+
+ + )} + + }
diff --git a/src/components/loanscom/LoansCom.jsx b/src/components/loanscom/LoansCom.jsx index 1d0b061..14cdfe5 100644 --- a/src/components/loanscom/LoansCom.jsx +++ b/src/components/loanscom/LoansCom.jsx @@ -1,34 +1,34 @@ -import { useEffect, useState } from 'react' +import {useEffect, useState} from 'react' import {Link} from 'react-router-dom' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import Icons from '../Icons' -import { getLoans } from '../../services/siteServices' +import {getLoans} from '../../services/siteServices' import getDateFromDateString from '../../helpers/GetDateFromDateString'; -import Avatar from '../../assets/user_avatar.jpg' +import Avatar from '../../assets/loans.png' import RouteLinks from '../../RouteLinks'; import formatNumber from '../../helpers/formatNumber' export default function LoansCom() { const [page, setPage] = useState(1) - const [allLoans, setAllLoans] = useState({loading:true, error:'', data:{}}) + const [allLoans, setAllLoans] = useState({loading: true, error: '', data: {}}) const [willFilter, setWillFilter] = useState(false) const [filter, setFilter] = useState({type: '', id: ''}) - const handleFilter = ({target:{name, value}}) => { - setFilter(prev => ({...prev, [name]:value})) + const handleFilter = ({target: {name, value}}) => { + setFilter(prev => ({...prev, [name]: value})) } const handleFilterByParams = () => { - if(filter.type && !filter.id){ + if (filter.type && !filter.id) { return - }else if(!filter.type){ + } else if (!filter.type) { setPage(1) setWillFilter(prev => !prev) setFilter({type: '', id: ''}) - }else{ + } else { setPage(1) setWillFilter(prev => !prev) } @@ -39,134 +39,152 @@ export default function LoansCom() { const isFetching = allLoans?.loading const isError = allLoans?.error - useEffect(()=>{ - setAllLoans(prev => ({...prev, loading:true})) + useEffect(() => { + setAllLoans(prev => ({...prev, loading: true})) const payload = filter?.type ? {[filter?.type]: filter.id} : {} getLoans({...payload, page}).then(res => { - if(res?.status != 200){ - setAllLoans(prev => ({...prev, loading:false})) + if (res?.status != 200) { + setAllLoans(prev => ({...prev, loading: false})) return } - setAllLoans({loading:false, error:'', data:res?.data}) + setAllLoans({loading: false, error: '', data: res?.data}) }).catch(err => { - setAllLoans({loading:false, error:'error occurred', data:{}}) + setAllLoans({loading: false, error: 'error occurred', data: {}}) console.log('ERR', err) }) - },[page, willFilter]) + }, [page, willFilter]) return (
- +
- { isError ? + {isError ?

{allLoans?.error}

- : - <> - {/* filter section */} -
- -
- + : + <> + {/* filter section */} +
+ +
+ +
+
+ +
+
-
- -
- -
- {/* end of filter section */} + {/* end of filter section */} - - {({ data }) => ( - <> - - - - - - - - - - - - - {(data && data.length > 0) ? data?.map((item, index) => ( - - - - - - - + + {({data}) => ( + <> +
- Name - - Loan Amount - - Product/Tenor - - Repay/Install Amount - - Added - - Action -
-
- Jese image -
-
{item?.account_id || ''}
-
{item?.id} : {item?.transaction_id}
-
-
- 		-
- {/*
{formatNumber(item?.initial_loan_amount)}
*/} -
{formatNumber(item?.initial_loan_amount)}
-
- 		-
-
{formatNumber(item?.product_id)}
-
{item?.tenor} days
-
- 		-
-
{formatNumber(item?.repayment_amount)}
-
{formatNumber(item?.installment_amount)}
-
- 		-
-
{getDateFromDateString(item?.created_at)}
-
- 		-
-
- - - -
-
-
+ + + + + + + + - )) - : - - - - } - -
+ Name + + Loan Amount + + Product/Tenor + + Repay/Install Amount + + Added + + Action +
-
- No Record Found -
-
- - )} - - + + + {(data && data.length > 0) ? data?.map((item, index) => ( + + +
+ Jese image +
+
{item?.account_id || ''}
+
{item?.id} : {item?.transaction_id}
+
+
+ + +
+ {/*
{formatNumber(item?.initial_loan_amount)}
*/} +
#{formatNumber(item?.initial_loan_amount)}
+
+ + +
+
{formatNumber(item?.product_id)}
+
{item?.tenor} days +
+
+ + +
+
{formatNumber(item?.repayment_amount)}
+
{formatNumber(item?.installment_amount)}
+
+ + +
+
{getDateFromDateString(item?.created_at)}
+
+ + +
+
+ + + +
+
+ + + )) + : + + +
+ No Record Found +
+ + + } + + + + )} + + }
diff --git a/src/components/repayments/RepaymentsCom.jsx b/src/components/repayments/RepaymentsCom.jsx index 3fd1749..b098e50 100644 --- a/src/components/repayments/RepaymentsCom.jsx +++ b/src/components/repayments/RepaymentsCom.jsx @@ -1,32 +1,32 @@ -import { useEffect, useState } from 'react' +import {useEffect, useState} from 'react' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import Icons from '../Icons' -import { getRepayments } from '../../services/siteServices' +import {getRepayments} from '../../services/siteServices' import getDateFromDateString from '../../helpers/GetDateFromDateString'; -import Avatar from '../../assets/user_avatar.jpg' +import Avatar from '../../assets/loans2.png'; export default function RepaymentsCom() { const [page, setPage] = useState(1) - const [allRepayments, setAllRepayments] = useState({loading:true, error:'', data:{}}) + const [allRepayments, setAllRepayments] = useState({loading: true, error: '', data: {}}) const [willFilter, setWillFilter] = useState(false) const [filter, setFilter] = useState({type: '', id: ''}) - const handleFilter = ({target:{name, value}}) => { - setFilter(prev => ({...prev, [name]:value})) + const handleFilter = ({target: {name, value}}) => { + setFilter(prev => ({...prev, [name]: value})) } const handleFilterByParams = () => { - if(filter.type && !filter.id){ + if (filter.type && !filter.id) { return - }else if(!filter.type){ + } else if (!filter.type) { setPage(1) setWillFilter(prev => !prev) setFilter({type: '', id: ''}) - }else{ + } else { setPage(1) setWillFilter(prev => !prev) } @@ -37,114 +37,127 @@ export default function RepaymentsCom() { const isFetching = allRepayments?.loading const isError = allRepayments?.error - useEffect(()=>{ - setAllRepayments(prev => ({...prev, loading:true})) + useEffect(() => { + setAllRepayments(prev => ({...prev, loading: true})) const payload = filter?.type ? {[filter?.type]: filter.id} : {} getRepayments({...payload, page}).then(res => { - if(res?.status != 200){ - setAllRepayments(prev => ({...prev, loading:false})) + if (res?.status != 200) { + setAllRepayments(prev => ({...prev, loading: false})) return } - setAllRepayments({loading:false, error:'', data:res?.data}) + setAllRepayments({loading: false, error: '', data: res?.data}) }).catch(err => { - setAllRepayments({loading:false, error:'error occurred', data:{}}) + setAllRepayments({loading: false, error: 'error occurred', data: {}}) console.log('ERR', err) }) - },[page, willFilter]) + }, [page, willFilter]) return (
- +
- { isError ? + {isError ?

{allRepayments?.error}

- : - <> - {/* filter section */} -
- -
- + : + <> + {/* filter section */} +
+ +
+ +
+
+ +
+
-
- -
- -
- {/* end of filter section */} + {/* end of filter section */} - - {({ data }) => ( - <> - - - - - {/* + } + +
- Name - + + {({data}) => ( + <> + + + + + {/* */} - - - - - - {(data && data.length > 0) ? data?.map((item, index) => ( - - - {/* + + + + + {(data && data.length > 0) ? data?.map((item, index) => ( + + + {/* */} - - + + + )) + : + + - - )) - : - - - - } - -
+ CustomerID / ID:TrxID + Loan - Added - - Action -
-
- Jese image -
-
{item?.customer_id || ''}
-
{item?.loan_id} : {item?.transaction_id}
-
-
- 		+ + Added + + Action +
+
+ Jese image +
+
{item?.customer_id || ''}
+
{item?.loan_id} : {item?.transaction_id} +
+
+
+
{item?.loan}
{item?.description}
 -
-
{getDateFromDateString(item?.created_at)}
-
- 		-
-
- +
+
+
{getDateFromDateString(item?.created_at)}
+
+ 		+
+
+ +
+
+
+
+ No Record Found
- -
-
- No Record Found -
-
- - )} - - + +
+ + )} + + }
diff --git a/src/components/transactionDetails/LoanDetails.jsx b/src/components/transactionDetails/LoanDetails.jsx index c3e4409..a5d646f 100644 --- a/src/components/transactionDetails/LoanDetails.jsx +++ b/src/components/transactionDetails/LoanDetails.jsx @@ -3,7 +3,7 @@ import {useQuery} from "@tanstack/react-query"; import Icons from '../Icons' -import Avatar from '../../assets/user_avatar.jpg' +import Avatar from '../../assets/loans.png' import queryKeys from '../../services/queryKeys' import {getLoans} from '../../services/siteServices' import getDateFromDateString from '../../helpers/GetDateFromDateString'; diff --git a/src/components/transactions/TransactionsCom.jsx b/src/components/transactions/TransactionsCom.jsx index be94371..5e8be18 100644 --- a/src/components/transactions/TransactionsCom.jsx +++ b/src/components/transactions/TransactionsCom.jsx @@ -1,10 +1,10 @@ -import { useEffect, useState } from 'react' +import {useEffect, useState} from 'react' import {Link} from 'react-router-dom' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import Icons from '../Icons' -import { getTransactions } from '../../services/siteServices' +import {getTransactions} from '../../services/siteServices' import getDateFromDateString from '../../helpers/GetDateFromDateString'; import getTimeFromDateString from '../../helpers/GetTimeFromDateString'; import localImgLoader from '../../helpers/localImageLoader'; @@ -13,22 +13,22 @@ import RouteLinks from '../../RouteLinks'; export default function TransactionsCom() { const [page, setPage] = useState(1) - const [allTransactions, setAllTransaction] = useState({loading:true, error:'', data:{}}) + const [allTransactions, setAllTransaction] = useState({loading: true, error: '', data: {}}) const [willFilter, setWillFilter] = useState(false) const [filter, setFilter] = useState({type: '', id: ''}) - const handleFilter = ({target:{name, value}}) => { - setFilter(prev => ({...prev, [name]:value})) + const handleFilter = ({target: {name, value}}) => { + setFilter(prev => ({...prev, [name]: value})) } const handleFilterByParams = () => { - if(filter.type && !filter.id){ + if (filter.type && !filter.id) { return - }else if(!filter.type){ + } else if (!filter.type) { setPage(1) setWillFilter(prev => !prev) setFilter({type: '', id: ''}) - }else{ + } else { setPage(1) setWillFilter(prev => !prev) } @@ -39,119 +39,131 @@ export default function TransactionsCom() { const isFetching = allTransactions?.loading const isError = allTransactions?.error - useEffect(()=>{ - setAllTransaction(prev => ({...prev, loading:true})) + useEffect(() => { + setAllTransaction(prev => ({...prev, loading: true})) const payload = filter?.type ? {[filter?.type]: filter.id} : {} getTransactions({...payload, page}).then(res => { - if(res?.status != 200){ - setAllTransaction(prev => ({...prev, loading:false})) + if (res?.status != 200) { + setAllTransaction(prev => ({...prev, loading: false})) return } - setAllTransaction({loading:false, error:'', data:res?.data}) + setAllTransaction({loading: false, error: '', data: res?.data}) }).catch(err => { - setAllTransaction({loading:false, error:'error occurred', data:{}}) + setAllTransaction({loading: false, error: 'error occurred', data: {}}) console.log('ERR', err) }) - },[page, willFilter]) + }, [page, willFilter]) return (
- +
- { isError ? + {isError ?

{allTransactions?.error}

- : - <> - {/* filter section */} -
- -
- + : + <> + {/* filter section */} +
+ +
+ +
+
+ +
+
-
- -
- -
- {/* end of filter section */} + {/* end of filter section */} - - {({ data }) => ( - <> - - - - - - - - - - - {(data && data.length > 0) ? data?.map((item, index) => ( - - - - - + + {({data}) => ( + <> +
- Request - - Account - - Activity - - Action -
-
- Icon -
-
{item?.transaction_id}
-
{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}
-
-
- 		-
-
{item?.account_id}
-
{item?.type}
-
- 		-
-
50%
-
-
-
-
- 		-
-
- - - -
-
-
+ + + + + + - )) - : - - - - } - -
+ Request + + Account + + Customer/ID + + Action +
-
- No Record Found -
-
- - )} - - + + + {(data && data.length > 0) ? data?.map((item, index) => ( + + +
+ Icon +
+
{item?.transaction_id}
+
{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}
+
+
+ + +
+
{item?.account_id}
+
{item?.type}
+
+ + +
+
{item?.customer_id}
+
ID:{item?.id}
+
+ + +
+
+ + + +
+
+ + + )) + : + + +
+ No Record Found +
+ + + } + + + + )} + + }