admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'Feature_Expense' of https://git.marcoaiot.com/admin/marco.pms.web into Feature#796_EditExpense

Browse Source
This commit is contained in:
pramod mahajan 2025-07-23 14:07:09 +05:30
commit a23ca8a412
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Expenses/ExpenseList.jsx
View File

@ -171,10 +171,10 @@ const ExpenseList = () => {
</span>
</div>
</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>
<span
className={`badge bg-label-${getColorNameFromHex(expense.status.color) || 'secondary'}`}
className={`badge bg-label-${getColorNameFromHex(expense?.status?.color) || 'secondary'}`}
>
{expense.status?.displayName || "Unknown"}

2
src/components/Expenses/ViewExpense.jsx
View File

@ -88,7 +88,7 @@ const ViewExpense = ({ ExpenseId }) => {
<div className="col-12 col-sm-6 col-md-4 mb-3">
<div className="d-flex align-items-center">
<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}
</span>
</div>

4
src/pages/master/MasterTable.jsx
View File

@ -17,7 +17,9 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
"checkLists",
"isSystem",
"isActive",
"noOfPersonsRequired"
"noOfPersonsRequired",
"color",
"displayName"
];
const safeData = Array.isArray(data) ? data : [];