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

fixed recent action section bug

Browse Source
This commit was merged in pull request #48.
This commit is contained in:
victorAnumudu
2025-07-21 16:48:01 +01:00
parent 1dcae6b163
commit f50590850b
8 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/component/home/ProductsURL.jsx
+7 -1
View File
@@ -2,6 +2,7 @@ import React from 'react'
import { productsURL } from '../../services/services'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
import getImage from '../../utils/getImage'
export default function ProductsURL() {
@@ -70,7 +71,12 @@ export default function ProductsURL() {
</td>
<td><span className={`badge ${statusColor}`}>{item?.status}</span></td>
<td><a className="mr-3" href={productUrl}><i className="fe fe-edit"></i></a></td>
{/* <td><a className="mr-3" href={productUrl}><i className="fe fe-edit"></i></a></td> */}
<td>
<a className="mr-3" href={productUrl}>
<img src={getImage('arrow-next.png')} alt='next' />
</a>
</td>
</tr>
)
})}
src/component/home/RecentActions.jsx
+11 -11
View File
@@ -10,7 +10,7 @@ export default function RecentActions() {
queryFn: () => recentActions()
})
const actionData = dataAction?.data?.action_data
const actionData = dataAction?.data?.recent_actions
return (
<>
@@ -43,7 +43,7 @@ export default function RecentActions() {
<div className="d-xxs-flex align-items-center">
<div className="total-sales">
<p>Last Update</p>
<h3>{dataAction?.data?.action_data?.last_update}</h3>
<h3>{dataAction?.data?.last_update}</h3>
</div>
<div className="mb-3 mb-sm-0 ml-auto">
{/*<button className="btn btn-primary btn-xs">View All Invoices</button>*/}
@@ -62,19 +62,19 @@ export default function RecentActions() {
<div className="row no-gutters">
<div className="col-6 col-xxs-3 ">
<p>Initial</p>
<h4>{actionData?.initial}</h4>
<h4>{dataAction?.data?.initial}</h4>
</div>
<div className="col-6 col-xxs-3 ">
<p>Processing</p>
<h4>{actionData?.processing}</h4>
<h4>{dataAction?.data?.processing}</h4>
</div>
<div className="col-6 col-xxs-3 ">
<p>Verifying</p>
<h4>{actionData?.verifying}</h4>
<h4>{dataAction?.data?.verifying}</h4>
</div>
<div className="col-6 col-xxs-3 ">
<p>Completed</p>
<h4>{actionData?.completed}</h4>
<h4>{dataAction?.data?.completed}</h4>
</div>
</div>
<div className="table-responsive m-t-20">
@@ -89,16 +89,16 @@ export default function RecentActions() {
</tr>
</thead>
<tbody className="text-muted">
{actionData && actionData?.actions.map((action, index) => {
{actionData && actionData?.map((action, index) => {
let bgColor = action?.status == '5' ? 'badge-success-inverse' : action?.status == '3' ? 'badge-info-inverse' : action?.status == '0' ? 'badge-warning-inverse' : 'badge-primary-inverse'
let text = action?.status == '5' ? 'completed' : action?.status == '3' ? 'verifying' : action?.status == '0' ? 'processing' : 'processing'
return (
<tr key={index}>
<td>{action?.no}</td>
<td>{action?.description}</td>
<td>{new Date(action?.date).toDateString()}</td>
<td>{action?.id}</td>
<td>{action?.action_label}</td>
<td>{new Date(action?.added).toDateString()}</td>
<td>
<label className={`badge mb-0 ${bgColor}`}>{text}</label>
<label className={`badge mb-0 ${bgColor}`}>{action?.status_description}</label>
</td>
</tr>
)