diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js
index e69f7e4..088a5b1 100644
--- a/src/pages/nearle/orders/orders.js
+++ b/src/pages/nearle/orders/orders.js
@@ -3,18 +3,13 @@
 import { enqueueSnackbar } from 'notistack';
 import { DeleteFilled, NotificationOutlined } from '@ant-design/icons';
 
-
-import {
-  useState,
-  useEffect,
-  Fragment
-} from 'react';
+import { useState, useEffect, Fragment } from 'react';
 import { Empty } from 'antd';
 import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import dayjs from 'dayjs';
-var utc = require('dayjs/plugin/utc')
-dayjs.extend(utc)
+var utc = require('dayjs/plugin/utc');
+dayjs.extend(utc);
 import axios from 'axios';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 // import { DataGrid } from '@mui/x-data-grid'
@@ -40,7 +35,10 @@ import {
   // TableSortLabel,
   Typography,
   // Divider,
-  Table, TableCell, TableBody, TableHead,
+  Table,
+  TableCell,
+  TableBody,
+  TableHead,
   // TableSortLabel,
   Collapse,
   Dialog,
@@ -53,7 +51,7 @@ import {
   InputAdornment,
   Skeleton,
   CircularProgress,
-  DialogActions,
+  DialogActions
   // Popper,
   // ClickAwayListener
 
@@ -64,9 +62,10 @@ import MainCard from 'components/MainCard';
 // import {  useSelector } from 'store';
 // import { useDispatch } from 'react-redux';
 
-
 import {
-  SearchOutlined, EnvironmentOutlined, UserOutlined,
+  SearchOutlined,
+  EnvironmentOutlined,
+  UserOutlined,
   //  MoreOutlined ,
   CloseOutlined
 } from '@ant-design/icons';
@@ -85,7 +84,7 @@ import {
   endOfWeek,
   // endOfYear,
   startOfMonth,
-  startOfWeek,
+  startOfWeek
   // startOfYear,
 } from 'date-fns';
 
@@ -93,22 +92,19 @@ import {
 // import { DesktopDateRangePicker } from '@mui/x-date-pickers-pro/DesktopDateRangePicker';
 // import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
 // import { DateRangePicker } from "mui-daterange-picker-orient";
-import { DateRangePicker } from "mui-daterange-picker";
-
-
+import { DateRangePicker } from 'mui-daterange-picker';
 
 // import EnhancedTable from 'components/tablemuiedit'
 import {
   // CloseOutlined,
   //  PlusOutlined,
-  EyeTwoTone,
+  EyeTwoTone
   // EditTwoTone,
   // DeleteTwoTone
 } from '@ant-design/icons';
 
 import { useNavigate } from 'react-router';
 
-
 import * as React from 'react';
 import PropTypes from 'prop-types';
 // import { alpha } from '@mui/material/styles';
@@ -133,21 +129,13 @@ import TableSortLabel from '@mui/material/TableSortLabel';
 // import DeleteIcon from '@mui/icons-material/Delete';
 // import FilterListIcon from '@mui/icons-material/FilterList';
 import { visuallyHidden } from '@mui/utils';
-import Loader from 'components/Loader'
+import Loader from 'components/Loader';
 import { FilterList } from '@mui/icons-material';
 // import MainCard from 'components/MainCard';
 // import DialogTitle from 'themes/overrides/DialogTitle';
 // import MainCard from 'components/MainCard';
 
-
-
-
-
-
-
 const Orders = () => {
-
-
   function descendingComparator(a, b, orderBy) {
     if (b[orderBy] < a[orderBy]) {
       return -1;
@@ -159,9 +147,7 @@ const Orders = () => {
   }
 
   function getComparator(order, orderBy) {
-    return order === 'desc'
-      ? (a, b) => descendingComparator(a, b, orderBy)
-      : (a, b) => -descendingComparator(a, b, orderBy);
+    return order === 'desc' ? (a, b) => descendingComparator(a, b, orderBy) : (a, b) => -descendingComparator(a, b, orderBy);
   }
 
   // Since 2020 all major browsers ensure sort stability with Array.prototype.sort().
@@ -180,16 +166,11 @@ const Orders = () => {
     return stabilizedThis.map((el) => el[0]);
   }
 
-
-
-
-
   const headCells = [
     {
       id: 'sno',
       disablePadding: true,
-      label: 'S NO',
-
+      label: 'S NO'
     },
     // {
     //   id: 'tenantname',
@@ -201,17 +182,17 @@ const Orders = () => {
       id: 'orderid',
       numeric: false,
       disablePadding: false,
-      label: 'ORDER ID',
+      label: 'ORDER ID'
     },
     {
       id: 'eventname',
       disablePadding: false,
-      label: 'Pickup',
+      label: 'Pickup'
     },
     {
       id: 'eventname4',
       disablePadding: false,
-      label: 'Delivery',
+      label: 'Delivery'
     },
     //   {
     //     id: 'ordervalue',
@@ -221,26 +202,22 @@ const Orders = () => {
     {
       id: 'itemcount',
       disablePadding: false,
-      label: 'NOTES',
+      label: 'NOTES'
     },
     {
       id: 'orderstatus',
       disablePadding: false,
-      label: 'STATUS',
+      label: 'STATUS'
     },
     {
       id: 'action',
       disablePadding: false,
-      label: 'ACTION',
+      label: 'ACTION'
     }
   ];
 
-
   function EnhancedTableHead(props) {
-    const {
-      order, orderBy,
-      onRequestSort } =
-      props;
+    const { order, orderBy, onRequestSort } = props;
     const createSortHandler = (property) => (event) => {
       onRequestSort(event, property);
     };
@@ -248,7 +225,6 @@ const Orders = () => {
     return (
       <TableHead>
         <TableRow>
-
           {headCells.map((headCell) => (
             <TableCell
               key={headCell.id}
@@ -281,11 +257,9 @@ const Orders = () => {
     onSelectAllClick: PropTypes.func.isRequired,
     order: PropTypes.oneOf(['asc', 'desc']).isRequired,
     orderBy: PropTypes.string.isRequired,
-    rowCount: PropTypes.number.isRequired,
+    rowCount: PropTypes.number.isRequired
   };
 
-
-
   function EnhancedTable() {
     const [order, setOrder] = React.useState('asc');
     const [orderBy, setOrderBy] = React.useState('calories');
@@ -294,25 +268,21 @@ const Orders = () => {
     const [rowsPerPage, setRowsPerPage] = React.useState(10);
     const [expandopen, setExpandopen] = React.useState('');
 
-
     const [dialogopen, setDialogopen] = useState(false);
-    const [stafflist, setStafflist] = useState([])
-    const [loading1, setLoading1] = useState(false)
+    const [stafflist, setStafflist] = useState([]);
+    const [loading1, setLoading1] = useState(false);
     const [open, setOpen] = useState(false);
-    const [orderheaderid, setOrderheaderid] = useState('')
+    const [orderheaderid, setOrderheaderid] = useState('');
 
     const cancelorder = async () => {
-
-      await axios.put(`${process.env.REACT_APP_URL}/orders/updateorder`, {
-        "orderheaderid": orderheaderid,
-        "orderstatus": "cancelled",
-        "cancelled": dayjs().format('YYYY-MM-DD HH:mm:ss')
-
-
-
-      })
+      await axios
+        .put(`${process.env.REACT_APP_URL}/orders/updateorder`, {
+          orderheaderid: orderheaderid,
+          orderstatus: 'cancelled',
+          cancelled: dayjs().format('YYYY-MM-DD HH:mm:ss')
+        })
         .then((res) => {
-          console.log(res)
+          console.log(res);
           if (res.data.status) {
             // if (orderheaderid && tenantid) {
             //   fetchorderdetails();
@@ -320,14 +290,15 @@ const Orders = () => {
             //   fetchorderattires();
             // }
             enqueueSnackbar('Order Cancelled Successfully', {
-              variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' },
+              variant: 'success',
+              anchorOrigin: { vertical: 'top', horizontal: 'right' },
               autoHideDuration: 2000
-            })
+            });
             handleClose(true);
 
             if (localStorage.getItem('tenantid')) {
-              setTenantid(localStorage.getItem('tenantid'))
-              let val = localStorage.getItem('tenantid')
+              setTenantid(localStorage.getItem('tenantid'));
+              let val = localStorage.getItem('tenantid');
 
               fetchtable(val);
               fetchpercentage(val);
@@ -339,41 +310,35 @@ const Orders = () => {
               fetchtablecreated(val);
             }
           }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
-    }
-
+        .catch((err) => {
+          console.log(err);
+        });
+    };
 
     const fetchstafflist = async (odid) => {
-      setLoading1(true)
+      setLoading1(true);
       try {
-        await axios.get(`${process.env.REACT_APP_URL2}/orders/getassignedinfo?orderdetailid=${odid}`)
+        await axios
+          .get(`${process.env.REACT_APP_URL2}/orders/getassignedinfo?orderdetailid=${odid}`)
 
           .then((res) => {
-            console.log(res)
+            console.log(res);
             if (res.data.status) {
-              setStafflist(res.data.Details)
+              setStafflist(res.data.Details);
             }
 
-            setLoading1(false)
-          }).catch((err) => {
-            console.log(err)
-            setLoading1(false)
+            setLoading1(false);
           })
-
+          .catch((err) => {
+            console.log(err);
+            setLoading1(false);
+          });
       } catch (err) {
         console.log(err);
-        setLoading1(false)
+        setLoading1(false);
       }
-
-    }
-
-
-
-
+    };
 
     const dialogclose = () => {
       setDialogopen(false);
@@ -394,8 +359,6 @@ const Orders = () => {
       setSelected([]);
     };
 
-
-
     const handleChangePage = (event, newPage) => {
       setPage(newPage);
     };
@@ -405,32 +368,26 @@ const Orders = () => {
       setPage(0);
     };
 
-
-
     const isSelected = (name) => selected.indexOf(name) !== -1;
 
     // Avoid a layout jump when reaching the last page with empty rows.
-    const emptyRows =
-      page > 0 ? Math.max(0, (1 + page) * rowsPerPage - rows.length) : 0;
+    const emptyRows = page > 0 ? Math.max(0, (1 + page) * rowsPerPage - rows.length) : 0;
 
     const visibleRows = React.useMemo(
-      () =>
-        stableSort(rows, getComparator(order, orderBy)).slice(
-          page * rowsPerPage,
-          page * rowsPerPage + rowsPerPage,
-        ),
-      [order, orderBy, page, rowsPerPage],
+      () => stableSort(rows, getComparator(order, orderBy)).slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage),
+      [order, orderBy, page, rowsPerPage]
     );
 
     const handleClose = () => {
       setOpen(false);
-      setOrderheaderid('')
+      setOrderheaderid('');
     };
 
-
     function AlertCustomerDelete({
       // title,
-      open, handleClose }) {
+      open,
+      handleClose
+    }) {
       // const [deletepassword, setDeletepassword] = useState('');
 
       return (
@@ -440,8 +397,8 @@ const Orders = () => {
           // keepMounted
           // TransitionComponent={PopupTransition}
           maxWidth="xs"
-        // aria-labelledby="column-delete-title"
-        // aria-describedby="column-delete-description"
+          // aria-labelledby="column-delete-title"
+          // aria-describedby="column-delete-description"
         >
           <DialogContent sx={{ mt: 2, my: 1 }}>
             <Stack alignItems="center" spacing={3.5}>
@@ -459,25 +416,32 @@ const Orders = () => {
                 {/* <Typography variant="h4" align="center">
                     Please type in the order number to confirm.
                   </Typography> */}
-
-
               </Stack>
 
               <Stack direction="row" spacing={2} sx={{ width: 1 }}>
-                <Button fullWidth color="error" variant="contained" onClick={() => {
-                  // if (deletepassword === orderid.slice(4)) {
-                  cancelorder();
-                  // }
-
-                }} autoFocus>
+                <Button
+                  fullWidth
+                  color="error"
+                  variant="contained"
+                  onClick={() => {
+                    // if (deletepassword === orderid.slice(4)) {
+                    cancelorder();
+                    // }
+                  }}
+                  autoFocus
+                >
                   Yes, Cancel
                 </Button>
-                <Button fullWidth onClick={() => {
-                  handleClose(false)
-                }} color="secondary" variant="outlined">
+                <Button
+                  fullWidth
+                  onClick={() => {
+                    handleClose(false);
+                  }}
+                  color="secondary"
+                  variant="outlined"
+                >
                   No
                 </Button>
-
               </Stack>
             </Stack>
           </DialogContent>
@@ -485,19 +449,12 @@ const Orders = () => {
       );
     }
 
-
     return (
       <Box sx={{ width: '100%' }}>
         <AlertCustomerDelete open={open} handleClose={handleClose} />
 
         <TableContainer sx={{ width: '100%', borderBottom: 1, borderColor: 'divider' }}>
-
-          <Table
-            sx={{ minWidth: 750 }}
-            aria-label="collapsible table"
-            size={'medium'}
-          >
-
+          <Table sx={{ minWidth: 750 }} aria-label="collapsible table" size={'medium'}>
             <EnhancedTableHead
               numSelected={selected.length}
               order={order}
@@ -505,21 +462,18 @@ const Orders = () => {
               onSelectAllClick={handleSelectAllClick}
               onRequestSort={handleRequestSort}
               rowCount={rows.length}
-
             />
-            {(loading) &&
+            {loading && (
               <>
                 <TableBody>
                   {[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].map((item) => (
                     <TableRow key={item}>
-
                       <TableCell>
                         <Skeleton animation="wave" />
-
-                      </TableCell>
-                      <TableCell>
-                        <Skeleton animation="wave" />
-                        <Skeleton animation="wave" />
+                      </TableCell>
+                      <TableCell>
+                        <Skeleton animation="wave" />
+                        <Skeleton animation="wave" />
                       </TableCell>
                       <TableCell>
                         <Skeleton animation="wave" />
@@ -530,30 +484,23 @@ const Orders = () => {
                       </TableCell>
                       <TableCell>
                         <Skeleton animation="wave" />
-
                       </TableCell>
                       <TableCell>
                         <Skeleton animation="wave" />
-
                       </TableCell>
                       <TableCell>
                         <Skeleton animation="wave" />
-
                       </TableCell>
                       <TableCell>
                         <Skeleton animation="wave" />
-
                       </TableCell>
-
                     </TableRow>
-
                   ))}
                 </TableBody>
               </>
-            }
+            )}
             <TableBody>
-              {((visibleRows.length == 0) && !loading) &&
-
+              {visibleRows.length == 0 && !loading && (
                 <>
                   <TableCell colSpan={7}>
                     <Stack width={'100%'} direction={'row'} justifyContent={'center'}>
@@ -562,24 +509,15 @@ const Orders = () => {
                   </TableCell>
                   {/* <div>empty</div> */}
                 </>
-
-              }
+              )}
 
               {visibleRows.map((row, index) => {
                 const isItemSelected = isSelected(row.sno);
                 const labelId = `enhanced-table-checkbox-${index}`;
 
-
-
-
-
-
-
                 return (
                   <>
-
                     <TableRow
-
                       role="checkbox"
                       aria-checked={isItemSelected}
                       tabIndex={-1}
@@ -587,34 +525,22 @@ const Orders = () => {
                       sx={{
                         cursor: 'pointer',
 
-
-                        backgroundColor: (expandopen === row.sno) ? '#f5f5f5' : ''
+                        backgroundColor: expandopen === row.sno ? '#f5f5f5' : ''
                       }}
-
                     >
-
-                      <TableCell
-                        component="th"
-                        id={labelId}
-                        scope="row"
-                        padding="none"
-                      >
+                      <TableCell component="th" id={labelId} scope="row" padding="none">
                         <Typography> {row.sno}</Typography>
-
-
                       </TableCell>
 
-                      <TableCell align='left'>
-                        <Typography variant='body2' noWrap>{row.orderid}</Typography>
-                        <Typography noWrap
-                          sx={{ fontSize: '11px' }}>
-                          {dayjs(row.deliverytime).utc().format('DD/MM/YYYY')}
+                      <TableCell align="left">
+                        <Typography variant="body2" noWrap>
+                          {row.orderid}
                         </Typography>
-                        <Typography noWrap
-                          sx={{ fontSize: '11px' }}
-                          variant='h5'
-                        >
-                          {dayjs(row.deliverytime).utc().format('hh:mm A')}
+                        <Typography noWrap sx={{ fontSize: '11px' }}>
+                          {dayjs(row.deliverydate).utc().format('DD/MM/YYYY')}
+                        </Typography>
+                        <Typography noWrap sx={{ fontSize: '11px' }} variant="h5">
+                          {dayjs(row.deliverydate).utc().format('hh:mm A')}
                         </Typography>
                       </TableCell>
 
@@ -649,21 +575,16 @@ const Orders = () => {
                               width: '25px',
                               height: '25px'
                             }}
-                          >
-
-                          </Avatar>
+                          ></Avatar>
                           <Stack direction="column">
                             <Typography variant="caption">{row.pickupcustomer}</Typography>
                             <Typography variant="caption" color="textSecondary">
-
                               {row.pickupcontactno}
                             </Typography>
                             <Tooltip title={row.pickupaddress}>
-                              <Typography variant="caption" color="textSecondary"
-                              >
+                              <Typography variant="caption" color="textSecondary">
                                 {/* {row.pickupaddress.slice(0, 20)} */}
                                 {row.pickupsuburb || row.pickupaddress.slice(0, 20)}
-
                               </Typography>
                             </Tooltip>
                           </Stack>
@@ -671,7 +592,6 @@ const Orders = () => {
                         {/* <Stack direction='column'>
 
                         </Stack> */}
-
                       </TableCell>
                       <TableCell align="left">
                         {/* <Stack direction='column'>
@@ -691,170 +611,77 @@ const Orders = () => {
                               width: '25px',
                               height: '25px'
                             }}
-                          >
-
-                          </Avatar>
+                          ></Avatar>
                           <Stack direction="column">
                             <Typography variant="caption">{row.deliverycustomer}</Typography>
                             <Typography variant="caption" color="textSecondary">
-
                               {row.deliverycontactno}
                             </Typography>
                             <Tooltip title={row.deliveryaddress}>
-                              <Typography variant="caption" color="textSecondary"
-                              >
+                              <Typography variant="caption" color="textSecondary">
                                 {/* {row.pickupaddress.slice(0, 20)} */}
                                 {row.deliverysuburb || row.deliveryaddress.slice(0, 20)}
-
                               </Typography>
                             </Tooltip>
                           </Stack>
                         </Stack>
-
                       </TableCell>
                       <TableCell align="left">{row.ordernotes}</TableCell>
                       {/* <TableCell align="left"><Chip label={row.itemcount} color="primary" variant="light" size="small" /></TableCell> */}
                       <TableCell align="left">
                         <Stack direction="row">
+                          {row.orderstatus === 'pending' && <Chip label="Pending" color="warning" size="small" />}
+                          {row.orderstatus === 'modified' && <Chip label="Confirmed" color="success" size="small" />}
+                          {row.orderstatus === 'cancelled' && <Chip label="Cancelled" color="error" size="small" />}
+                          {row.orderstatus === 'delivered' && <Chip label="Completed" color="primary" size="small" />}
+                          {row.orderstatus === 'processing' && <Chip label="Processing" color="primary" size="small" />}
+                          {row.orderstatus === 'ready' && <Chip label="Accepted" color="info" size="small" />}
+                          {row.orderstatus === 'confirmed' && <Chip label="Confirmed" color="success" size="small" />}
 
-                          {(row.orderstatus === 'pending') &&
-
-                            <Chip label="Pending" color="warning" size="small" />
-                          }
-                          {(row.orderstatus === 'modified') &&
-                            <Chip label="Confirmed" color="success" size="small" />
-                          }
-                          {(row.orderstatus === 'cancelled') &&
-
-
-                            <Chip label="Cancelled" color="error" size="small" />
-                          }
-                          {(row.orderstatus === 'delivered') &&
-
-                            <Chip label="Completed" color="primary" size="small" />
-                          }
-                          {(row.orderstatus === 'processing') &&
-                            <Chip label="Processing" color="primary" size="small" />
-                          }
-                          {(row.orderstatus === 'ready') &&
-                            <Chip label="Accepted" color="info" size="small" />
-                          }
-                          {(row.orderstatus === 'confirmed') &&
-                            <Chip label="Confirmed" color="success" size="small" />
-                          }
-
-                          {(row.orderstatus === 'active') &&
-                            <Chip label="Picked" color="info" size="small" />
-                          }
-                          {(row.orderstatus === 'closed') &&
-                            <Chip label="Closed" color="info" size="small" />
-                          }
-                          {(row.orderstatus === 'created') &&
-                            <Chip label="Created" color="secondary" size="small" />
-                          }
-
-
-                          {/* {(row.clientstatus === 'pending') &&
-  
-                              <Chip label="Pending" color="error" size="small" />
-                            }
-                            {(row.clientstatus === 'cancelled') &&
-  
-  
-                              <Chip label="Cancelled" color="secondary" size="small" />
-                            }
-                            {(row.clientstatus === 'completed') &&
-  
-                              <Chip label="Completed" color="primary" size="small" />
-                            }
-                            {(row.clientstatus === 'processing') &&
-                              <Chip label="Processing" color="primary" size="small" />
-                            }
-                            {(row.clientstatus === 'assigned') &&
-                              <Chip label="Assigned" color="warning" size="small" />
-                            }
-                            {(row.clientstatus === 'confirmed') &&
-                              <Chip label="Confirmed" color="success" size="small" />
-                            }
-  
-                            {(row.clientstatus === 'active') &&
-                              <Chip label="Active" color="info" size="small" />
-                            }
-                            {(row.clientstatus === 'closed') &&
-                              <Chip label="Closed" color="info" size="small" />
-                            }
-  
-                            {(row.clientstatus === 'modified') &&
-                              <Chip label="Modified"
-                                color='secondary'
-  
-                                size="small" variant='contained' />
-                            } */}
+                          {row.orderstatus === 'active' && <Chip label="Picked" color="info" size="small" />}
+                          {row.orderstatus === 'closed' && <Chip label="Closed" color="info" size="small" />}
+                          {row.orderstatus === 'created' && <Chip label="Created" color="secondary" size="small" />}
                         </Stack>
-
                       </TableCell>
-                      {/* <TableCell> */}
-
-                      {/* <Tooltip title='Expand'>
-  
-                            <IconButton
-                              aria-label="expand row"
-                              style={{ color: theme.palette.primary.main }}
-                              onClick={() => {
-                                setExpandopen((expandopen === row.sno) ? '' : row.sno)
-  
-                              }
-                              }
-                            >
-                              {(expandopen === row.sno) ?
-                                <KeyboardArrowUpIcon />
-                                :
-                                <KeyboardArrowDownIcon />}
-                            </IconButton>
-                          </Tooltip> */}
-
-
 
                       <TableCell>
-
-                        {(row.orderstatus == 'created') &&
-
+                        {row.orderstatus == 'created' && (
                           <>
-
-
-                            <Tooltip title='Cancel'>
+                            <Tooltip title="Cancel">
                               <IconButton
                                 // disabled={(row.orderstatus != 'created')}
                                 onClick={(e) => {
                                   e.stopPropagation();
-                                  setOrderheaderid(row.orderheaderid)
-                                  setOpen(true)
+                                  setOrderheaderid(row.orderheaderid);
+                                  setOpen(true);
                                   // navigate(`/details`, {
                                   //   state: {
                                   //     orderheaderid: row.orderheaderid,
                                   //     tenantid: row.tenantid
                                   //   }
                                   // })
-                                }}>
+                                }}
+                              >
                                 {/* <EyeTwoTone twoToneColor={theme.palette.secondary.main} /> */}
                                 <CloseOutlined
                                   style={{
-                                    color: theme.palette.error.main,
-
+                                    color: theme.palette.error.main
                                   }}
-                                //  twoToneColor={theme.palette.primary.main}
+                                  //  twoToneColor={theme.palette.primary.main}
                                 />
                               </IconButton>
                             </Tooltip>
                           </>
-
-                        }
+                        )}
                       </TableCell>
                     </TableRow>
-                    <TableRow >
-                      <TableCell style={{ paddingBottom: 0, paddingTop: 0, paddingLeft: 0, paddingRight: 0 }} colSpan={8} sx={{ width: '100%' }}>
-                        <Collapse in={(expandopen === row.sno)} timeout="auto" unmountOnExit  >
-
+                    <TableRow>
+                      <TableCell
+                        style={{ paddingBottom: 0, paddingTop: 0, paddingLeft: 0, paddingRight: 0 }}
+                        colSpan={8}
+                        sx={{ width: '100%' }}
+                      >
+                        <Collapse in={expandopen === row.sno} timeout="auto" unmountOnExit>
                           {/* <Grid container sx={{ width: '100%' }}>
                               {(row.ordershifts).map((val5, k) => {
                                 return <>
@@ -1181,7 +1008,8 @@ const Orders = () => {
   
   
                             </Grid> */}
-                        </Collapse ></TableCell>
+                        </Collapse>
+                      </TableCell>
                     </TableRow>
                   </>
                 );
@@ -1189,7 +1017,7 @@ const Orders = () => {
               {emptyRows > 0 && (
                 <TableRow
                   style={{
-                    height: (53) * emptyRows,
+                    height: 53 * emptyRows
                   }}
                 >
                   <TableCell colSpan={8} />
@@ -1207,36 +1035,18 @@ const Orders = () => {
           onPageChange={handleChangePage}
           onRowsPerPageChange={handleChangeRowsPerPage}
         />
-
       </Box>
     );
   }
 
+  const [startdate, setStartdate] = useState(dayjs().format('YYYY-MM-DD'));
+  const [enddate, setEnddate] = useState(dayjs().format('YYYY-MM-DD'));
 
+  const [tenantid, setTenantid] = useState('');
 
-
-
-
-
-
-
-
-
-
-
-  const [startdate, setStartdate] = useState(
-    dayjs().format('YYYY-MM-DD')
-  );
-  const [enddate, setEnddate] = useState(
-    dayjs().format('YYYY-MM-DD')
-  );
-
-  const [tenantid, setTenantid] = useState('')
-
-
-  const [percentage1, setPercentage1] = useState('0')
-  const [percentage2, setPercentage2] = useState('0')
-  const [percentage3, setPercentage3] = useState('0')
+  const [percentage1, setPercentage1] = useState('0');
+  const [percentage2, setPercentage2] = useState('0');
+  const [percentage3, setPercentage3] = useState('0');
   const [percentage4, setPercentage4] = useState('0');
   let [orderarr, setArr] = useState([]);
   let [orderarrcovered, setArrcovered] = useState([]);
@@ -1250,15 +1060,9 @@ const Orders = () => {
   let [orderarrpicked, setArrpicked] = useState([]);
   let [orderarrcreated, setArrcreated] = useState([]);
 
-
-
-
-
-
-
-  const [allorders, setAllorders] = useState('')
-  const [activeorders, setActiveorders] = useState('')
-  const [coveredorders, setCoveredorders] = useState('')
+  const [allorders, setAllorders] = useState('');
+  const [activeorders, setActiveorders] = useState('');
+  const [coveredorders, setCoveredorders] = useState('');
   const [uncoveredorders, setUncoveredorders] = useState('');
   const [cancelled, setCancelled] = useState('');
 
@@ -1267,14 +1071,13 @@ const Orders = () => {
   const [modified, setModified] = useState('');
   const [completed, setCompleted] = useState('');
   const [closed, setClosed] = useState('');
-  const [picked, setPicked] = useState('')
-  const [created, setCreated] = useState('')
-
+  const [picked, setPicked] = useState('');
+  const [created, setCreated] = useState('');
 
   const [tabstatus, setTabstatus] = useState('Created');
-  const [loading, setLoading] = useState(true)
+  const [loading, setLoading] = useState(true);
   const theme = useTheme();
-  let [rows, setRows] = useState([])
+  let [rows, setRows] = useState([]);
   const [tabvalue, setTabvalue] = useState(0);
   let navigate = useNavigate();
   const [open, setOpen] = useState(false);
@@ -1283,28 +1086,23 @@ const Orders = () => {
   // const [tabstatus1, setTabstatus1] = useState('All');
   const [tabstatus1, setTabstatus1] = useState('Today');
 
-
   // const [datestatus, setDatestatus] = useState('All');
   const [datestatus, setDatestatus] = useState('Today');
 
-  const [searchword, setSearchword] = useState('')
-
-
-
+  const [searchword, setSearchword] = useState('');
 
   const handleChangetab = (e, i) => {
-
     setTabvalue(i);
 
     // if (i === 0) setTabstatus('All orders')
-    if (i === 0) setTabstatus('Created')
+    if (i === 0) setTabstatus('Created');
     // if (i === 2) setTabstatus('Modified')
-    if (i === 1) setTabstatus('Pending')
+    if (i === 1) setTabstatus('Pending');
 
     // if (i === 2) setTabstatus('Assigned')
     // if (i === 3) setTabstatus('Picked')
-    if (i === 2) setTabstatus('Delivered')
-    if (i === 3) setTabstatus('Cancelled')
+    if (i === 2) setTabstatus('Delivered');
+    if (i === 3) setTabstatus('Cancelled');
 
     // if (i === 0) setTabstatus('All orders')
     // if (i === 1) setTabstatus('Pending')
@@ -1315,19 +1113,15 @@ const Orders = () => {
     //   if (i === 2) setTabstatus('Completed')
     //   if (i === 3) setTabstatus('Closed')
 
-
-    console.log(i)
-
-  }
-
-
+    console.log(i);
+  };
 
   useEffect(() => {
-    console.log(localStorage.getItem('appuserid'))
+    console.log(localStorage.getItem('appuserid'));
 
     if (localStorage.getItem('tenantid')) {
-      setTenantid(localStorage.getItem('tenantid'))
-      let val = localStorage.getItem('tenantid')
+      setTenantid(localStorage.getItem('tenantid'));
+      let val = localStorage.getItem('tenantid');
 
       fetchtable(val);
       fetchpercentage(val);
@@ -1344,15 +1138,11 @@ const Orders = () => {
       // fetchtable(val)
       // console.log(activeorders);
     }
-  }, [])
-
-
+  }, []);
 
   useEffect(() => {
-
     if (localStorage.getItem('tenantid')) {
-
-      let val = localStorage.getItem('tenantid')
+      let val = localStorage.getItem('tenantid');
 
       // fetchtable();
       // fetchpercentage(val);
@@ -1365,14 +1155,12 @@ const Orders = () => {
       // fetchtableconfirmed(val);
       // fetchtablemodified(val);
       // fetchtableclosed(val)
-      fetchtable(val)
-      fetchtablecreated(val)
+      fetchtable(val);
+      fetchtablecreated(val);
 
       console.log(activeorders);
     }
-
-
-  }, [startdate, enddate])
+  }, [startdate, enddate]);
 
   useEffect(() => {
     // if (tabstatus === 'All orders') setRows(orderarr)
@@ -1382,27 +1170,25 @@ const Orders = () => {
     // if (tabstatus === 'Cancelled') setRows(orderarrcancelled)
     // if (tabstatus === 'Assigned') setRows(orderarrassigned)
     // if (tabstatus === 'Confirmed') setRows(orderarrconfirmed)
-    if (tabstatus === 'Created') setRows(orderarrcreated)
+    if (tabstatus === 'Created') setRows(orderarrcreated);
 
-    if (tabstatus === 'All orders') setRows(orderarr)
-    if (tabstatus === 'Delivered') setRows(orderarrcovered)
-    if (tabstatus === 'Pending') setRows(orderarruncovered)
+    if (tabstatus === 'All orders') setRows(orderarr);
+    if (tabstatus === 'Delivered') setRows(orderarrcovered);
+    if (tabstatus === 'Pending') setRows(orderarruncovered);
 
     // if (tabstatus === 'Active') setRows(orderarractive)
     // if (tabstatus === 'Pending') setRows(orderarruncovered)
-    if (tabstatus === 'Cancelled') setRows(orderarrcancelled)
-    if (tabstatus === 'Assigned') setRows(orderarrassigned)
+    if (tabstatus === 'Cancelled') setRows(orderarrcancelled);
+    if (tabstatus === 'Assigned') setRows(orderarrassigned);
     //   if (tabstatus === 'Confirmed') setRows(orderarrconfirmed)
     //   if (tabstatus === 'Modified') setRows(orderarrmodified)
     //   if (tabstatus === 'Closed') setRows(orderarrclosed)
-    if (tabstatus === 'Picked') setRows(orderarrpicked)
-  }, [tabstatus])
+    if (tabstatus === 'Picked') setRows(orderarrpicked);
+  }, [tabstatus]);
 
   const okclicked = () => {
-
     setOpen(false);
-
-  }
+  };
 
   useEffect(() => {
     var day = 60 * 60 * 24 * 1000;
@@ -1411,13 +1197,12 @@ const Orders = () => {
       setEnddate(new Date(startDate.getTime() + day).toISOString().substring(0, 10));
       setStartdate(new Date(startDate.getTime() + day).toISOString().substring(0, 10));
       setDateselect('select');
-
     } else if (tabstatus1 === 'Today') {
       setEnddate(new Date().toISOString().substring(0, 10));
       setStartdate(new Date().toISOString().substring(0, 10));
       setDateselect('select');
     } else if (tabstatus1 === 'Week') {
-      setStartdate(new Date(startDate.getTime() - (day * 7)).toISOString().substring(0, 10));
+      setStartdate(new Date(startDate.getTime() - day * 7).toISOString().substring(0, 10));
       setEnddate(new Date().toISOString().substring(0, 10));
       setDateselect('select');
     }
@@ -1430,583 +1215,536 @@ const Orders = () => {
   }, [tabstatus1]);
 
   const choosedate = (date) => {
-
     setStartdate(date.$d.toISOString().substring(0, 10));
     setEnddate(date.$d.toISOString().substring(0, 10));
-    setTabstatus1('')
-
-  }
+    setTabstatus1('');
+  };
   useEffect(() => {
     if (tabstatus === 'All Orders') {
       if (searchword) {
         let arr = orderarr.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarr])
+        setRows([...orderarr]);
       }
-
-
     } else if (tabstatus === 'Delivered') {
       if (searchword) {
         let arr = orderarrcovered.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarrcovered])
+        setRows([...orderarrcovered]);
       }
-
     } else if (tabstatus === 'Active') {
       if (searchword) {
         let arr = orderarractive.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.eventname.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.eventname.toLowerCase().includes(searchword.toLowerCase()) ||
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
-            || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+            val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarractive])
+        setRows([...orderarractive]);
       }
-
     } else if (tabstatus === 'Pending') {
       if (searchword) {
         let arr = orderarruncovered.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarruncovered])
+        setRows([...orderarruncovered]);
       }
-
     } else if (tabstatus === 'Cancelled') {
       if (searchword) {
         let arr = orderarrcancelled.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarrcancelled])
+        setRows([...orderarrcancelled]);
       }
-
     } else if (tabstatus === 'Assigned') {
       if (searchword) {
         let arr = orderarrassigned.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarrassigned])
+        setRows([...orderarrassigned]);
       }
-
     } else if (tabstatus === 'Confirmed') {
       if (searchword) {
         let arr = orderarrconfirmed.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
-
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       } else {
-        setRows([...orderarrconfirmed])
-
+        setRows([...orderarrconfirmed]);
       }
     } else if (tabstatus === 'Modified') {
       if (searchword) {
         let arr = orderarrmodified.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.eventname.toLowerCase().includes(searchword.toLowerCase())
-            || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
-            || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
-            || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.eventname.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.tenantname.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
+      } else {
+        setRows([...orderarrmodified]);
       }
-      else {
-        setRows([...orderarrmodified])
-      }
-
     } else if (tabstatus === 'Closed') {
       if (searchword) {
         let arr = orderarrclosed.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.eventname.toLowerCase().includes(searchword.toLowerCase())
-            || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
-            || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
-            || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.eventname.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.tenantname.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
       }
     } else if (tabstatus === 'Picked') {
       if (searchword) {
         let arr = orderarrpicked.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
-            || val.customername.toLowerCase().includes(searchword.toLowerCase())
-            || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.customername.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
+      } else {
+        setRows([...orderarrpicked]);
       }
-      else {
-        setRows([...orderarrpicked])
-      }
-
     } else if (tabstatus === 'Created') {
       if (searchword) {
         let arr = orderarrcreated.filter((val) => {
-
-          return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-            || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
+          return (
+            val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
+            val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
+            val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             // || val.customername.toLowerCase().includes(searchword.toLowerCase())
             // || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
-
-          )
-        })
-        console.log(arr)
-        setRows([...arr])
+          );
+        });
+        console.log(arr);
+        setRows([...arr]);
+      } else {
+        setRows([...orderarrcreated]);
       }
-      else {
-        setRows([...orderarrcreated])
-      }
-
     }
-  }, [orderarr, searchword])
-
-
+  }, [orderarr, searchword]);
 
   const handleChange1 = (e) => {
-
-
-    setTabstatus1(e.target.innerText)
-    setDatestatus(e.target.innerText)
-  }
+    setTabstatus1(e.target.innerText);
+    setDatestatus(e.target.innerText);
+  };
 
   const fetchtable = async (tid) => {
-
     try {
-      // await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}`)
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}`)
+      await axios
+        .get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}`)
         .then((res) => {
           if (res.data.status) {
-            let arr = []
+            let arr = [];
             res.data.details.map((val, i) => {
               arr = [...arr, { ...val, sno: i + 1 }];
-            })
-            setArr(arr)
-            console.log(res.data.Details)
+            });
+            setArr(arr);
+            console.log(res.data.Details);
             if (tabstatus == 'All Orders') {
-              setRows(arr)
+              setRows(arr);
             }
           }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-  }
-
+  };
 
   const fetchtablecovered = async (tid) => {
-
     try {
       // await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=completed`)
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=delivered&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=delivered&fromdate=${startdate}&todate=${enddate}`
+        )
         .then((res) => {
           // if (res.data.message === "Success") {
-          let arr = []
+          let arr = [];
           res.data.details.map((val, i) => {
             arr = [...arr, { ...val, sno: i + 1 }];
-          })
-          setArrcovered(arr)
+          });
+          console.log('delivered', arr);
+          setArrcovered(arr);
           // }
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtablecreated = async (tid) => {
-
     try {
       // await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=completed`)
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=created&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=created&fromdate=${startdate}&todate=${enddate}`)
         .then((res) => {
           // if (res.data.message === "Success") {
-          let arr = []
+          let arr = [];
           res.data.details.map((val, i) => {
             arr = [...arr, { ...val, sno: i + 1 }];
-          })
-          setArrcreated(arr)
+          });
+          console.log('created', arr);
+          setArrcreated(arr);
           if (tabstatus == 'Created') {
-            setRows(arr)
+            setRows(arr);
           }
           // }
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
-
+  };
 
   const fetchtableactive = async () => {
-
     try {
-      await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=processing&sort=desc`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=processing&sort=desc`
+        )
         .then((res) => {
-          if (res.data.message === "Success") {
-            let arr = []
+          if (res.data.message === 'Success') {
+            let arr = [];
             res.data.Details.map((val, i) => {
               arr = [...arr, { ...val, sno: i + 1 }];
-            })
-            setArractive(arr)
+            });
+            setArractive(arr);
           }
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
-
+  };
 
   const fetchtableuncovered = async (tid) => {
-
     try {
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=pending&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=pending&fromdate=${startdate}&todate=${enddate}`)
         .then((res) => {
-          if (res.data.message === "Success") {
-            let arr = []
+          if (res.data.message === 'Success') {
+            let arr = [];
             res.data.details.map((val, i) => {
               arr = [...arr, { ...val, sno: i + 1 }];
-            })
-            setArruncovered(arr)
+            });
+            console.log('pending', arr);
+            setArruncovered(arr);
           }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtablecancelled = async (tid) => {
-
     try {
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=cancelled&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=cancelled&fromdate=${startdate}&todate=${enddate}`
+        )
         // await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=cancelled`)
 
         .then((res) => {
           // if (res.data.message === "Success") {
           let arr = [];
-          console.log(res.data.details)
+          console.log(res.data.details);
           res.data.details.map((val, i) => {
             arr = [...arr, { ...val, sno: i + 1 }];
-          })
-          setArrcancelled(arr)
+          });
+          console.log('cancelled', arr);
+          setArrcancelled(arr);
           // }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtableassigned = async (tid) => {
-
     try {
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=accepted&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=accepted&fromdate=${startdate}&todate=${enddate}`
+        )
         .then((res) => {
           // if (res.data.message === "Success") {
           let arr = [];
-          console.log(res.data.details)
+          console.log(res.data.details);
           res.data.details.map((val, i) => {
             arr = [...arr, { ...val, sno: i + 1 }];
-          })
-          setArrassigned(arr)
+          });
+          setArrassigned(arr);
           // }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtablepicked = async (tid) => {
-
     try {
-      await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=picked&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=picked&fromdate=${startdate}&todate=${enddate}`)
         .then((res) => {
           // if (res.data.message === "Success") {
           let arr = [];
-          console.log(res.data.details)
+          console.log(res.data.details);
           res.data.details.map((val, i) => {
             arr = [...arr, { ...val, sno: i + 1 }];
-          })
-          setArrpicked(arr)
+          });
+          setArrpicked(arr);
           // }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtableconfirmed = async (tid) => {
-
     try {
       // await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=confirmed&sort=desc`)
-      await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=confirmed&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=confirmed&fromdate=${startdate}&todate=${enddate}`
+        )
 
         .then((res) => {
-          if (res.data.message === "Success") {
+          if (res.data.message === 'Success') {
             let arr = [];
-            console.log(res.data.Details)
+            console.log(res.data.Details);
             res.data.Details.map((val, i) => {
               arr = [...arr, { ...val, sno: i + 1 }];
-            })
-            setArrconfirmed(arr)
-
+            });
+            setArrconfirmed(arr);
           }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtablemodified = async (tid) => {
-
     try {
       // await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=modified&sort=desc`)
-      await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=modified&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=modified&fromdate=${startdate}&todate=${enddate}`
+        )
 
         .then((res) => {
-          if (res.data.message === "Success") {
+          if (res.data.message === 'Success') {
             let arr = [];
-            console.log(res.data.Details)
+            console.log(res.data.Details);
             res.data.Details.map((val, i) => {
               arr = [...arr, { ...val, sno: i + 1 }];
-            })
-            setArrmodified(arr)
+            });
+            setArrmodified(arr);
           }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchtableclosed = async (tid) => {
-
     try {
       // await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=modified&sort=desc`)
-      await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=closed&fromdate=${startdate}&todate=${enddate}`)
+      await axios
+        .get(
+          `${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=closed&fromdate=${startdate}&todate=${enddate}`
+        )
         .then((res) => {
-
-          if (res.data.message === "Success") {
+          if (res.data.message === 'Success') {
             let arr = [];
-            console.log(res.data.Details)
+            console.log(res.data.Details);
             res.data.Details.map((val, i) => {
               arr = [...arr, { ...val, sno: i + 1 }];
-            })
-            setArrclosed(arr)
+            });
+            setArrclosed(arr);
           }
-
-        }).catch((err) => {
-          console.log(err)
         })
-
+        .catch((err) => {
+          console.log(err);
+        });
     } catch (err) {
       console.log(err);
     }
-
-  }
+  };
 
   const fetchpercentage = async (tid) => {
-    setLoading(true)
+    setLoading(true);
     try {
       // await axios.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}&fromdate=${startdate}&todate=${enddate}`)
-      await axios.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}`)
+      await axios
+        .get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}`)
 
         .then((res) => {
-          console.log(res)
+          console.log(res);
           // setConfirmed(res.data.details.confirmed.toString());
           // setModified(res.data.details.modified.toString());
-          setAllorders(res.data.details.total.toString())
-          setCoveredorders(res.data.details.delivered.toString())
+          setAllorders(res.data.details.total.toString());
+          setCoveredorders(res.data.details.delivered.toString());
 
-          setCancelled(res.data.details.cancelled.toString())
-          setUncoveredorders(res.data.details.pending.toString())
+          setCancelled(res.data.details.cancelled.toString());
+          setUncoveredorders(res.data.details.pending.toString());
           // setActiveorders(res.data.details.assigned.toString());
           // setAssigned(res.data.details.accepted.toString());
-          setCreated(res.data.details.created.toString())
+          setCreated(res.data.details.created.toString());
           setClosed(res.data.details.delivered.toString());
           // setPicked(res.data.details.picked.toString())
-          setPercentage1((Math.round((res.data.details.created / res.data.details.total) * 100) || 0).toString())
-          setPercentage3((Math.round((res.data.details.delivered / res.data.details.total) * 100) || 0).toString())
+          setPercentage1((Math.round((res.data.details.created / res.data.details.total) * 100) || 0).toString());
+          setPercentage3((Math.round((res.data.details.delivered / res.data.details.total) * 100) || 0).toString());
 
-          setPercentage4((Math.round((res.data.details.cancelled / res.data.details.total) * 100) || 0).toString())
+          setPercentage4((Math.round((res.data.details.cancelled / res.data.details.total) * 100) || 0).toString());
 
-          setPercentage2((Math.round((res.data.details.pending / res.data.details.total) * 100) || 0).toString())
+          setPercentage2((Math.round((res.data.details.pending / res.data.details.total) * 100) || 0).toString());
 
-
-          setLoading(false)
-        }).catch((err) => {
-          console.log(err)
-          setLoading(false)
+          setLoading(false);
+        })
+        .catch((err) => {
+          console.log(err);
+          setLoading(false);
           //   enqueueSnackbar(err.message, {
           //     variant: 'error', anchorOrigin: { vertical: 'top', horizontal: 'right' },
           //     autoHideDuration: 2000
           // })
-        })
-
+        });
     } catch (err) {
       console.log(err);
-      setLoading(false)
+      setLoading(false);
     }
+  };
 
-  }
+  return (
+    <>
+      {loading && <Loader />}
+      <Grid container rowSpacing={4.5} columnSpacing={2.75}>
+        <Grid item xs={12} sx={{ mb: -2.25 }}>
+          <Stack direction={{ xs: 'column', md: 'row' }} justifyContent="space-between" alignItems="center" spacing={2}>
+            <Stack direction="column" alignItems="flex-start" spacing={1}>
+              <Typography variant="h3">Orders</Typography>
 
-
-
-
-  return <>
-
-    {(loading) &&
-
-      <Loader />
-    }
-    <Grid container rowSpacing={4.5} columnSpacing={2.75}>
-      <Grid item xs={12} sx={{ mb: -2.25 }}>
-        <Stack direction={{ xs: 'column', md: 'row' }} justifyContent='space-between' alignItems='center' spacing={2}>
-          <Stack direction='column' alignItems='flex-start' spacing={1}>
-            <Typography variant="h3">Orders</Typography>
-
-
-            {/* </Stack> */}
-            {/* 
+              {/* </Stack> */}
+              {/* 
               <Stack direction='row' spacing={2}>
                 <Chip label='Orders-All' color="primary" variant="light" size="small" />
               </Stack> */}
+            </Stack>
 
-          </Stack>
-
-          {/* <Stack direction='row' spacing={1}
+            {/* <Stack direction='row' spacing={1}
               sx={{ mt: { md: 0, xs: 2 }, p: 1, display: { xs: 'block', md: 'none' } }}
             >
               <Button
@@ -2049,12 +1787,9 @@ const Orders = () => {
   
   
             </Box>*/}
-
-
-
-        </Stack>
-      </Grid>
-      {/* <Grid item xs={12} lg={3} sm={6}>
+          </Stack>
+        </Grid>
+        {/* <Grid item xs={12} lg={3} sm={6}>
           <HoverSocialCard primary="Confirmed orders" secondary={(confirmed === '') ?
   
             <Skeleton sx={{ width: '30px' }} animation="wave" />
@@ -2062,26 +1797,29 @@ const Orders = () => {
             : confirmed} percentage={percentage1.toString()} color={theme.palette.success.main} />
         </Grid> */}
 
-
-      {/* <Grid item xs={12} lg={3} sm={6}>
+        {/* <Grid item xs={12} lg={3} sm={6}>
           <HoverSocialCard primary="Modified Orders" secondary={(cancelled === '') ?
             <Skeleton sx={{ width: '30px' }} animation="wave" />
   
             : modified} percentage={percentage2.toString()} color={theme.palette.secondary[600]} />
         </Grid> */}
-      <Grid item xs={12} lg={3} sm={6}>
-        <HoverSocialCard primary="Created Orders" secondary={(created === '') ?
-          <Skeleton sx={{ width: '30px' }} animation="wave" />
-
-          : created} percentage={percentage1.toString()} color={theme.palette.primary.main} />
-      </Grid>
-      <Grid item xs={12} lg={3} sm={6}>
-        <HoverSocialCard primary="Pending orders" secondary={(uncoveredorders == '') ?
-          <Skeleton sx={{ width: '30px' }} animation="wave" />
-
-          : uncoveredorders} percentage={percentage2.toString()} color={theme.palette.warning.main} />
-      </Grid>
-      {/* <Grid item xs={12} lg={3} sm={6}>
+        <Grid item xs={12} lg={3} sm={6}>
+          <HoverSocialCard
+            primary="Created Orders"
+            secondary={created === '' ? <Skeleton sx={{ width: '30px' }} animation="wave" /> : created}
+            percentage={percentage1.toString()}
+            color={theme.palette.primary.main}
+          />
+        </Grid>
+        <Grid item xs={12} lg={3} sm={6}>
+          <HoverSocialCard
+            primary="Pending orders"
+            secondary={uncoveredorders == '' ? <Skeleton sx={{ width: '30px' }} animation="wave" /> : uncoveredorders}
+            percentage={percentage2.toString()}
+            color={theme.palette.warning.main}
+          />
+        </Grid>
+        {/* <Grid item xs={12} lg={3} sm={6}>
         <HoverSocialCard primary="Accepted orders" secondary={(assigned === '') ?
           <Skeleton sx={{ width: '30px' }} animation="wave" />
 
@@ -2093,13 +1831,15 @@ const Orders = () => {
 
           : picked} percentage={percentage3.toString()} color={theme.palette.primary.main} />
       </Grid> */}
-      <Grid item xs={12} lg={3} sm={6}>
-        <HoverSocialCard primary="Delivered orders" secondary={(coveredorders === '') ?
-          <Skeleton sx={{ width: '30px' }} animation="wave" />
-
-          : coveredorders} percentage={percentage3.toString()} color={theme.palette.success.main} />
-      </Grid>
-      {/*  
+        <Grid item xs={12} lg={3} sm={6}>
+          <HoverSocialCard
+            primary="Delivered orders"
+            secondary={coveredorders === '' ? <Skeleton sx={{ width: '30px' }} animation="wave" /> : coveredorders}
+            percentage={percentage3.toString()}
+            color={theme.palette.success.main}
+          />
+        </Grid>
+        {/*  
         <Grid item xs={12} lg={3} sm={6}>
           <HoverSocialCard primary="Closed orders" secondary={(closed === '') ?
             <Skeleton sx={{ width: '30px' }} animation="wave" />
@@ -2107,263 +1847,230 @@ const Orders = () => {
             : closed} percentage={percentage4.toString()} color={theme.palette.warning.main} />
         </Grid>
        */}
-      <Grid item xs={12} lg={3} sm={6}>
-        <HoverSocialCard primary="Cancelled Orders" secondary={(cancelled === '') ?
-          <Skeleton sx={{ width: '30px' }} animation="wave" />
+        <Grid item xs={12} lg={3} sm={6}>
+          <HoverSocialCard
+            primary="Cancelled Orders"
+            secondary={cancelled === '' ? <Skeleton sx={{ width: '30px' }} animation="wave" /> : cancelled}
+            percentage={percentage4.toString()}
+            color={theme.palette.secondary[600]}
+          />
+        </Grid>
 
-          : cancelled} percentage={percentage4.toString()} color={theme.palette.secondary[600]} />
-      </Grid>
-
-
-      {/* <Grid item md={8} sx={{ display: { sm: 'none', md: 'block', lg: 'none' } }} /> */}
-      <Grid item xs={12} sx={{ mb: -3 }}>
-        <Stack direction={'row'} justifyContent={'space-between'}>
-          {(startdate && enddate) &&
-            <Stack direction='row' spacing={2}>
-              <Chip label={`Orders-${(datestatus)?datestatus:''}`} color="primary" variant="light" size="small" />
-              <Chip label={<Typography noWrap color="secondary">{dayjs(startdate).format('DD/MM/YYYY')} - {dayjs(enddate).format('DD/MM/YYYY')}</Typography>} variant="combined" color='warning' size='small' />
-
-
-            </Stack>
-          }
-          {(!startdate || !enddate) &&
-            <>
-              <Stack direction='row' spacing={2}>
-                <Chip label='Orders-All' color="primary" variant="light" size="small" />
+        {/* <Grid item md={8} sx={{ display: { sm: 'none', md: 'block', lg: 'none' } }} /> */}
+        <Grid item xs={12} sx={{ mb: -3 }}>
+          <Stack direction={'row'} justifyContent={'space-between'}>
+            {startdate && enddate && (
+              <Stack direction="row" spacing={2}>
+                <Chip label={`Orders-${datestatus ? datestatus : ''}`} color="primary" variant="light" size="small" />
+                <Chip
+                  label={
+                    <Typography noWrap color="secondary">
+                      {dayjs(startdate).format('DD/MM/YYYY')} - {dayjs(enddate).format('DD/MM/YYYY')}
+                    </Typography>
+                  }
+                  variant="combined"
+                  color="warning"
+                  size="small"
+                />
               </Stack>
-            </>
-          }
+            )}
+            {(!startdate || !enddate) && (
+              <>
+                <Stack direction="row" spacing={2}>
+                  <Chip label="Orders-All" color="primary" variant="light" size="small" />
+                </Stack>
+              </>
+            )}
 
-          <Tooltip title='Order Filter'>
-            <IconButton
+            <Tooltip title="Order Filter">
+              <IconButton
+                color="secondary"
+                variant="light"
+                sx={{ color: 'text.primary', bgcolor: 'grey.200', display: { xs: 'none', md: 'flex' } }}
+                aria-haspopup="true"
+                onClick={() => setOpen(true)}
+              >
+                <FilterList />
+              </IconButton>
+            </Tooltip>
+          </Stack>
+        </Grid>
 
-
-
-
-
-              color="secondary"
-              variant="light"
-              sx={{ color: 'text.primary', bgcolor: 'grey.200', display: { xs: 'none', md: 'flex' } }}
-
-              aria-haspopup="true"
-
-
-
-
-              onClick={() => setOpen(true)} >
-              <FilterList />
-            </IconButton>
-          </Tooltip>
-        </Stack>
-      </Grid>
-
-      <Grid item xs={12}>
-        <Box sx={{ overflow: "auto", border: 1, borderColor: 'grey.200', borderRadius: 2, backgroundColor: '#fff', minHeight: 350 }}>
-
-
-          <Stack
-
-            alignItems='center'
-            justifyContent='space-between'
-            direction='row'
-
-            sx={{
-              p: 2,
-              width: '100%',
-
-            }}>
-            <Tabs value={tabvalue} onChange={handleChangetab} variant="scrollable" scrollButtons="auto" >
-              {/* <Tab label="All orders"
+        <Grid item xs={12}>
+          <Box sx={{ overflow: 'auto', border: 1, borderColor: 'grey.200', borderRadius: 2, backgroundColor: '#fff', minHeight: 350 }}>
+            <Stack
+              alignItems="center"
+              justifyContent="space-between"
+              direction="row"
+              sx={{
+                p: 2,
+                width: '100%'
+              }}
+            >
+              <Tabs value={tabvalue} onChange={handleChangetab} variant="scrollable" scrollButtons="auto">
+                {/* <Tab label="All orders"
                   iconPosition="end"
                   icon={<Chip label={allorders} color="primary" variant="light" size="small" />}
                 /> */}
-              <Tab label="Created"
-                icon={<Chip label={orderarrcreated.length} color="primary" variant="light" size="small" />}
-                iconPosition="end"
-              />
-              <Tab label="Pending"
-                icon={<Chip label={orderarruncovered.length} color="primary" variant="light" size="small" />}
-                iconPosition="end"
-              />
-              {/* <Tab label="Accepted"
+                <Tab
+                  label="Created"
+                  icon={<Chip label={orderarrcreated.length} color="primary" variant="light" size="small" />}
+                  iconPosition="end"
+                />
+                <Tab
+                  label="Pending"
+                  icon={<Chip label={orderarruncovered.length} color="primary" variant="light" size="small" />}
+                  iconPosition="end"
+                />
+                {/* <Tab label="Accepted"
                 icon={<Chip label={assigned} color="primary" variant="light" size="small" />}
                 iconPosition="end"
               /> */}
-              {/* <Tab label="Confirmed"
+                {/* <Tab label="Confirmed"
                   icon={<Chip label={confirmed} color="primary" variant="light" size="small" />}
                   iconPosition="end"
                 /> */}
-              {/* <Tab label="Modified"
+                {/* <Tab label="Modified"
                   icon={<Chip label={modified} color="primary" variant="light" size="small" />}
                   iconPosition="end"
                 /> */}
-              {/* <Tab label="Picked"
+                {/* <Tab label="Picked"
                 icon={<Chip label={picked} color="primary" variant="light" size="small" />}
                 iconPosition="end"
               /> */}
 
-              <Tab label="Delivered"
-                icon={<Chip label={orderarrcovered.length} color="primary" variant="light" size="small" />}
-                iconPosition="end"
-              />
+                <Tab
+                  label="Delivered"
+                  icon={<Chip label={orderarrcovered.length} color="primary" variant="light" size="small" />}
+                  iconPosition="end"
+                />
 
-
-              {/* <Tab label="Closed"
+                {/* <Tab label="Closed"
                   icon={<Chip label={closed} color="primary" variant="light" size="small" />}
                   iconPosition="end"
                 /> */}
-              <Tab label="Cancelled"
-                icon={<Chip label={orderarrcancelled.length} color="primary" variant="light" size="small" />}
-                iconPosition="end"
-              />
-            </Tabs>
+                <Tab
+                  label="Cancelled"
+                  icon={<Chip label={orderarrcancelled.length} color="primary" variant="light" size="small" />}
+                  iconPosition="end"
+                />
+              </Tabs>
 
+              <FormControl sx={{ width: 250, display: { xs: 'none', md: 'flex' } }}>
+                <OutlinedInput
+                  size="small"
+                  id="header-search"
+                  startAdornment={
+                    <InputAdornment position="start" sx={{ mr: -0.5 }}>
+                      <SearchOutlined />
+                    </InputAdornment>
+                  }
+                  aria-describedby="header-search-text"
+                  inputProps={{
+                    'aria-label': 'weight'
+                  }}
+                  placeholder="Search"
+                  value={searchword}
+                  onChange={(e) => {
+                    setSearchword(e.target.value);
+                  }}
+                  autoComplete="off"
+                />
+              </FormControl>
+            </Stack>
 
-            <FormControl sx={{ width: 250, display: { xs: 'none', md: 'flex' } }}>
-              <OutlinedInput
-                size="small"
-                id="header-search"
-                startAdornment={
-                  <InputAdornment position="start"
-                    sx={{ mr: -0.5 }}
-
-                  >
-                    <SearchOutlined />
-                  </InputAdornment>
-                }
-                aria-describedby="header-search-text"
-                inputProps={{
-                  'aria-label': 'weight'
-                }}
-                placeholder="Search"
-                value={searchword}
-                onChange={(e) => {
-
-                  setSearchword(e.target.value)
-                }}
-                autoComplete='off'
-              />
-            </FormControl>
-
-
-
-          </Stack>
-
-
-          <Box sx={{ width: "100%", display: "table", tableLayout: "fixed" }}>
-
-
-
-
-
-
-            <EnhancedTable />
+            <Box sx={{ width: '100%', display: 'table', tableLayout: 'fixed' }}>
+              <EnhancedTable />
+            </Box>
           </Box>
+        </Grid>
 
-        </Box>
+        <Dialog open={open}>
+          <DialogTitle align="left">
+            <Typography variant="h4">Select Filter Options</Typography>
+          </DialogTitle>
+          <DialogContent sx={{ width: '100%' }} className="datedialog">
+            <DateRangePicker
+              open={open}
+              toggle={() => setOpen(!open)}
+              id="daterange1"
+              onChange={(range) => {
+                if (range.label === 'All') {
+                  setDateselect('all');
+                  setStartdate('');
+                  setEnddate('');
 
-      </Grid>
-
-      <Dialog open={open} >
-        <DialogTitle align='left'>
-          <Typography variant='h4'>Select Filter Options</Typography>
-        </DialogTitle>
-        <DialogContent sx={{ width: '100%' }} className='datedialog' >
-          <DateRangePicker
-
-            open={open} toggle={() => setOpen(!open)}
-            id='daterange1'
-            onChange={(range) => {
-              if (range.label === 'All') {
-                setDateselect('all');
-                setStartdate('');
-                setEnddate('');
-
-                setOpen(false)
-              }
-              else {
-                setDateselect('select');
-                setStartdate(dayjs(range.startDate).format('YYYY-MM-DD'));
-                setEnddate(dayjs(range.endDate).format('YYYY-MM-DD'));
-                if (range.label) {
-                  setDatestatus(range.label)
+                  setOpen(false);
                 } else {
-                  setDatestatus('')
+                  setDateselect('select');
+                  setStartdate(dayjs(range.startDate).format('YYYY-MM-DD'));
+                  setEnddate(dayjs(range.endDate).format('YYYY-MM-DD'));
+                  if (range.label) {
+                    setDatestatus(range.label);
+                  } else {
+                    setDatestatus('');
+                  }
                 }
+                console.log(range);
+              }}
+              definedRanges={[
+                {
+                  label: 'Today',
+                  startDate: new Date(),
+                  endDate: new Date()
+                },
+                {
+                  label: 'Yesterday',
+                  startDate: addDays(new Date(), -1),
+                  endDate: addDays(new Date(), -1)
+                },
+                {
+                  label: 'Tomorrow',
+                  startDate: addDays(new Date(), +1),
+                  endDate: addDays(new Date(), +1)
+                },
+                {
+                  label: 'This Week',
+                  startDate: startOfWeek(new Date()),
+                  endDate: endOfWeek(new Date())
+                },
+                {
+                  label: 'Last Week',
+                  startDate: startOfWeek(addWeeks(new Date(), -1)),
+                  endDate: endOfWeek(addWeeks(new Date(), -1))
+                },
+                {
+                  label: 'Last 7 Days',
+                  startDate: addWeeks(new Date(), -1),
+                  endDate: new Date()
+                },
+                {
+                  label: 'This Month',
+                  startDate: startOfMonth(new Date()),
+                  endDate: endOfMonth(new Date())
+                },
+                {
+                  label: 'Last Month',
+                  startDate: startOfMonth(addMonths(new Date(), -1)),
+                  endDate: endOfMonth(addMonths(new Date(), -1))
+                }
+                // {
+                //   label: 'All',
+                //   startDate: new Date(),
+                //   endDate: addDays(new Date(), -1),
+                // },
+              ]}
+            />
+          </DialogContent>
+          <Stack direction="row" justifyContent="flex-end" sx={{ width: '100%', p: 2 }}>
+            <Button variant="contained" size="small" onClick={okclicked}>
+              ok
+            </Button>
+          </Stack>
+        </Dialog>
+      </Grid>
+    </>
+  );
+};
 
-
-              }
-              console.log(range)
-            }}
-
-
-            definedRanges={[
-              {
-                label: 'Today',
-                startDate: new Date(),
-                endDate: new Date()
-              },
-              {
-                label: 'Yesterday',
-                startDate: addDays(new Date(), -1),
-                endDate: addDays(new Date(), -1)
-              },
-              {
-                label: 'Tomorrow',
-                startDate: addDays(new Date(), +1),
-                endDate: addDays(new Date(), +1)
-              },
-              {
-                label: 'This Week',
-                startDate: startOfWeek(new Date()),
-                endDate: endOfWeek(new Date()),
-              },
-              {
-                label: 'Last Week',
-                startDate: startOfWeek(addWeeks(new Date(), -1)),
-                endDate: endOfWeek(addWeeks(new Date(), -1)),
-              },
-              {
-                label: 'Last 7 Days',
-                startDate: addWeeks(new Date(), -1),
-                endDate: new Date(),
-              },
-              {
-                label: 'This Month',
-                startDate: startOfMonth(new Date()),
-                endDate: endOfMonth(new Date()),
-              },
-              {
-                label: 'Last Month',
-                startDate: startOfMonth(addMonths(new Date(), -1)),
-                endDate: endOfMonth(addMonths(new Date(), -1)),
-              },
-              // {
-              //   label: 'All',
-              //   startDate: new Date(),
-              //   endDate: addDays(new Date(), -1),
-              // },
-
-            ]}
-
-
-          />
-        </DialogContent>
-        <Stack direction='row' justifyContent='flex-end' sx={{ width: '100%', p: 2 }}>
-          <Button variant='contained' size='small' onClick={okclicked}>ok</Button>
-        </Stack>
-
-      </Dialog>
-
-
-
-
-
-
-    </Grid>
-
-
-  </>
-}
-
-export default Orders;
\ No newline at end of file
+export default Orders;