customer API added

src/_digifi/helpers/crud-helper/consts.ts

@@ -6,6 +6,7 @@ const QUERIES = {
   PENDING_LIST: 'pending-list',
   APPROVED_LIST: 'approved-list',
   REJECTED_LIST: 'rejected-list',
+  CUSTOMERS_LIST: 'customers-list',
   EMPLOYERS_LIST: 'employers-list',
   SIGNATORY_LIST: 'signatory-list',
 }

src/app/modules/apps/user-management/UsersPage.tsx

@@ -4,7 +4,7 @@ import {UsersListWrapper} from './users-list/UsersList'
 
 const usersBreadcrumbs: Array<PageLink> = [
   {
-    title: 'User Management',
+    title: 'Customer Management',
     path: '/tools/user-management/users',
     isSeparator: false,
     isActive: false,
@@ -25,7 +25,7 @@ const UsersPage = () => {
           path='users'
           element={
             <>
-              <PageTitle breadcrumbs={usersBreadcrumbs}>Users list</PageTitle>
+              <PageTitle breadcrumbs={usersBreadcrumbs}>Customer list</PageTitle>
               <UsersListWrapper />
             </>
           }

src/app/modules/apps/user-management/users-list/core/QueryResponseProvider.tsx

@@ -11,7 +11,7 @@ import {
   stringifyRequestQuery,
   WithChildren,
 } from '../../../../../../_digifi/helpers'
-import {getStartedUsers} from './_requests'
+import {getCustomerList} from './_requests'
 import {User} from './_models'
 import {useQueryRequest} from './QueryRequestProvider'
 
@@ -32,9 +32,9 @@ const QueryResponseProvider: FC<WithChildren> = ({children}) => {
     refetch,
     data: response,
   } = useQuery(
-    `${QUERIES.USERS_LIST}-${query}`,
+    `${QUERIES.CUSTOMERS_LIST}-${query}`,
     () => {
-      return getStartedUsers(query)
+      return getCustomerList(query)
     },
     {cacheTime: 0, keepPreviousData: true, refetchOnWindowFocus: false}
   )

src/app/modules/apps/user-management/users-list/core/_models.ts

@@ -29,6 +29,7 @@ export type User = {
   status?: string
   added?: string
   updated?: string
+  bvn?: string
 }
 
 export type UsersQueryResponse = Response<Array<User>>

src/app/modules/apps/user-management/users-list/core/_requests.ts

@@ -13,9 +13,9 @@ const NEW_USER_ENDPOINT = import.meta.env.VITE_APP_USER_ENDPOINT
 //     .get(`${GET_USERS_URL}?${query}`)
 //     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 // };
-const getStartedUsers = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
+const getCustomerList = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
   return axios
-    .get(`${NEW_USER_ENDPOINT}/loan/started`)
+    .get(`${NEW_USER_ENDPOINT}/customers`)
     .then((d: AxiosResponse<UsersQueryResponse>) => d.data);
 };
 
@@ -50,7 +50,7 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
 };
 
 export {
-  getStartedUsers,
+  getCustomerList,
   deleteUser,
   deleteSelectedUsers,
   getUserById,

src/app/modules/apps/user-management/users-list/table/columns/AgentCell.tsx

@@ -1,11 +0,0 @@
-import {FC} from 'react'
-
-type Props = {
-  agent?: string
-}
-
-const AgentCell: FC<Props> = ({agent}) => (
-  <> {agent && <div className='badge badge-light-success fw-bolder'>{agent}</div>}</>
-)
-
-export {AgentCell}

src/app/modules/apps/user-management/users-list/table/columns/Status.tsx

@@ -0,0 +1,11 @@
+import {FC} from 'react'
+
+type Props = {
+  status?: string
+}
+
+const Status: FC<Props> = ({status}) => (
+  <> {status && <div className='badge badge-light-success fw-bolder'>{status}</div>}</>
+)
+
+export {Status}

src/app/modules/apps/user-management/users-list/table/columns/_columns.tsx

@@ -1,7 +1,7 @@
 import {Column} from 'react-table'
 import {UserInfoCell} from './UserInfoCell'
 import { PaymentMonthCell } from './UserLastLoginCell'
-import {AgentCell} from './AgentCell'
+import {Status} from './Status'
 import {UserActionsCell} from './UserActionsCell'
 import {UserSelectionCell} from './UserSelectionCell'
 import {UserCustomHeader} from './UserCustomHeader'
@@ -21,22 +21,22 @@ const usersColumns: ReadonlyArray<Column<User>> = [
     Cell: ({...props}) => <UserInfoCell user={props.data[props.row.index]} />,
   },
   {
-    Header: (props) => <UserCustomHeader tableProps={props} title='Amount' className='min-w-125px' />,
+    Header: (props) => <UserCustomHeader tableProps={props} title='BVN' className='min-w-125px' />,
-    accessor: 'loan_amount',
+    accessor: 'bvn',
   },
+  // {
+  //   Header: (props) => (
+  //     <UserCustomHeader tableProps={props} title='Payment Terms' className='min-w-125px' />
+  //   ),
+  //   id: 'payment_month',
+  //   Cell: ({...props}) => <PaymentMonthCell payment_month={props.data[props.row.index].payment_month} />,
+  // },
   {
     Header: (props) => (
-      <UserCustomHeader tableProps={props} title='Payment Terms' className='min-w-125px' />
+      <UserCustomHeader tableProps={props} title='Status' className='min-w-125px' />
     ),
-    id: 'payment_month',
+    id: 'status',
-    Cell: ({...props}) => <PaymentMonthCell payment_month={props.data[props.row.index].payment_month} />,
+    Cell: ({...props}) => <Status status={props.data[props.row.index].status} />,
-  },
-  {
-    Header: (props) => (
-      <UserCustomHeader tableProps={props} title='Agent' className='min-w-125px' />
-    ),
-    id: 'sales_agent',
-    Cell: ({...props}) => <AgentCell agent={props.data[props.row.index].sales_agent} />,
   },
   {
     Header: (props) => (

src/app/modules/process/approve-reject-page/ApproveRejectPage.tsx

@@ -72,20 +72,20 @@ export default function ApproveRejectPage() {
                             </button>
                         </div>
                     </div>
-                    <div className="card card-flash flex flex-col p-4 h-md-50 mb-5 mb-xl-10 bg-secondary">
+                    <div className="card card-flash flex flex-col p-4 h-md-50 mb-5 mb-xl-10 bg-secondary overflow-scroll">
                         <h3 className='card-title text-gray-800 fw-bold mb-5'>Verification details</h3>
                         <div className='w-100'>
                             {loanDetails?.data?.verification.length > 0 ?
                             <table className='w-100'>
-                                <tr>
-                                    <th>UID</th>
-                                    <th>EMPLOYER NAME</th>
-                                </tr>
                                 {loanDetails?.data?.verification?.map((item:any) => (
-                                    <tr key={item.uid || item.id}>
+                                    <tbody key={item.uid || item.id}>
-                                        <td>{item.uid}</td>
+                                        {Object.keys(item).map(key => (
-                                        <td>{item.employers_name}</td>
+                                            <tr>
-                                    </tr>
+                                                <th className='text-uppercase py-3'>{key}</th>
+                                                <td>{item[key]}</td>
+                                            </tr>
+                                        ))}
+                                    </tbody>
                                 ))}
                             </table>
                             :
@@ -103,15 +103,15 @@ export default function ApproveRejectPage() {
                         <div className='w-100'>
                             {loanDetails?.data?.application.length > 0 ?
                             <table className='w-100'>
-                                <tr>
-                                    <th>UID</th>
-                                    <th>AMOUNT</th>
-                                </tr>
                                 {loanDetails?.data?.application?.map((item:any) => (
-                                    <tr key={item.uid || item.id}>
+                                    <tbody key={item.uid || item.id}>
-                                        <td>{item.uid}</td>
+                                        {Object.keys(item).map(key => (
-                                        <td>{item.loan_amount}</td>
+                                            <tr>
-                                    </tr>
+                                                <th className='text-uppercase py-3'>{key}</th>
+                                                <td className='flex text-break'>{item[key]}</td>
+                                            </tr>
+                                        ))}
+                                    </tbody>
                                 ))}
                             </table>
                             :