Refactor_Expenses #321
@ -171,10 +171,10 @@ const ExpenseList = () => {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td className="d-none d-md-table-cell text-end"><i className='bx bx-rupee b-xs'></i>{expense.amount}</td>
|
<td className="d-none d-md-table-cell text-end"><i className='bx bx-rupee b-xs'></i>{expense?.amount}</td>
|
||||||
<td>
|
<td>
|
||||||
<span
|
<span
|
||||||
className={`badge bg-label-${getColorNameFromHex(expense.status.color) || 'secondary'}`}
|
className={`badge bg-label-${getColorNameFromHex(expense?.status?.color) || 'secondary'}`}
|
||||||
>
|
>
|
||||||
|
|
||||||
{expense.status?.displayName || "Unknown"}
|
{expense.status?.displayName || "Unknown"}
|
||||||
|
@ -88,7 +88,7 @@ const ViewExpense = ({ ExpenseId }) => {
|
|||||||
<div className="col-12 col-sm-6 col-md-4 mb-3">
|
<div className="col-12 col-sm-6 col-md-4 mb-3">
|
||||||
<div className="d-flex align-items-center">
|
<div className="d-flex align-items-center">
|
||||||
<label className="form-label me-2 mb-0 fw-semibold">Status :</label>
|
<label className="form-label me-2 mb-0 fw-semibold">Status :</label>
|
||||||
<span className={`badge bg-label-${getColorNameFromHex(ExpenseId.status.color) || 'secondary'}`}>
|
<span className={`badge bg-label-${getColorNameFromHex(ExpenseId?.status?.color) || 'secondary'}`}>
|
||||||
{ExpenseId.status.displayName}
|
{ExpenseId.status.displayName}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -17,7 +17,9 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
|
|||||||
"checkLists",
|
"checkLists",
|
||||||
"isSystem",
|
"isSystem",
|
||||||
"isActive",
|
"isActive",
|
||||||
"noOfPersonsRequired"
|
"noOfPersonsRequired",
|
||||||
|
"color",
|
||||||
|
"displayName"
|
||||||
];
|
];
|
||||||
|
|
||||||
const safeData = Array.isArray(data) ? data : [];
|
const safeData = Array.isArray(data) ? data : [];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user