account view subscription table data fixed

src/RouteLinks.js

@@ -3,6 +3,7 @@ const RouteLinks = {
     homePage: '/',
     customerPage: '/customer',
     accountDetails: '/account-view/*',
+    subscriptionDetails: '/subscription-view/*',
     subscriptions: '/subscriptions',
     billings: '/billings',
     recentSignup: '/recent-signup',

src/SiteRoutes.jsx

@@ -19,7 +19,8 @@ import LoansPage from './pages/LoansPage' // SELECTED LOANS PAGE
 import TransactionDetailsPage from './pages/TransactionDetailsPage'
 import AccountDetailsPage from "./pages/AccountDetailsPage";
 import ProductTemplatePage from "./pages/ProductTemplatePage";
-import CustomTemplatePage from "./pages/CustomTemplatePage"; // TRANSACTION DETAILS PAGE
+import CustomTemplatePage from "./pages/CustomTemplatePage";
+import SubscriptionDetailsPage from "./pages/SubscriptionDetailsPage"; // TRANSACTION DETAILS PAGE
 
 
 // const Home = lazy(() => import('./pages/Home'));
@@ -45,6 +46,7 @@ export default function SiteRoutes() {
                 <Route path={RouteLinks.loansPage} element={<LoansPage/>}/> {`*/LOANS PAGE*/`}
                 <Route path={RouteLinks.transaction_details_page}
                        element={<TransactionDetailsPage/>}/> {`*/TRANSACTION PAGE*/`}
+                <Route path={RouteLinks.subscriptionDetails} element={<SubscriptionDetailsPage/>} />
             </Route>
 
             {/* ERROR PAGE */}

src/components/account_view/AccountProfileView.jsx

@@ -0,0 +1,52 @@
+
+
+
+export default function AccountProfileView() {
+    return <>
+        <div className="row" style={{paddingBottom:'20px'}}>
+            <div className="col-12 col-lg-12">
+                <div className="card card-statistics">
+                    <div className="card-header">
+                        <div className="card-heading">
+                            <h4 className="card-title"><b>Account Profile</b></h4>
+                        </div>
+                    </div>
+                    <div className="card-body">
+                        <div className="table-responsive">
+                            <table className="table table-hover mb-0" style={{width:'100%', backgroundColor: 'aliceblue', borderRadius: '10px'}}>
+                                <thead>
+                                <tr>
+                                    <th scope="col">#</th>
+                                    <th scope="col">First</th>
+                                    <th scope="col">Last</th>
+                                    <th scope="col">Handle</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <th scope="row">1</th>
+                                    <td>Mark</td>
+                                    <td>Otto</td>
+                                    <td>@mdo</td>
+                                </tr>
+                                <tr>
+                                    <th scope="row">2</th>
+                                    <td>Jacob</td>
+                                    <td>Thornton</td>
+                                    <td>@fat</td>
+                                </tr>
+                                <tr>
+                                    <th scope="row">3</th>
+                                    <td>Larry</td>
+                                    <td>the Bird</td>
+                                    <td>@twitter</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </>
+}

src/components/account_view/AccountViewCom.jsx

@@ -7,6 +7,10 @@ import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
 import RouteLinks from '../../RouteLinks'
 import { getAccountView } from '../../services/siteServices'
 import queryKeys from '../../services/queryKeys'
+import CustomerAccountView from "./CustomerAccountView";
+import AccountProfileView from "./AccountProfileView";
+import CustomerSubscriptionsView from "./CustomerSubscriptionsView";
+import CustomerPaymentsView from "./CustomerPaymentsView";
 
 export default function AccountViewCom() {
 
@@ -32,9 +36,12 @@ export default function AccountViewCom() {
         },
         staleTime: 0 //0 mins
     })
-    const accountsViewData = data?.data?.products // ACCOUNT VIEW DATA
+    const accountsViewData = data?.data // ACCOUNT VIEW DATA
-    const pagination = data?.data?.pagination
+    const account_info = accountsViewData?.account
-    console.log('DATA', data?.data)
+    const account_profile = accountsViewData?.account_profile
+    const subscriptions = accountsViewData?.subscriptions
+    const payments = accountsViewData?.payments
+    // console.log('DATA', payments, subscriptions)
 
     return (
         <div className='w-full flex flex-col gap-8'>
@@ -48,7 +55,13 @@ export default function AccountViewCom() {
                 : isError ?
                     <p className='text-red-500'>{error.message}</p>
                 :
-                    <p className='text-slate-800'>coming soon</p>
+                        <>
+                            <CustomerAccountView accountInfo={account_info} />
+                            <AccountProfileView />
+                            <CustomerSubscriptionsView subscriptions={subscriptions} memberUID={memberUID} />
+                            <CustomerPaymentsView payments={payments} />
+                        </>
+
                 }
 
             </div>

src/components/account_view/CustomerAccountView.jsx

@@ -0,0 +1,93 @@
+import {Link} from 'react-router-dom'
+import Icons from "../Icons";
+
+export default function CustomerAccountView({accountInfo}) {
+    return <>
+        <div className="pb-5">
+            <div className="flex flex-col gap-1">
+                <div className="w-full">
+                    <h4 className="font-semibold text-lg">Account Info</h4>
+                </div>
+                <div className="w-full overflow-x-auto">
+                    <>
+                        <table className="py-2 w-full text-sm" style={{backgroundColor: 'aliceblue', borderRadius: '10px'}}>
+                            <thead className="py-2 text-sm text-slate-500 text-left">
+                            <tr>
+                                <th scope="col" className="px-2 py-2">
+                                    #
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Firstname
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Lastname
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Username
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Email
+                                </th>
+                                <th scope="col" className="px-2 text-right">
+                                    Action
+                                </th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {(accountInfo && Object.keys(accountInfo).length > 0) ? 
+                                <tr className="py-2 border-t border-dashed border-slate-300">
+                                    <td className="px-2 py-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{1}</div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{accountInfo?.firstname}</div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{accountInfo?.lastname}</div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{accountInfo?.username}</div>
+                                        </div>
+                                    </td>
+                                    <td className="px-2">
+                                        <div className="text-left">
+                                            <div className="text-base font-semibold">{accountInfo?.email}</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/63554d40-9ba1-4afe-80c2-ca147236f7ee`}
+                                                >
+                                                    <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={6}>
+                                        <div className="flex justify-center items-center">
+                                            No Record Found
+                                        </div>
+                                    </td>
+                                </tr>
+                            }
+                            </tbody>
+                        </table>
+                    </>
+                </div>
+            </div>
+        </div>
+    </>
+}

src/components/account_view/CustomerPaymentsView.jsx

@@ -0,0 +1,69 @@
+
+export default function CustomerPaymentsView({payments}) {
+    return <>
+        <div className="pb-5">
+            <div className="flex flex-col gap-1">
+                <div className="w-full">
+                    <h4 className="font-semibold text-lg">Payments</h4>
+                </div>
+                <div className="w-full overflow-x-auto">
+                    <>
+                        <table className="py-2 w-full text-sm" style={{backgroundColor: 'aliceblue', borderRadius: '10px'}}>
+                            <thead className="py-2 text-sm text-slate-500 text-left">
+                            <tr>
+                                <th scope="col" className="px-2 py-2">
+                                    #
+                                </th>
+                                <th scope="col" className="px-2">
+                                    First
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Last
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Handle
+                                </th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {(payments && payments.length > 0) ? payments?.map((item, index) => (
+                                    <tr key={index} className="py-2 border-t border-dashed border-slate-300">
+                                        <td className="px-2 py-2">
+                                            <div className="text-left">
+                                                <div className="text-base font-semibold">{index+1}</div>
+                                            </div>
+                                        </td>
+                                        <td className="px-2">
+                                            <div className="text-left">
+                                                <div className="text-base font-semibold">{item?.first}</div>
+                                            </div>
+                                        </td>
+                                        <td className="px-2">
+                                            <div className="text-left">
+                                                <div className="text-base font-semibold">{item?.last}</div>
+                                            </div>
+                                        </td>
+                                        <td className="px-2">
+                                            <div className="text-left">
+                                                <div className="text-base font-semibold">{item?.handle}</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>
+                                    </td>
+                                </tr>
+                            }
+                            </tbody>
+                        </table>
+                    </>
+                </div>
+            </div>
+        </div>
+    </>
+}

src/components/account_view/CustomerSubscriptionsView.jsx

@@ -0,0 +1,94 @@
+import getDateTimeFromDateString from "../../helpers/getDateTimeFromDateString";
+import RouteLinks from "../../RouteLinks";
+import Icons from "../Icons";
+import {Link} from 'react-router-dom'
+
+export default function CustomerSubscriptionsView({subscriptions, memberUID}) {
+    return <>
+        <div className="pb-5">
+            <div className="flex flex-col gap-1">
+                <div className="w-full">
+                    <h4 className="font-semibold text-lg">Subscriptions</h4>
+                </div>
+                <div className="w-full overflow-x-auto">
+                    <>
+                        <table className="py-2 w-full text-sm" style={{backgroundColor: 'aliceblue', borderRadius: '10px'}}>
+                            <thead className="py-2 text-sm text-slate-500 text-left">
+                            <tr>
+                                <th scope="col" className="px-2 py-2">
+                                    #
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Added
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Product
+                                </th>
+                                <th scope="col" className="px-2">
+                                    URL
+                                </th>
+                                <th scope="col" className="px-2">
+                                    Status
+                                </th>
+                                <th scope="col" className="px-2 text-right">
+                                    Action
+                                </th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            {(subscriptions && subscriptions.length > 0) ? subscriptions?.map((item, index) => (
+                                    <tr key={index} className="py-2 border-t border-dashed border-slate-300">
+                                        <td className="px-2 py-2">
+                                            <div className="text-left">
+                                                <div className="text-base font-semibold">{index+1}</div>
+                                            </div>
+                                        </td>
+                                        <td className="px-2">
+                                            <div className="text-left">
+                                                <div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</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-left">
+                                                <div className="text-base font-semibold">{item?.internal_url}</div>
+                                            </div>
+                                        </td>
+                                        <td className="px-2">
+                                            <div className="text-right">
+                                                <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'>
+                                                    <Link to={`/subscription-view/${memberUID}`} state={{customerID: item?.id, memberUID}}>
+                                                        <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={6}>
+                                        <div className="flex justify-center items-center">
+                                            No Record Found
+                                        </div>
+                                    </td>
+                                </tr>
+                            }
+                            </tbody>
+                        </table>
+                    </>
+                </div>
+            </div>
+        </div>
+    </>
+}

src/components/home/HomeCom.jsx

@@ -1,13 +1,13 @@
 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 CustomCounter from '../../components/CustomCounter'
 import Icons from '../../components/Icons'
 import formatNumber from '../../helpers/formatNumber'
 
 import queryKeys from '../../services/queryKeys'
-import { getDashData } from '../../services/siteServices'
+import {getDashData} from '../../services/siteServices'
 import getDateFromDateString from '../../helpers/GetDateFromDateString';
 import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
 import localImgLoader from '../../helpers/localImageLoader';
@@ -15,176 +15,187 @@ import RouteLinks from '../../RouteLinks';
 
 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> : <p className='text-slate-800'>Loading...</p>}
+                    {isError ? <p className='text-red-500'>{error.message}</p> :
-      </div>
+                        <p className='text-slate-800'>Loading...</p>}
-      :
+                </div>
-      <div className='grid grid-cols-1 gap-8'>
+                :
-        <div className='w-full grid grid-cols-1 xl:grid-cols-3 gap-8'>
+                <div className='grid grid-cols-1 gap-8'>
-          <div className='box min-h-[230] justify-between bg-[#F7D9E3] dark:bg-black-box text-black-body dark:text-white-body'>
+                    <div className='w-full grid grid-cols-1 xl:grid-cols-3 gap-8'>
-            <p className='text-base sm:text-lg font-bold hover:text-primary'>Subscriptions</p>
+                        <div
-            <div className='flex flex-wrap gap-2 items-end font-bold'>
+                            className='box min-h-[230] justify-between bg-[#F7D9E3] dark:bg-black-box text-black-body dark:text-white-body'>
-              {/* <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-base sm:text-lg font-bold hover:text-primary'>Subscriptions</p>
-              <p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
+                            <div className='flex flex-wrap gap-2 items-end font-bold'>
+                                {/* <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}*/}
-                </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 className='box min-h-[230] justify-between bg-[#CBF0F5] dark:bg-black-box text-black-body dark:text-white-body'>
+                        <div
-            <p className='text-base sm:text-lg font-bold hover:text-primary'>Payments</p>
+                            className='box min-h-[230] justify-between bg-[#CBF0F5] 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'>Payments</p>
-              <p className='text-xl sm:text-[30px]'><span className='text-lg sm:text-xl'>
+                            <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'>
                 {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 className='box min-h-[230] justify-between bg-[#CBD4F4] dark:bg-black-box text-black-body dark:text-white-body'>
+                        <div
-            <p className='mb-4 text-base sm:text-lg font-bold hover:text-primary'>Provision Summary</p>
+                            className='box min-h-[230] justify-between bg-[#CBD4F4] dark:bg-black-box text-black-body dark:text-white-body'>
-            <div className='grid grid-cols-2 gap-4 font-bold'>
+                            <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'>
-              Object.values(dashData?.request_summary).map((item, index) => {
+                                {
-                return (
+                                    Object.values(dashData?.request_summary).map((item, index) => {
-                  <div key={index} className='flex items-center gap-2'>
+                                        return (
-                    <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 key={index} className='flex items-center gap-2'>
-                      <Icons name='sales' />
+                                                <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'>
+                                                    <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>
-                      <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>
               </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>
-                        </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>
+                            <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'>
+                                                                    <Link to={`/subscription-view/${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>
-  )
 }

src/components/subscription_view/SubscriptionViewCom.jsx

@@ -0,0 +1,32 @@
+import {useLocation, useNavigate, Link} from 'react-router-dom'
+import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
+import { useEffect } from 'react';
+
+export default function SubscriptionViewCom() {
+
+    const subscriptionUID = "63554d40-9ba1-4afe-80c2-ca147236f7ee";
+
+    const {state:{memberUID}} = useLocation()
+    const navigate = useNavigate()
+
+    useEffect(()=>{
+        if(!memberUID){
+            navigate(`/account-view/${memberUID}`, {replace: true, state:{memberUID}})
+        }
+    },[])
+
+    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'>
+
+                        <>
+                            Show all here
+                        </>
+
+
+            </div>
+        </div>
+    )
+}

src/components/transactions/SubscriptionsCom.jsx

@@ -1,4 +1,6 @@
 import { 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'
@@ -93,6 +95,9 @@ export default function SubscriptionsCom() {
                                         <th scope="col" className="px-2 text-right">
                                             Status
                                         </th>
+                                        <th scope="col" className="px-2 text-right">
+                                            Action
+                                        </th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -122,6 +127,17 @@ export default function SubscriptionsCom() {
                                                     <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'>
+                                                        <Link to={`/subscription-view/${item?.subscription_uid}`}
+                                                              state={{customerID: item?.id, memberUID: item?.member_uid}}>
+                                                            <Icons name='eye'/>
+                                                        </Link>
+                                                    </div>
+                                                </div>
+                                            </td>
                                         </tr>
                                     ))
                                     :

src/pages/SubscriptionDetailsPage.jsx

@@ -0,0 +1,7 @@
+import React from 'react'
+import SubscriptionViewCom from "../components/subscription_view/SubscriptionViewCom";
+export default function SubscriptionDetailsPage() {
+    return (
+        <SubscriptionViewCom />
+    )
+}