Merge remote-tracking branch 'origin/staging' into origin/production

frontend/dashboard/src/pages/Report/Log/List.tsx

@@ -46,6 +46,7 @@ import TableMoreMenu from '@/components/table/TableMoreMenu';
 import { Import } from '@/@types/claims';
 // import DialogDeleteRequestLOG from '../Request/Components/DialogDeleteRequestLOG';
 import { HeadCell, Order } from '@/@types/table';
+import { ReportLog } from './Model/Type';
 // import LoadingButton from '@/theme/overrides/LoadingButton';
 
 export default function List() {
@@ -304,7 +305,7 @@ export default function List() {
   };
 
   // Called on every row to map the data to the columns
-  function createData(data: any): any {
+  function createData(data: ReportLog){
     return {
       ...data,
     };
@@ -323,6 +324,7 @@ export default function List() {
         <TableRow sx={{ '& > *': { borderBottom: 'unset' } }}>
           <TableCell align="left">{row.code}</TableCell>
           <TableCell align="left">{row.member_name}</TableCell>
+          <TableCell align="left">{row.member_code}</TableCell>
           <TableCell align="left"><Label>{row.created_at ? fDateTimesecond(row.created_at) : '-'}</Label></TableCell>
           <TableCell align="left"><Label>{row.submission_date != null ? fDateTimesecond(row.submission_date) : '-'}</Label></TableCell>
           <TableCell align="left">{row.approved_by}</TableCell>
@@ -390,7 +392,13 @@ export default function List() {
     {
       id: 'name',
       align: 'left',
-      label: 'Member',
+      label: 'Member Name',
+      isSort: false,
+    },
+    {
+      id: 'code',
+      align: 'left',
+      label: 'Member Code',
       isSort: false,
     },
     {

frontend/dashboard/src/pages/Report/Log/Model/Type.tsx

@@ -0,0 +1,20 @@
+export type ReportLog = {
+    id                  : number,
+    code                : string,
+    member_name         : string,
+    member_code         : string,
+    submission_date     : string,
+    service_name        : string,
+    payment_type_name   : string,
+    status_final_log    : string,
+    provider            : string,
+    status              : string,
+    created_at          : string,
+    approved_by         : string,
+    approved_final_log_at : string,
+    created_final_at : string,
+    approved_final_log_by : string,
+    document_qty : string,
+    duration_gl : string,
+    duration_final_gl : string,
+}