Compare commits

..

1 Commits

Author SHA1 Message Date
victorAnumudu 7a42cd5c65 account view subscription table added 2025-09-28 06:54:04 +01:00
16 changed files with 402 additions and 503 deletions
+1 -1
View File
@@ -3,8 +3,8 @@ const RouteLinks = {
homePage: '/', homePage: '/',
customerPage: '/customer', customerPage: '/customer',
accountDetails: '/account-view/*', accountDetails: '/account-view/*',
subscriptionDetails: '/subscription-view/*',
subscriptions: '/subscriptions', subscriptions: '/subscriptions',
subscriptionDetails: '/subscription-view/*',
billings: '/billings', billings: '/billings',
recentSignup: '/recent-signup', recentSignup: '/recent-signup',
loansPage: '/loans', loansPage: '/loans',
+3 -3
View File
@@ -19,8 +19,8 @@ import LoansPage from './pages/LoansPage' // SELECTED LOANS PAGE
import TransactionDetailsPage from './pages/TransactionDetailsPage' import TransactionDetailsPage from './pages/TransactionDetailsPage'
import AccountDetailsPage from "./pages/AccountDetailsPage"; import AccountDetailsPage from "./pages/AccountDetailsPage";
import ProductTemplatePage from "./pages/ProductTemplatePage"; import ProductTemplatePage from "./pages/ProductTemplatePage";
import CustomTemplatePage from "./pages/CustomTemplatePage"; import CustomTemplatePage from "./pages/CustomTemplatePage"; // TRANSACTION DETAILS PAGE
import SubscriptionDetailsPage from "./pages/SubscriptionDetailsPage"; // TRANSACTION DETAILS PAGE import SubscriptionDetailViewPage from './pages/SubscriptionDetailViewPage' // SUBSCRIPTION DETAIL VIEW PAGE
// const Home = lazy(() => import('./pages/Home')); // const Home = lazy(() => import('./pages/Home'));
@@ -42,11 +42,11 @@ export default function SiteRoutes() {
<Route path={RouteLinks.productTemplates} element={<ProductTemplatePage/>}/> {`*/PRODUCTS TEMPLATE PAGE*/`} <Route path={RouteLinks.productTemplates} element={<ProductTemplatePage/>}/> {`*/PRODUCTS TEMPLATE PAGE*/`}
<Route path={RouteLinks.customTemplates} element={<CustomTemplatePage/>}/> {`*/CUSTOM TEMPLATES PAGE*/`} <Route path={RouteLinks.customTemplates} element={<CustomTemplatePage/>}/> {`*/CUSTOM TEMPLATES PAGE*/`}
<Route path={RouteLinks.subscriptionDetails} element={<SubscriptionDetailViewPage/>}/> {`*/SUBSCRIPTION DETAIL VIEW PAGE*/`}
<Route path={RouteLinks.loansPage} element={<LoansPage/>}/> {`*/LOANS PAGE*/`} <Route path={RouteLinks.loansPage} element={<LoansPage/>}/> {`*/LOANS PAGE*/`}
<Route path={RouteLinks.transaction_details_page} <Route path={RouteLinks.transaction_details_page}
element={<TransactionDetailsPage/>}/> {`*/TRANSACTION PAGE*/`} element={<TransactionDetailsPage/>}/> {`*/TRANSACTION PAGE*/`}
<Route path={RouteLinks.subscriptionDetails} element={<SubscriptionDetailsPage/>} />
</Route> </Route>
{/* ERROR PAGE */} {/* ERROR PAGE */}
@@ -1,61 +1,52 @@
export default function AccountProfileView({profile}) {
export default function AccountProfileView() {
return <> return <>
<div className="pb-5"> <div className="row" style={{paddingBottom:'20px'}}>
<div className="flex flex-col gap-1"> <div className="col-12 col-lg-12">
<div className="w-full"> <div className="card card-statistics">
<h4 className="font-semibold text-lg">Account Profile</h4> <div className="card-header">
<div className="card-heading">
<h4 className="card-title"><b>Account Profile</b></h4>
</div>
</div> </div>
<div className="w-full overflow-x-auto"> <div className="card-body">
<> <div className="table-responsive">
<table className="py-2 w-full text-sm bg-[aliceblue] dark:bg-transparent rounded-[10px]"> <table className="table table-hover mb-0" style={{width:'100%', backgroundColor: 'aliceblue', borderRadius: '10px'}}>
<thead className="py-2 text-sm text-slate-500 text-left"> <thead>
<tr> <tr>
<th scope="col">#</th>
<th scope="col" className="px-2 py-2"> <th scope="col">First</th>
Member ID <th scope="col">Last</th>
</th> <th scope="col">Handle</th>
<th scope="col" className="px-2">
Practice/specialization
</th>
<th scope="col" className="px-2">
URL Name
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{(profile && Object.keys(profile).length > 0) ? <tr>
<tr className="py-2 border-t border-dashed border-slate-300"> <th scope="row">1</th>
<td className="px-2"> <td>Mark</td>
<div className="text-left"> <td>Otto</td>
<div className="text-base font-semibold">{profile?.member_id}</div> <td>@mdo</td>
</div> </tr>
</td> <tr>
<td className="px-2"> <th scope="row">2</th>
<div className="text-left"> <td>Jacob</td>
<div className="text-base font-semibold">Practice: {profile?.practice}</div> <td>Thornton</td>
<div className="text-base font-semibold">Specialization: {profile?.specialization}</div> <td>@fat</td>
</div> </tr>
</td> <tr>
<td className="px-2"> <th scope="row">3</th>
<div className="text-left"> <td>Larry</td>
<div className="text-base font-semibold">{profile?.url_name}</div> <td>the Bird</td>
</div> <td>@twitter</td>
</td> </tr>
</tr>
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={3}>
<div className="flex justify-center items-center">
No Record Found
</div>
</td>
</tr>
}
</tbody> </tbody>
</table> </table>
</> </div>
</div> </div>
</div> </div>
</div> </div>
</> </div>
</>
} }
@@ -14,12 +14,12 @@ import CustomerPaymentsView from "./CustomerPaymentsView";
export default function AccountViewCom() { export default function AccountViewCom() {
const {state} = useLocation() const {state:{memberUID}} = useLocation()
const navigate = useNavigate() const navigate = useNavigate()
useEffect(()=>{ useEffect(()=>{
if(!state?.memberUID){ if(!memberUID){
navigate(RouteLinks.homePage, {replace: true}) navigate(RouteLinks.customerPage, {replace: true})
} }
},[]) },[])
@@ -28,7 +28,7 @@ export default function AccountViewCom() {
queryFn: () => { queryFn: () => {
// const filterData = filter?.type ? {[filter?.type]: filter.id} : {} // const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = { const reqData = {
member_uid: state?.memberUID member_uid: memberUID
// page, // page,
// ...filterData // ...filterData
} }
@@ -45,7 +45,7 @@ export default function AccountViewCom() {
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title={`Account View [${state?.memberUID}]`} paths={['Dashboard', 'Account View']}/> <BreadcrumbCom title={`Account View [${memberUID}]`} paths={['Dashboard', 'Account View']}/>
<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'>
{isFetching ? {isFetching ?
@@ -57,8 +57,8 @@ export default function AccountViewCom() {
: :
<> <>
<CustomerAccountView accountInfo={account_info} /> <CustomerAccountView accountInfo={account_info} />
<AccountProfileView profile={account_profile} /> <AccountProfileView />
<CustomerSubscriptionsView subscriptions={subscriptions} /> <CustomerSubscriptionsView subscriptions={subscriptions} memberUID={memberUID} />
<CustomerPaymentsView payments={payments} /> <CustomerPaymentsView payments={payments} />
</> </>
@@ -10,11 +10,13 @@ export default function CustomerAccountView({accountInfo}) {
</div> </div>
<div className="w-full overflow-x-auto"> <div className="w-full overflow-x-auto">
<> <>
<table className="py-2 w-full text-sm bg-[aliceblue] dark:bg-transparent rounded-[10px]"> <table className="py-2 w-full text-sm" style={{backgroundColor: 'aliceblue', borderRadius: '10px'}}>
<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">
#
</th>
<th scope="col" className="px-2">
Firstname Firstname
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
@@ -26,7 +28,6 @@ export default function CustomerAccountView({accountInfo}) {
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Email Email
</th> </th>
<th scope="col" className="px-2 text-right"> <th scope="col" className="px-2 text-right">
Action Action
</th> </th>
@@ -35,11 +36,11 @@ export default function CustomerAccountView({accountInfo}) {
<tbody> <tbody>
{(accountInfo && Object.keys(accountInfo).length > 0) ? {(accountInfo && Object.keys(accountInfo).length > 0) ?
<tr className="py-2 border-t border-dashed border-slate-300"> <tr className="py-2 border-t border-dashed border-slate-300">
{/*<td className="px-2 py-2">*/} <td className="px-2 py-2">
{/* <div className="text-left">*/} <div className="text-left">
{/* <div className="text-base font-semibold">{1}</div>*/} <div className="text-base font-semibold">{1}</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">{accountInfo?.firstname}</div> <div className="text-base font-semibold">{accountInfo?.firstname}</div>
@@ -60,7 +61,6 @@ export default function CustomerAccountView({accountInfo}) {
<div className="text-base font-semibold">{accountInfo?.email}</div> <div className="text-base font-semibold">{accountInfo?.email}</div>
</div> </div>
</td> </td>
<td className="px-2 text-right"> <td className="px-2 text-right">
<div className='flex items-center justify-end gap-3 md:gap-4'> <div className='flex items-center justify-end gap-3 md:gap-4'>
<div <div
@@ -8,23 +8,20 @@ export default function CustomerPaymentsView({payments}) {
</div> </div>
<div className="w-full overflow-x-auto"> <div className="w-full overflow-x-auto">
<> <>
<table className="py-2 w-full text-sm bg-[aliceblue] dark:bg-transparent rounded-[10px]"> <table className="py-2 w-full text-sm" style={{backgroundColor: 'aliceblue', borderRadius: '10px'}}>
<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">
# #
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Added First
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Option Name Last
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Amount Handle
</th>
<th scope="col" className="px-2">
Currency
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -38,22 +35,17 @@ export default function CustomerPaymentsView({payments}) {
</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?.added}</div> <div className="text-base font-semibold">{item?.first}</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?.option_name}</div> <div className="text-base font-semibold">{item?.last}</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?.amount}</div> <div className="text-base font-semibold">{item?.handle}</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">Dollars</div>
</div> </div>
</td> </td>
</tr> </tr>
@@ -3,7 +3,7 @@ import RouteLinks from "../../RouteLinks";
import Icons from "../Icons"; import Icons from "../Icons";
import {Link} from 'react-router-dom' import {Link} from 'react-router-dom'
export default function CustomerSubscriptionsView({subscriptions}) { export default function CustomerSubscriptionsView({subscriptions, memberUID}) {
return <> return <>
<div className="pb-5"> <div className="pb-5">
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
@@ -12,7 +12,7 @@ export default function CustomerSubscriptionsView({subscriptions}) {
</div> </div>
<div className="w-full overflow-x-auto"> <div className="w-full overflow-x-auto">
<> <>
<table className="py-2 w-full text-sm bg-[aliceblue] dark:bg-transparent rounded-[10px]"> <table className="py-2 w-full text-sm" style={{backgroundColor: 'aliceblue', borderRadius: '10px'}}>
<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">
@@ -25,7 +25,7 @@ export default function CustomerSubscriptionsView({subscriptions}) {
Product Product
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
URL / Templates URL
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Status Status
@@ -55,10 +55,7 @@ export default function CustomerSubscriptionsView({subscriptions}) {
</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?.internal_url} <div className="text-base font-semibold">{item?.internal_url}</div>
<br /><span>Template :</span> {item?.product_template}
<br /><span>Custom :</span> {item?.custom_template}
</div>
</div> </div>
</td> </td>
<td className="px-2"> <td className="px-2">
@@ -70,7 +67,7 @@ export default function CustomerSubscriptionsView({subscriptions}) {
<div className='flex items-center justify-end gap-3 md:gap-4'> <div className='flex items-center justify-end gap-3 md:gap-4'>
<div <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'> 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={`/subscription-view/${item?.subscription_uid}`} state={{customerID: item?.id, subscriptionUID: item?.subscription_uid}}> <Link to={`/subscription-view/${memberUID}`} state={{customerID: item?.id, memberUID}}>
<Icons name='eye'/> <Icons name='eye'/>
</Link> </Link>
</div> </div>
+162 -175
View File
@@ -1,13 +1,13 @@
import React from 'react' import React from 'react'
import {Link} from 'react-router-dom' import {Link} from 'react-router-dom'
import {useQuery} from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import BreadcrumbCom from '../../components/breadcrumb/BreadcrumbCom' import BreadcrumbCom from '../../components/breadcrumb/BreadcrumbCom'
import CustomCounter from '../../components/CustomCounter' import CustomCounter from '../../components/CustomCounter'
import Icons from '../../components/Icons' import Icons from '../../components/Icons'
import formatNumber from '../../helpers/formatNumber' import formatNumber from '../../helpers/formatNumber'
import queryKeys from '../../services/queryKeys' import queryKeys from '../../services/queryKeys'
import {getDashData} from '../../services/siteServices' import { getDashData } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString'; import getDateFromDateString from '../../helpers/GetDateFromDateString';
import getTimeFromDateString from '../../helpers/GetTimeFromDateString'; import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
import localImgLoader from '../../helpers/localImageLoader'; import localImgLoader from '../../helpers/localImageLoader';
@@ -15,189 +15,176 @@ import RouteLinks from '../../RouteLinks';
export default function HomeCom() { export default function HomeCom() {
const {data, isFetching, isError, error} = useQuery({ const {data, isFetching, isError, error} = useQuery({
queryKey: queryKeys.dashboard, queryKey: queryKeys.dashboard,
queryFn: () => getDashData(), queryFn: () => getDashData(),
}) })
const dashData = data?.data // DASHBOARD DATA const dashData = data?.data // DASHBOARD DATA
// console.log('dashData', dashData) // console.log('dashData', dashData)
// loans, payments, recent_transactions [], request_summary // loans, payments, recent_transactions [], request_summary
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Dashboard' paths={['Home', 'Dashboard']}/> <BreadcrumbCom title='Dashboard' paths={['Home', 'Dashboard']} />
{(isFetching || isError) ? {(isFetching || isError) ?
<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 ? <p className='text-red-500'>{error.message}</p> : {isError ? <p className='text-red-500'>{error.message}</p> : <p className='text-slate-800'>Loading...</p>}
<p className='text-slate-800'>Loading...</p>} </div>
</div> :
: <div className='grid grid-cols-1 gap-8'>
<div className='grid grid-cols-1 gap-8'> <div className='w-full grid grid-cols-1 xl:grid-cols-3 gap-8'>
<div className='w-full grid grid-cols-1 xl:grid-cols-3 gap-8'> <div className='box min-h-[230] justify-between bg-[#F7D9E3] dark:bg-black-box text-black-body dark:text-white-body'>
<div <p className='text-base sm:text-lg font-bold hover:text-primary'>Subscriptions</p>
className='box min-h-[230] justify-between bg-[#F7D9E3] dark:bg-black-box text-black-body dark:text-white-body'> <div className='flex flex-wrap gap-2 items-end font-bold'>
<p className='text-base sm:text-lg font-bold hover:text-primary'>Subscriptions</p> {/* <p className='text-3xl sm:text-[39px]'><span className='text-xl sm:text-2xl'>{dashData?.loans?.currency_text}</span><CustomCounter targetNumber={dashData?.loans?.value} timeInSeconds='1' /></p> */}
<div className='flex flex-wrap gap-2 items-end font-bold'> <p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
{/* <p className='text-3xl sm:text-[39px]'><span className='text-xl sm:text-2xl'>{dashData?.loans?.currency_text}</span><CustomCounter targetNumber={dashData?.loans?.value} timeInSeconds='1' /></p> */}
<p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
{/*{dashData?.loans?.currency_text}*/} {/*{dashData?.loans?.currency_text}*/}
</span><CustomCounter targetNumber={formatNumber(dashData?.loans?.value)} timeInSeconds='1'/> </span><CustomCounter targetNumber={formatNumber(dashData?.loans?.value)} timeInSeconds='1' />
</p> </p>
<p className='sm:text-[13.9px]'>{dashData?.loans?.text}</p> <p className='sm:text-[13.9px]'>{dashData?.loans?.text}</p>
</div> </div>
</div> </div>
<div <div className='box min-h-[230] justify-between bg-[#CBF0F5] dark:bg-black-box text-black-body dark:text-white-body'>
className='box min-h-[230] justify-between bg-[#CBF0F5] dark:bg-black-box text-black-body dark:text-white-body'> <p className='text-base sm:text-lg font-bold hover:text-primary'>Payments</p>
<p className='text-base sm:text-lg font-bold hover:text-primary'>Payments</p> <div className='flex flex-wrap gap-2 items-end font-bold'>
<div className='flex flex-wrap gap-2 items-end font-bold'> <p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
<p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
{dashData?.payments?.currency_text} {dashData?.payments?.currency_text}
</span><CustomCounter targetNumber={formatNumber(dashData?.payments?.value)} timeInSeconds='1'/> </span><CustomCounter targetNumber={formatNumber(dashData?.payments?.value)} timeInSeconds='1' />
</p> </p>
<p className='sm:text-[13.9px]'>{dashData?.payments?.text}</p> <p className='sm:text-[13.9px]'>{dashData?.payments?.text}</p>
</div> </div>
</div> </div>
<div <div className='box min-h-[230] justify-between bg-[#CBD4F4] dark:bg-black-box text-black-body dark:text-white-body'>
className='box min-h-[230] justify-between bg-[#CBD4F4] dark:bg-black-box text-black-body dark:text-white-body'> <p className='mb-4 text-base sm:text-lg font-bold hover:text-primary'>Provision Summary</p>
<p className='mb-4 text-base sm:text-lg font-bold hover:text-primary'>Provision Summary</p> <div className='grid grid-cols-2 gap-4 font-bold'>
<div className='grid grid-cols-2 gap-4 font-bold'> {
{ Object.values(dashData?.request_summary).map((item, index) => {
Object.values(dashData?.request_summary).map((item, index) => { return (
return ( <div key={index} className='flex items-center gap-2'>
<div key={index} className='flex items-center gap-2'> <div className='min-w-10 min-h-10 bg-white-body dark:bg-black-box dark:shadow-[0_0_0_1px_#f9f9f9] rounded-md flex justify-center items-center'>
<div <Icons name='sales' />
className='min-w-10 min-h-10 bg-white-body dark:bg-black-box dark:shadow-[0_0_0_1px_#f9f9f9] rounded-md flex justify-center items-center'>
<Icons name='sales'/>
</div>
<div>
<p className='font-bold text-base'><CustomCounter
targetNumber={Object.values(item)[0]} timeInSeconds='1'/></p>
<p className='text-12 text-slate-500'>{Object.keys(item)[0]}</p>
</div>
</div>
)
})
}
</div>
</div>
</div> </div>
<div>
<p className='font-bold text-base'><CustomCounter targetNumber={Object.values(item)[0]} timeInSeconds='1' /></p>
<p className='text-12 text-slate-500'>{Object.keys(item)[0]}</p>
</div>
</div>
)
})
}
</div>
</div>
</div>
<div className='w-full'> <div className='w-full'>
<div className='box gap-8 bg-white dark:bg-black-box text-black-body dark:text-white-body'> <div className='box gap-8 bg-white dark:bg-black-box text-black-body dark:text-white-body'>
<div className='grid grid-cols-1 xs:grid-cols-2 gap-4'> <div className='grid grid-cols-1 xs:grid-cols-2 gap-4'>
<div className='flex flex-col gap-1 order-2 xs:order-1'> <div className='flex flex-col gap-1 order-2 xs:order-1'>
<p className='font-bold text-base'>Recent Subscriptions</p> <p className='font-bold text-base'>Recent Subscriptions</p>
{/* <p className='text-12'>Over 500 members</p> */} {/* <p className='text-12'>Over 500 members</p> */}
</div> </div>
{/* <div className='order-1 xs:order-2 text-left xs:text-right'> {/* <div className='order-1 xs:order-2 text-left xs:text-right'>
<button className='font-bold bg-white-aside text-black-body text-12 px-4 py-2 hover:text-primary hover:bg-sky-50 dark:hover:text-white dark:hover:bg-primary dark:text-white-body dark:bg-black-body rounded-md'>+ New Member</button> <button className='font-bold bg-white-aside text-black-body text-12 px-4 py-2 hover:text-primary hover:bg-sky-50 dark:hover:text-white dark:hover:bg-primary dark:text-white-body dark:bg-black-body rounded-md'>+ New Member</button>
</div> */} </div> */}
</div>
<table className="py-2 w-full text-sm">
<thead className="py-2 text-sm text-slate-500 text-left font-semibold">
<tr>
<th scope="col" className="px-2 py-2">
Subscription
</th>
<th scope="col" className="px-2">
Status
</th>
<th scope="col" className="px-2">
Activity
</th>
<th scope="col" className="px-2 text-right">
Action
</th>
</tr>
</thead>
<tbody>
{(dashData?.subscription && dashData?.subscription.length > 0) ? dashData?.subscription?.map((item, index) => {
if(index <= 10) {
return (
<tr key={item?.id} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<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/select_offer.png`)} alt="Icon" />
<div className="text-left">
<div className="text-base font-semibold">{item?.product_id}</div>
<div className="font-normal text-gray-500">{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}</div>
</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold"><a href={`https://${item?.internal_url}`} target='_blank' rel="noreferrer">{item?.internal_url}</a></div>
<div className="font-normal text-gray-500">{item?.status}</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="font-normal text-gray-500">50%</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'>
<Icons name='edit' />
</div> */}
<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 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='trash' />
</div> */}
</div>
</td>
</tr>
)
}else{
return null
}
}
)
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<div className="flex justify-center items-center">
No Record Found
</div> </div>
</td>
</tr>
}
<>
{dashData?.subscription.length > 10 &&
<tr className="py-2 border-t border-dashed text-right text-primary border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<Link to={RouteLinks.transactionsPage} className="flex justify-end items-center">
More ...
</Link>
</td>
</tr>
}
</>
</tbody>
</table>
<table className="py-2 w-full text-sm"> </div>
<thead className="py-2 text-sm text-slate-500 text-left font-semibold">
<tr>
<th scope="col" className="px-2 py-2">
Subscription
</th>
<th scope="col" className="px-2">
Status
</th>
<th scope="col" className="px-2">
Activity
</th>
<th scope="col" className="px-2 text-right">
Action
</th>
</tr>
</thead>
<tbody>
{(dashData?.subscription && dashData?.subscription.length > 0) ? dashData?.subscription?.map((item, index) => {
if (index <= 10) {
return (
<tr key={item?.id} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<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/select_offer.png`)}
alt="Icon"/>
<div className="text-left">
<div
className="text-base font-semibold">{item?.product_id}</div>
<div
className="font-normal text-gray-500">{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}</div>
</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold"><a
href={`https://${item?.internal_url}`} target='_blank'
rel="noreferrer">{item?.internal_url}</a></div>
<div className="font-normal text-gray-500">{item?.status}</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="font-normal text-gray-500">50%</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={`/subscription-view/${item?.uid}`}
state={{subscriptionUID: item?.uid}}
>
<Icons name='eye'/>
</Link>
</div>
</div>
</td>
</tr>
)
} else {
return null
}
}
)
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<div className="flex justify-center items-center">
No Record Found
</div>
</td>
</tr>
}
<>
{dashData?.subscription.length > 10 &&
<tr className="py-2 border-t border-dashed text-right text-primary border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<Link to={RouteLinks.transactionsPage}
className="flex justify-end items-center">
More ...
</Link>
</td>
</tr>
}
</>
</tbody>
</table>
</div>
</div>
</div>
}
</div> </div>
) </div>
}
</div>
)
} }
+1 -6
View File
@@ -50,11 +50,7 @@ export default function CustomTemplates() {
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Custom Templates' paths={['Dashboard', 'Custom Templates']} /> <BreadcrumbCom title='Custom Templates' paths={['Dashboard', 'Custom Templates']} />
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body' style={{backgroundColor: 'aliceblue'}}>
<b>Add New Custom Template</b>
</div>
<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'>{error?.message}</p> <p className='text-red-500'>{error?.message}</p>
@@ -66,8 +62,7 @@ export default function CustomTemplates() {
<div className='w-full sm:max-w-48'> <div className='w-full sm:max-w-48'>
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}> <select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
<option value=''>All</option> <option value=''>All</option>
<option value='custom_id'>Custom ID</option> <option value='name'>Name</option>
<option value='provision_name'>Provision Name</option>
</select> </select>
</div> </div>
<div className='w-full sm:max-w-48'> <div className='w-full sm:max-w-48'>
@@ -0,0 +1,56 @@
import {useEffect, useState} from 'react'
import { useQuery } from '@tanstack/react-query'
import {useLocation, useNavigate, Link} from 'react-router-dom'
import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import RouteLinks from '../../RouteLinks'
import { getAccountView } from '../../services/siteServices'
import queryKeys from '../../services/queryKeys'
export default function SubscriptionDetailViewCom() {
const {state:{memberUID}} = useLocation()
const navigate = useNavigate()
useEffect(()=>{
if(!memberUID){
navigate(`/account-view/${memberUID}`, {replace: true, state:{memberUID}})
}
},[])
const {data, isFetching, isError, error} = useQuery({
queryKey: queryKeys.account_view,
queryFn: () => {
// const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = {
member_uid: memberUID
// page,
// ...filterData
}
// return getAccountView(reqData)
},
staleTime: 0 //0 mins
})
const subscriptionViewData = data?.data // SUBSCRIPTION VIEW DATA
// console.log('DATA', payments, subscriptions)
return (
<div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title={`Subscription View [${memberUID}]`} paths={['Dashboard', 'Subscription View']}/>
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
{isFetching ?
<>
<p className='text-slate-800'>Loading...</p>
</>
: isError ?
<p className='text-red-500'>{error.message}</p>
:
<p className='text-slate-800'>Coming soon</p>
}
</div>
</div>
)
}
@@ -1,97 +0,0 @@
import {useLocation, useNavigate, Link} from 'react-router-dom'
import { useQuery } from '@tanstack/react-query'
import { FaCaretDown } from "react-icons/fa";
import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import {useEffect} from 'react';
import RouteLinks from '../../RouteLinks';
import { getSubscriptionsView } from '../../services/siteServices'
import queryKeys from '../../services/queryKeys'
export default function SubscriptionViewCom() {
const {state} = useLocation()
const navigate = useNavigate()
useEffect(() => {
if (!state?.subscriptionUID) {
navigate(RouteLinks.homePage, {replace: true})
}
}, [])
const {data, isFetching, isError, error} = useQuery({
queryKey: queryKeys.subscriptions_view,
queryFn: () => {
// const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = {
subscription_uid: state?.subscriptionUID
// page,
// ...filterData
}
return getSubscriptionsView(reqData)
},
staleTime: 0 //0 mins
})
const subscriptionViewData = data?.data // ACCOUNT VIEW DATA
console.log('subscriptionViewData', subscriptionViewData)
return (
<div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title={`Subscription View [${state?.subscriptionUID}]`} paths={['Dashboard', 'Subscription View']}/>
{isFetching ?
<>
<p className='text-slate-800'>Loading...</p>
</>
: isError ?
<p className='text-red-500'>{error.message}</p>
:
<>
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
<div>
Repeat the Subscription at the top
</div>
</div>
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
<div className='w-full'>
<label className='font-medium'>Assign Template</label>
<div className='flex flex-col md:flex-row md:items-center gap-2'>
<div className='w-full relative'>
<select className='w-full p-2'>
<option value=''>None</option>
</select>
<FaCaretDown className='text-base absolute top-1/2 -translate-y-1/2 right-2' />
</div>
<button>Update</button>
</div>
</div>
</div>
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
<div className='w-full'>
<label className='font-medium'>Assign Custom Template</label>
<div className='flex flex-col md:flex-row md:items-center gap-2'>
<div className='w-full relative'>
<select className='w-full p-2'>
<option value=''>None</option>
</select>
<FaCaretDown className='text-base absolute top-1/2 -translate-y-1/2 right-2' />
</div>
<button>Update</button>
</div>
</div>
</div>
</>
}
</div>
)
}
+104 -119
View File
@@ -1,14 +1,14 @@
import {useState} from 'react' import { useState } from 'react'
import {Link} from 'react-router-dom' import {Link} from 'react-router-dom'
// import {Link} from 'react-router-dom' // import {Link} from 'react-router-dom'
import {useQuery} from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys' 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 {getSubscriptions} from '../../services/siteServices' import { getSubscriptions } from '../../services/siteServices'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'; import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
// import localImgLoader from '../../helpers/localImageLoader'; // import localImgLoader from '../../helpers/localImageLoader';
// import RouteLinks from '../../RouteLinks'; // import RouteLinks from '../../RouteLinks';
@@ -19,18 +19,18 @@ export default function SubscriptionsCom() {
const [filter, setFilter] = useState({type: '', id: ''}) const [filter, setFilter] = useState({type: '', id: ''})
const [willFilter, setWillFilter] = useState(false) 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}))
} }
const handleFilterByParams = () => { const handleFilterByParams = () => {
if (filter.type && !filter.id) { if(filter.type && !filter.id){
return return
} else if (!filter.type) { }else if(!filter.type){
setPage(1) setPage(1)
setWillFilter(prev => !prev) setWillFilter(prev => !prev)
setFilter({type: '', id: ''}) setFilter({type: '', id: ''})
} else { }else{
setPage(1) setPage(1)
setWillFilter(prev => !prev) setWillFilter(prev => !prev)
} }
@@ -53,123 +53,108 @@ export default function SubscriptionsCom() {
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Provisions' paths={['Dashboard', 'Provisions']}/> <BreadcrumbCom title='Provisions' paths={['Dashboard', 'Provisions']} />
<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'>{error?.message}</p> <p className='text-red-500'>{error?.message}</p>
: :
<> <>
{/* filter section */} {/* filter section */}
<div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2'> <div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2'>
<Icons name='filter' className='text-3xl'/> <Icons name='filter' className='text-3xl' />
<div className='w-full sm:max-w-48'> <div className='w-full sm:max-w-48'>
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' <select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
onChange={handleFilter}> <option value=''>All</option>
<option value=''>All</option> <option value='member_id'>Member ID</option>
<option value='member_id'>Member ID</option> <option value='product_id'>Product ID</option>
<option value='product_id'>Product ID</option> </select>
</select>
</div>
<div className='w-full sm:max-w-48'>
<input name='id' value={filter?.id} disabled={!filter.type}
className={`h-10 w-full p-2 rounded-md outline-none border border-black-aside ${!filter.type && 'opacity-30'}`}
onChange={handleFilter}/>
</div>
<button onClick={handleFilterByParams} disabled={filter.type && !filter.id}
className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end ${(filter.type && !filter.id) && 'opacity-50'}`}>Submit
</button>
</div> </div>
{/* end of filter section */} <div className='w-full sm:max-w-48'>
<input name='id' value={filter?.id} disabled={!filter.type} className={`h-10 w-full p-2 rounded-md outline-none border border-black-aside ${!filter.type && 'opacity-30'}`} onChange={handleFilter} />
</div>
<button onClick={handleFilterByParams} disabled={filter.type && !filter.id} className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end ${(filter.type && !filter.id) && 'opacity-50'}`}>Submit</button>
</div>
{/* end of filter section */}
<TablePaginatedWrapper data={subscriptionData} isFetching={isFetching} setPage={setPage} <TablePaginatedWrapper data={subscriptionData} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
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"> Added
Added/Updated </th>
</th> <th scope="col" className="px-2">
<th scope="col" className="px-2"> Product
Product </th>
</th> <th scope="col" className="px-2">
<th scope="col" className="px-2"> URL
Internal-URL/External-URL/SubscriptionUID </th>
</th> <th scope="col" className="px-2 text-right">
<th scope="col" className="px-2 text-right"> Status
Status </th>
</th> <th scope="col" className="px-2 text-right">
<th scope="col" className="px-2 text-right"> Action
Action </th>
</th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody> {(data && data.length > 0) ? data?.map((item, index) => (
{(data && data.length > 0) ? data?.map((item, index) => ( <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 {/* <img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" /> */}
className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'> <div className="text-left">
{/* <img className="w-10 h-10 rounded-md" src={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" /> */} <div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
<div className="text-left"> </div>
<div </div>
className="text-base font-semibold"> </td>
{getDateTimeFromDateString(item?.added)}<br /> <td className="px-2">
{getDateTimeFromDateString(item?.updated)}<br /> <div className="text-left">
</div> <div className="text-base font-semibold">{item?.product_id}</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?.internal_url}</div>
<div <div className="font-normal text-gray-500">{item?.external_url}</div>
className="text-base font-semibold">{item?.product_id}</div> </div>
</div> </td>
</td> <td className="px-2">
<td className="px-2"> <div className="text-right">
<div className="text-left"> <div className="text-base font-semibold">{item?.status}</div>
<div className="text-base font-semibold "> </div>
<span>Int :</span> {item?.internal_url}<br/> </td>
<span>Ext :</span> {item?.external_url}<br/> <td className="px-2 text-right">
{item?.subscription_uid}</div> <div className='flex items-center justify-end gap-3 md:gap-4'>
</div> <div
</td> className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
<td className="px-2"> <Link to={`/subscription-view/${item?.subscription_uid}`}
<div className="text-right"> state={{customerID: item?.id, memberUID: item?.member_uid}}>
<div className="text-base font-semibold">{item?.status}</div> <Icons name='eye'/>
</div> </Link>
</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={`/subscription-view/${item?.subscription_uid}`}
state={{customerID: item?.id, subscriptionUID: item?.subscription_uid}}
>
<Icons name='eye'/>
</Link>
</div>
</div>
</td>
</tr>
))
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<div className="flex justify-center items-center">
No Record Found
</div> </div>
</td> </div>
</tr> </td>
} </tr>
</tbody> ))
</table> :
</> <tr className="py-2 border-t border-dashed border-slate-300">
)} <td className="px-3 py-2" colSpan={4}>
</TablePaginatedWrapper> <div className="flex justify-center items-center">
</> No Record Found
</div>
</td>
</tr>
}
</tbody>
</table>
</>
)}
</TablePaginatedWrapper>
</>
} }
</div> </div>
</div> </div>
+7
View File
@@ -0,0 +1,7 @@
import React from 'react'
import SubscriptionDetailViewCom from "../components/subscription_view/SubscriptionDetailViewCom";
export default function SubscriptionDetailViewPage() {
return (
<SubscriptionDetailViewCom />
)
}
-7
View File
@@ -1,7 +0,0 @@
import React from 'react'
import SubscriptionViewCom from "../components/subscription_view/SubscriptionViewCom";
export default function SubscriptionDetailsPage() {
return (
<SubscriptionViewCom />
)
}
-1
View File
@@ -20,7 +20,6 @@ const queryKeys = {
products_template: ['products_template'], products_template: ['products_template'],
custom_template: ['custom_template'], custom_template: ['custom_template'],
account_view: ['account_view'], account_view: ['account_view'],
subscriptions_view: ['subscriptions_view'],
users_admin: ['users_admin'], users_admin: ['users_admin'],
} }
-6
View File
@@ -116,12 +116,6 @@ export const getAccountView = (reqData) => {
return getAuxEnd(`/account-view`, postData) return getAuxEnd(`/account-view`, postData)
} }
// FUNCTION TO GET SUBSCRIPTIONS VIEW DATA
export const getSubscriptionsView = (reqData) => {
const postData = { ...reqData }
return getAuxEnd(`/subcription-view`, postData)
}
// FUNCTION TO GET LOANS TABLE // FUNCTION TO GET LOANS TABLE
export const getLoans = (reqData) => { export const getLoans = (reqData) => {