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

src/components/Expenses/ExpenseList.jsx

@@ -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"}

src/components/Expenses/ViewExpense.jsx

@@ -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>

src/pages/Expense/ExpensePage.jsx

@@ -50,16 +50,15 @@ const ExpensePage = () => {
               <div className="col-7 col-sm-8 text-end gap-2">
                 <button
                   type="button"
-                  className="btn btn-sm btn-primary me-2"
+                  data-bs-toggle="tooltip"
-                  onClick={() =>
+                  data-bs-offset="0,8"
-                    setExpenseModal({
+                  data-bs-placement="top"
-                      isOpen: true,
+                  data-bs-custom-class="tooltip"
-                     ExpEdit:null
+                  title="Add New Expense"
-                    })
+                  className={`p-1 me-2 bg-primary rounded-circle `}
-                  }
+                    onClick={() => setNewExpense(true)}
                 >
-                  <span className="icon-base bx bx-plus-circle me-1"></span>
+                  <i className="bx bx-plus fs-4 text-white"></i>
-                  Add New
                 </button>
               </div>
             </div>

src/pages/master/MasterTable.jsx

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