diff --git a/src/components/applicationsloancom/ApplicationsLoanCom.jsx b/src/components/applicationsloancom/ApplicationsLoanCom.jsx
index fbe847e..8c3d3c4 100644
--- a/src/components/applicationsloancom/ApplicationsLoanCom.jsx
+++ b/src/components/applicationsloancom/ApplicationsLoanCom.jsx
@@ -55,9 +55,6 @@ export default function LoanOffersCom() {
Added
|
-
- Verified
- |
Action
|
@@ -84,11 +81,6 @@ export default function LoanOffersCom() {
{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
-
-
- {!item?.verified ? 'N/A' : `${getDateFromDateString(item?.verified)} ${getTimeFromDateString(item?.verified)}`}
-
- |
{/* */}
{/*
@@ -104,7 +96,7 @@ export default function LoanOffersCom() {
))
:
|
- |
+ |
No Record Found
diff --git a/src/components/approvedloancom/ApprovedLoanCom.jsx b/src/components/approvedloancom/ApprovedLoanCom.jsx
index 49d5f0c..8d63253 100644
--- a/src/components/approvedloancom/ApprovedLoanCom.jsx
+++ b/src/components/approvedloancom/ApprovedLoanCom.jsx
@@ -11,6 +11,7 @@ import queryKeys from '../../services/queryKeys'
import { approvedLoan } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
+import formatNumber from '../../helpers/formatNumber';
export default function ApprovedLoanCom() {
@@ -51,6 +52,15 @@ export default function ApprovedLoanCom() {
|
Added
|
+
+ Verified
+ |
+
+ Initail Amount
+ |
+
+ Fee
+ |
Action
|
@@ -74,6 +84,17 @@ export default function ApprovedLoanCom() {
{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
+
+
+ {getDateFromDateString(item?.verified)} {getTimeFromDateString(item?.verified)}
+
+ |
+
+ {formatNumber(item?.amount)}
+ |
+
+ {formatNumber(item?.total_fee)}
+ |
{/* */}
{/*
@@ -89,7 +110,7 @@ export default function ApprovedLoanCom() {
))
:
|
- |
+ |
No Record Found
diff --git a/src/components/disbursementsloancom/DisbursementsLoanCom.jsx b/src/components/disbursementsloancom/DisbursementsLoanCom.jsx
index 08ea406..e85e945 100644
--- a/src/components/disbursementsloancom/DisbursementsLoanCom.jsx
+++ b/src/components/disbursementsloancom/DisbursementsLoanCom.jsx
@@ -8,15 +8,16 @@ import Icons from '../Icons'
import Avatar from '../../assets/user_avatar.jpg'
import queryKeys from '../../services/queryKeys'
-import { approvedLoan } from '../../services/siteServices'
+import { disbursementsLoan } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
+import formatNumber from '../../helpers/formatNumber';
export default function DisbursementsLoanCom() {
const {data, isFetching, isError, error} = useQuery({
- queryKey: queryKeys.approved_loan,
- queryFn: () => approvedLoan()
+ queryKey: queryKeys.disbursements_loan,
+ queryFn: () => disbursementsLoan()
})
const approvedUsers = data?.data?.result_data?.data // DISBURSED LOAN LIST
@@ -51,6 +52,15 @@ export default function DisbursementsLoanCom() {
|
Added
|
+
+ Amount
+ |
+
+ Disbursement Status
+ |
+
+ Fee
+ |
Action
|
@@ -74,6 +84,15 @@ export default function DisbursementsLoanCom() {
{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
+
+ {formatNumber(item?.approved_amount)}
+ |
+
+ {item?.transmission_status}
+ |
+
+ {formatNumber(item?.total_fee)}
+ |
{/* */}
{/*
@@ -81,7 +100,7 @@ export default function DisbursementsLoanCom() {
*/}
{/* */}
{/* */}
-
+ {/* */}
|
@@ -89,7 +108,7 @@ export default function DisbursementsLoanCom() {
))
:
- |
+ |
No Record Found
diff --git a/src/components/tableWrapper/TableWrapper.jsx b/src/components/tableWrapper/TableWrapper.jsx
index d666394..5cc1580 100644
--- a/src/components/tableWrapper/TableWrapper.jsx
+++ b/src/components/tableWrapper/TableWrapper.jsx
@@ -87,7 +87,6 @@ export default function TableWrapper({
Showing
{isLoading ? '----' : `${currentPage + 1}-${currentPage + numberOfSelection >= data.length ? data.length : (currentPage + numberOfSelection)}`} of {data.length}
- {(newData.length >= itemsPerPage) &&
- }
+ {/* {(newData.length >= itemsPerPage) &&
+ } */}
}
diff --git a/src/helpers/formatNumber.js b/src/helpers/formatNumber.js
new file mode 100644
index 0000000..c1b6c57
--- /dev/null
+++ b/src/helpers/formatNumber.js
@@ -0,0 +1,6 @@
+const formatNumber = (number = 0) => {
+ // return new Intl.NumberFormat().format(number);
+ return number.toFixed(2);
+ };
+
+ export default formatNumber
\ No newline at end of file
diff --git a/src/services/queryKeys.js b/src/services/queryKeys.js
index a8a232c..479826e 100644
--- a/src/services/queryKeys.js
+++ b/src/services/queryKeys.js
@@ -2,6 +2,7 @@ const queryKeys = {
apply_loan: ['apply'],
select_loan: ['select-loan'],
approved_loan: ['approved-loan'],
+ disbursements_loan: ['disbursements-loan'],
loan_offers: ['loan-offers'],
}
diff --git a/src/services/siteServices.js b/src/services/siteServices.js
index 55595c5..e27fe22 100644
--- a/src/services/siteServices.js
+++ b/src/services/siteServices.js
@@ -72,4 +72,10 @@ export const selectLoan = (reqData) => {
export const approvedLoan = (reqData) => {
const postData = { ...reqData }
return getAuxEnd(`/office/loan/approved`, postData)
+}
+
+// FUNCTION TO GET DISBURSEMENTS LOANS TABLE
+export const disbursementsLoan = (reqData) => {
+ const postData = { ...reqData }
+ return getAuxEnd(`/office/loan/disbursements`, postData)
}
\ No newline at end of file
|