From 4cad2582de0ba9e10379a28a667eee599cc84c1e Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Mon, 10 Mar 2025 12:10:23 +0100
Subject: [PATCH] updated confirmation page

---
 .../ApplicationsLoanCom.jsx                   | 10 +------
 .../approvedloancom/ApprovedLoanCom.jsx       | 23 ++++++++++++++-
 .../DisbursementsLoanCom.jsx                  | 29 +++++++++++++++----
 src/components/tableWrapper/TableWrapper.jsx  |  4 +--
 src/helpers/formatNumber.js                   |  6 ++++
 src/services/queryKeys.js                     |  1 +
 src/services/siteServices.js                  |  6 ++++
 7 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 src/helpers/formatNumber.js

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() {
                                     <th scope="col" className="px-4 py-2">
                                         Added
                                     </th>
-                                    <th scope="col" className="px-4 py-2">
-                                        Verified
-                                    </th>
                                     <th scope="col" className="px-4 py-2">
                                         Action
                                     </th>
@@ -84,11 +81,6 @@ export default function LoanOffersCom() {
                                                 {getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
                                             </div>
                                         </td>
-                                        <td className="px-3 py-2">
-                                            <div className="flex items-center">
-                                                {!item?.verified ? 'N/A' : `${getDateFromDateString(item?.verified)} ${getTimeFromDateString(item?.verified)}`}
-                                            </div>
-                                        </td>
                                         <td className="px-3 py-2 flex gap-3 md:gap-4">
                                             {/* <!-- Modal toggle --> */}
                                             {/* <Link to={RouteLinks.manageAdminPage}>
@@ -104,7 +96,7 @@ export default function LoanOffersCom() {
                                 ))
                                 :
                                 <tr className="w-3 p-3">
-                                    <td className="px-3 py-2" colSpan={6}>
+                                    <td className="px-3 py-2" colSpan={5}>
                                         <div className="flex justify-center items-center">
                                             No Record Found
                                         </div>
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() {
                                     <th scope="col" className="px-4 py-2">
                                         Added
                                     </th>
+                                    <th scope="col" className="px-4 py-2">
+                                        Verified
+                                    </th>
+                                    <th scope="col" className="px-4 py-2">
+                                        Initail Amount
+                                    </th>
+                                    <th scope="col" className="px-4 py-2">
+                                        Fee
+                                    </th>
                                     <th scope="col" className="px-4 py-2">
                                         Action
                                     </th>
@@ -74,6 +84,17 @@ export default function ApprovedLoanCom() {
                                             {getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
                                             </div>
                                         </td>
+                                        <td className="px-3 py-2">
+                                            <div className="flex items-center">
+                                            {getDateFromDateString(item?.verified)} {getTimeFromDateString(item?.verified)}
+                                            </div>
+                                        </td>
+                                        <td className="px-3 py-2">
+                                            {formatNumber(item?.amount)}
+                                        </td>
+                                        <td className="px-3 py-2">
+                                            {formatNumber(item?.total_fee)}
+                                        </td>
                                         <td className="px-3 py-2 flex gap-3 md:gap-4">
                                             {/* <!-- Modal toggle --> */}
                                             {/* <Link to={RouteLinks.manageAdminPage}>
@@ -89,7 +110,7 @@ export default function ApprovedLoanCom() {
                                 ))
                                 :
                                 <tr className="w-3 p-3">
-                                    <td className="px-3 py-2" colSpan={4}>
+                                    <td className="px-3 py-2" colSpan={7}>
                                         <div className="flex justify-center items-center">
                                             No Record Found
                                         </div>
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() {
                                     <th scope="col" className="px-4 py-2">
                                         Added
                                     </th>
+                                    <th scope="col" className="px-4 py-2">
+                                        Amount
+                                    </th>
+                                    <th scope="col" className="px-4 py-2">
+                                        Disbursement Status
+                                    </th>
+                                    <th scope="col" className="px-4 py-2">
+                                        Fee
+                                    </th>
                                     <th scope="col" className="px-4 py-2">
                                         Action
                                     </th>
@@ -74,6 +84,15 @@ export default function DisbursementsLoanCom() {
                                             {getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
                                             </div>
                                         </td>
+                                        <td className="px-3 py-2">
+                                            {formatNumber(item?.approved_amount)}
+                                        </td>
+                                        <td className="px-3 py-2">
+                                            {item?.transmission_status}
+                                        </td>
+                                        <td className="px-3 py-2">
+                                            {formatNumber(item?.total_fee)}
+                                        </td>
                                         <td className="px-3 py-2 flex gap-3 md:gap-4">
                                             {/* <!-- Modal toggle --> */}
                                             {/* <Link to={RouteLinks.manageAdminPage}>
@@ -81,7 +100,7 @@ export default function DisbursementsLoanCom() {
                                             </Link> */}
                                             {/* <i onClick={handleShowEditModal} className="fa-solid fa-pen-to-square text-base md:text-lg cursor-pointer p-2"></i> */}
                                             {/* <i onClick={handleDeleteModal} className="fa-solid fa-trash text-base md:text-lg cursor-pointer p-2 text-red-500"></i> */}
-                                            <Icons name='edit' />
+                                            {/* <Icons name='edit' /> */}
                                             <Icons name='eye' />
                                             <Icons name='trash' className={'hidden text-red-500'} />
                                         </td>
@@ -89,7 +108,7 @@ export default function DisbursementsLoanCom() {
                                 ))
                                 :
                                 <tr className="w-3 p-3">
-                                    <td className="px-3 py-2" colSpan={4}>
+                                    <td className="px-3 py-2" colSpan={7}>
                                         <div className="flex justify-center items-center">
                                             No Record Found
                                         </div>
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({
             <div className="text-sm text-center lg:text-left font-normal text-gray-500 dark:text-gray-400 block w-full">Showing <span className="font-semibold text-gray-900 dark:text-white">
               {isLoading ? '----' : `${currentPage + 1}-${currentPage + numberOfSelection >= data.length ? data.length : (currentPage + numberOfSelection)}`}</span> of <span className="font-semibold text-gray-900 dark:text-white">{data.length}</span>
             </div>
-            {(newData.length >= itemsPerPage) &&
               <div className='flex items-center gap-3 md:gap-6'>
                   <MainBtn 
                       onClick={handlePrev}
@@ -106,7 +105,8 @@ export default function TableWrapper({
                   <Icons name='next' />
                   </MainBtn>
               </div>
-            }
+            {/* {(newData.length >= itemsPerPage) &&
+            } */}
           </div>
         }
       </div>
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