MERMS/MermsFirstOffice
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Table fixed #2

Merged
ameye merged 1 commits from subscription-table-fix into master 2025-09-02 19:20:17 +00:00
Conversation 0 Commits 1 Files Changed 5
+116 -95
5 changed files with 116 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/loan_charges/BillingsCom.jsx
+42 -45
View File
@@ -1,10 +1,12 @@
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons' import Icons from '../Icons'
import { getBillings } from '../../services/siteServices' import { getBillings } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString'; import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
import formatNumber from '../../helpers/formatNumber' import formatNumber from '../../helpers/formatNumber'
import Avatar from '../../assets/user_avatar.jpg' import Avatar from '../../assets/user_avatar.jpg'
@@ -12,10 +14,9 @@ import Avatar from '../../assets/user_avatar.jpg'
export default function BillingsCom() { export default function BillingsCom() {
const [page, setPage] = useState(1) const [page, setPage] = useState(1)
const [allBillings, setAllBillings] = useState({loading:true, error:'', data:{}})
const [willFilter, setWillFilter] = useState(false)
const [filter, setFilter] = useState({type: '', id: ''}) const [filter, setFilter] = useState({type: '', id: ''})
const [willFilter, setWillFilter] = useState(false)
const handleFilter = ({target:{name, value}}) => { const handleFilter = ({target:{name, value}}) => {
setFilter(prev => ({...prev, [name]:value})) setFilter(prev => ({...prev, [name]:value}))
} }
@@ -33,25 +34,20 @@ export default function BillingsCom() {
} }
} }
const billings = allBillings?.data?.loan_charges // LOAN CHARGES LIST const {data, isFetching, isError, error} = useQuery({
const pagination = allBillings?.data?.pagination queryKey: [...queryKeys.billings, page, willFilter],
const isFetching = allBillings?.loading queryFn: () => {
const isError = allBillings?.error const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = {
useEffect(()=>{ page,
setAllBillings(prev => ({...prev, loading:true})) ...filterData
const payload = filter?.type ? {[filter?.type]: filter.id} : {}
getBillings({...payload, page}).then(res => {
if(res?.status != 200){
setAllBillings(prev => ({...prev, error:'Opps, an error occurred', loading:false}))
return
} }
setAllBillings({loading:false, error:'', data:res?.data}) return getBillings(reqData)
}).catch(err => { },
setAllBillings({loading:false, error:'error occurred', data:{}}) staleTime: 0 //0 mins
console.log('ERR', err) })
}) const billingData = data?.data?.payments // BILLINGS LIST
},[page, willFilter]) const pagination = data?.data?.pagination
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
@@ -59,7 +55,7 @@ export default function BillingsCom() {
<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 ? { isError ?
<p className='text-red-500'>{allBillings?.error}</p> <p className='text-red-500'>{error?.message}</p>
: :
<> <>
{/* filter section */} {/* filter section */}
@@ -79,26 +75,26 @@ export default function BillingsCom() {
</div> </div>
{/* end of filter section */} {/* end of filter section */}
<TablePaginatedWrapper data={billings} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}> <TablePaginatedWrapper data={billingData} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
{({ data }) => ( {({ data }) => (
<> <>
<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"> <thead className="py-2 text-sm text-slate-500 text-left">
<tr> <tr>
<th scope="col" className="px-2 py-2"> <th scope="col" className="px-2 py-2">
Name Added
</th>
<th scope="col" className="px-2">
Option Name
</th>
<th scope="col" className="px-2">
Product ID
</th> </th>
{/* <th scope="col" className="px-2">
Loan
</th> */}
<th scope="col" className="px-2 text-right"> <th scope="col" className="px-2 text-right">
Amount Amount
</th> </th>
<th scope="col" className="px-2 text-right"> <th scope="col" className="px-2 text-right">
Added Status
</th>
<th scope="col" className="px-2 text-right">
Action
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -107,29 +103,30 @@ export default function BillingsCom() {
<tr key={index} className="py-2 border-t border-dashed border-slate-300"> <tr key={index} 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 className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<img className="w-10 h-10 rounded-md" src={Avatar} alt="Jese image" />
<div className="text-left"> <div className="text-left">
<div className="text-base font-semibold">{item?.transaction_id || ''}</div> <div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
<div className="font-normal text-gray-500 line-clamp-1">{item?.code}</div>
</div> </div>
</div> </div>
</td> </td>
<td className="px-2"> <td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.option_name}</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.product_id}</div>
</div>
</td>
<td className="px-2">
<div className="text-right"> <div className="text-right">
{/* <div className="text-base font-semibold">{formatNumber(item?.initial_loan_amount)}</div> */} <div className="text-base font-semibold">{item?.amount}</div>
<div className="font-normal text-gray-500">{formatNumber(item?.amount)}</div> {/* <div className="font-normal text-gray-500">{item?.external_url}</div> */}
</div> </div>
</td> </td>
<td className="px-2"> <td className="px-2">
<div className="text-right"> <div className="text-right">
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div> <div className="text-base font-semibold">{item?.status}</div>
</div>
</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='eye' />
</div>
</div> </div>
</td> </td>
</tr> </tr>
src/components/transactions/SubscriptionsCom.jsx
+36 -49
View File
@@ -1,22 +1,22 @@
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import {Link} from 'react-router-dom' import {Link} from 'react-router-dom'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons' import Icons from '../Icons'
import { getSubcriptions } from '../../services/siteServices' import { getSubscriptions } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString'; import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
import localImgLoader from '../../helpers/localImageLoader'; import localImgLoader from '../../helpers/localImageLoader';
import RouteLinks from '../../RouteLinks'; import RouteLinks from '../../RouteLinks';
export default function SubscriptionsCom() { export default function SubscriptionsCom() {
const [page, setPage] = useState(1) const [page, setPage] = useState(1)
const [allSubcriptions, setAllSubcriptions] = useState({loading:true, error:'', data:{}})
const [willFilter, setWillFilter] = useState(false)
const [filter, setFilter] = useState({type: '', id: ''}) const [filter, setFilter] = useState({type: '', id: ''})
const [willFilter, setWillFilter] = useState(false)
const handleFilter = ({target:{name, value}}) => { const handleFilter = ({target:{name, value}}) => {
setFilter(prev => ({...prev, [name]:value})) setFilter(prev => ({...prev, [name]:value}))
} }
@@ -34,25 +34,20 @@ export default function SubscriptionsCom() {
} }
} }
const subcriptions = allSubcriptions?.data?.transactions // TRANSACTIONS LIST const {data, isFetching, isError, error} = useQuery({
const pagination = allSubcriptions?.data?.pagination queryKey: [...queryKeys.subscriptions, page, willFilter],
const isFetching = allSubcriptions?.loading queryFn: () => {
const isError = allSubcriptions?.error const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = {
useEffect(()=>{ page,
setAllSubcriptions(prev => ({...prev, loading:true})) ...filterData
const payload = filter?.type ? {[filter?.type]: filter.id} : {}
getSubcriptions({...payload, page}).then(res => {
if(res?.status != 200){
setAllSubcriptions(prev => ({...prev, error:'Opps, an error occurred', loading:false}))
return
} }
setAllSubcriptions({loading:false, error:'', data:res?.data}) return getSubscriptions(reqData)
}).catch(err => { },
setAllSubcriptions({loading:false, error:'error occurred', data:{}}) staleTime: 0 //0 mins
console.log('ERR', err) })
}) const subscriptionData = data?.data?.subscriptions // SUBSCRIPTION LIST
},[page, willFilter]) const pagination = data?.data?.pagination
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
@@ -60,7 +55,7 @@ export default function SubscriptionsCom() {
<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 ? { isError ?
<p className='text-red-500'>{allSubcriptions?.error}</p> <p className='text-red-500'>{error?.message}</p>
: :
<> <>
{/* filter section */} {/* filter section */}
@@ -80,23 +75,23 @@ export default function SubscriptionsCom() {
</div> </div>
{/* end of filter section */} {/* end of filter section */}
<TablePaginatedWrapper data={subcriptions} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}> <TablePaginatedWrapper data={subscriptionData} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
{({ data }) => ( {({ data }) => (
<> <>
<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"> <thead className="py-2 text-sm text-slate-500 text-left">
<tr> <tr>
<th scope="col" className="px-2 py-2"> <th scope="col" className="px-2 py-2">
Request Added
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Account Product
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Activity URL
</th> </th>
<th scope="col" className="px-2 text-right"> <th scope="col" className="px-2 text-right">
Action Status
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -105,34 +100,26 @@ export default function SubscriptionsCom() {
<tr key={index} className="py-2 border-t border-dashed border-slate-300"> <tr key={index} 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 className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" /> {/* <img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" /> */}
<div className="text-left"> <div className="text-left">
<div className="text-base font-semibold">{item?.transaction_id}</div> <div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
</div> </div>
</div> </div>
</td> </td>
<td className="px-2"> <td className="px-2">
<div className="text-left"> <div className="text-left">
<div className="text-base font-semibold">{item?.account_id}</div> <div className="text-base font-semibold">{item?.product_id}</div>
<div className="font-normal text-gray-500">{item?.type}</div> </div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.internal_url}</div>
<div className="font-normal text-gray-500">{item?.external_url}</div>
</div> </div>
</td> </td>
<td className="px-2"> <td className="px-2">
<div className="text-left"> <div className="text-right">
<div className="font-normal text-gray-500">50%</div> <div className="text-base font-semibold">{item?.status}</div>
<div className="relative h-[6px] w-full bg-white-body dark:bg-black-body rounded-full overflow-hidden">
<div className={`absolute left-0 h-full w-1/2 bg-emerald-600`}></div>
</div>
</div>
</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'>
<Link to={RouteLinks.transaction_details_page} state={{transactionID: item?.transaction_id}}>
<Icons name='eye' />
</Link>
</div>
</div> </div>
</td> </td>
</tr> </tr>
src/helpers/getDateTimeFromDateString.js
+33
View File
@@ -0,0 +1,33 @@
function getDateTimeFromDateString(dateString) {
const date = new Date(dateString);
const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
const dayName = days[date.getDay()];
const monthName = months[date.getMonth()];
const day = date.getDate();
const year = date.getFullYear();
// Add ordinal suffix
function getOrdinal(n) {
if (n > 3 && n < 21) return "th"; // 4-20 are all "th"
switch (n % 10) {
case 1: return "st";
case 2: return "nd";
case 3: return "rd";
default: return "th";
}
}
// Format time in 12hr with AM/PM
let hours = date.getHours();
const minutes = date.getMinutes().toString().padStart(2, "0");
const ampm = hours >= 12 ? "PM" : "AM";
hours = hours % 12 || 12;
return `${dayName}, ${monthName} ${day}${getOrdinal(day)} ${year} ${hours}:${minutes}${ampm}`;
}
export default getDateTimeFromDateString
src/services/queryKeys.js
+4
View File
@@ -10,6 +10,10 @@ const queryKeys = {
select_loan: ['select-loan'], select_loan: ['select-loan'],
approved_loan: ['approved-loan'], approved_loan: ['approved-loan'],
loan_offers: ['loan-offers'], loan_offers: ['loan-offers'],
// new
subscriptions: ['subscriptions'],
billings: ['billings'],
} }
export default queryKeys export default queryKeys
src/services/siteServices.js
+1 -1
View File
@@ -69,7 +69,7 @@ export const getBillings = (reqData) => {
} }
// FUNCTION TO GET SUBSCRIPTIONS // FUNCTION TO GET SUBSCRIPTIONS
export const getSubcriptions = (reqData) => { export const getSubscriptions = (reqData) => {
const postData = { ...reqData } const postData = { ...reqData }
return getAuxEnd(`/subcriptions`, postData) return getAuxEnd(`/subcriptions`, postData)
} }