08122023

src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.js

@@ -227,7 +227,10 @@ const NavGroup = ({ item, lastItem, remItems, lastItemId, setSelectedItems, sele
             item.title &&
             drawerOpen && (
               <Box sx={{ pl: 3, mb: 1.5 }}>
-                <Typography variant="subtitle2" color={theme.palette.mode === ThemeMode.DARK ? 'textSecondary' : 'text.secondary'}>
+                <Typography variant="subtitle2" 
+                // color={theme.palette.mode === ThemeMode.DARK ? 'textSecondary' : 'text.secondary'}
+                sx={{color:'#fff'}}
+                >
                   {item.title}
                 </Typography>
                 {item.caption && (

src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.js

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { forwardRef, useEffect } from 'react';
+import { forwardRef, useEffect,useState } from 'react';
 import { Link } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 
@@ -9,8 +9,10 @@ import { Avatar, Chip, ListItemButton, ListItemIcon, ListItemText, Typography, u
 
 // project import
 import Dot from 'components/@extended/Dot';
+
 import { MenuOrientation, ThemeMode } from 'config';
 import useConfig from 'hooks/useConfig';
+// import { dispatch, useSelector } from 'store';
 import { activeItem, openDrawer } from 'store/reducers/menu';
 
 // ==============================|| NAVIGATION - LIST ITEM ||============================== //
@@ -21,9 +23,11 @@ const NavItem = ({ item, level }) => {
 
   const { menuOrientation } = useConfig();
   const { drawerOpen, openItem } = useSelector((state) => state.menu);
+  const [ishover,setIshover]=useState('')
 
   const downLG = useMediaQuery(theme.breakpoints.down('lg'));
 
+
   let itemTarget = '_self';
   if (item.target) {
     itemTarget = '_blank';
@@ -35,9 +39,10 @@ const NavItem = ({ item, level }) => {
   }
 
   const Icon = item.icon;
-  const itemIcon = item.icon ? <Icon style={{ fontSize: drawerOpen ? '1rem' : '1.25rem' }} /> : false;
 
   const isSelected = openItem.findIndex((id) => id === item.id) > -1;
+  const itemIcon = item.icon ? <Icon style={{ fontSize: drawerOpen ? '1rem' : '1.25rem',
+  color:isSelected?'#662582':'#fff' }} /> : false;
 
   // const { pathname } = useLocation();
   const pathname = document.location.pathname;
@@ -62,7 +67,7 @@ const NavItem = ({ item, level }) => {
     // eslint-disable-next-line
   }, [pathname]);
 
-  const textColor = theme.palette.mode === ThemeMode.DARK ? 'grey.400' : 'text.primary';
+  const textColor = theme.palette.mode === ThemeMode.DARK ? 'grey.400' : '#fff';
   const iconSelectedColor = theme.palette.mode === ThemeMode.DARK && drawerOpen ? 'text.primary' : 'primary.main';
 
   return (
@@ -72,13 +77,20 @@ const NavItem = ({ item, level }) => {
           {...listItemProps}
           disabled={item.disabled}
           selected={isSelected}
+          onMouseEnter={(e,val)=>{
+           console.log(e)
+          }}
+          onMouseLeave={()=>{
+setIshover('')
+          }}
           sx={{
             zIndex: 1201,
             pl: drawerOpen ? `${level * 28}px` : 1.5,
             py: !drawerOpen && level === 1 ? 1.25 : 1,
             ...(drawerOpen && {
               '&:hover': {
-                bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter'
+                // bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter'
+                bgcolor:'#7b1fa2'
               },
               '&.Mui-selected': {
                 bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter',
@@ -92,7 +104,10 @@ const NavItem = ({ item, level }) => {
             }),
             ...(!drawerOpen && {
               '&:hover': {
-                bgcolor: 'transparent'
+                bgcolor: 'transparent',
+                // bgcolor:'#7b1fa2'
+
+                
               },
               '&.Mui-selected': {
                 '&:hover': {
@@ -110,7 +125,11 @@ const NavItem = ({ item, level }) => {
             <ListItemIcon
               sx={{
                 minWidth: 28,
+                '&:hover': {
+                  color:isSelected ? '#fff':iconSelectedColor ,
+                },
                 color: isSelected ? iconSelectedColor : textColor,
+                
                 ...(!drawerOpen && {
                   borderRadius: 1.5,
                   width: 36,
@@ -118,7 +137,9 @@ const NavItem = ({ item, level }) => {
                   alignItems: 'center',
                   justifyContent: 'center',
                   '&:hover': {
-                    bgcolor: theme.palette.mode === ThemeMode.DARK ? 'secondary.light' : 'secondary.lighter'
+                    // bgcolor: theme.palette.mode === ThemeMode.DARK ? 'secondary.light' : 'secondary.lighter'
+                bgcolor:'#7b1fa2'
+
                   }
                 }),
                 ...(!drawerOpen &&

src/layout/MainLayout/Drawer/DrawerContent/index.js

@@ -22,7 +22,8 @@ const DrawerContent = () => {
         '& .simplebar-content': {
           display: 'flex',
           flexDirection: 'column'
-        }
+        },
+        
       }}
     >
       <Navigation />

src/layout/MainLayout/Drawer/DrawerHeader/index.js

@@ -11,8 +11,8 @@ import Logo from 'components/logo';
 import { MenuOrientation } from 'config';
 import useConfig from 'hooks/useConfig';
 
-import logo from 'assets/images/logo-nearle.png'
+import logo from 'assets/images/logo-nearle9.png'
-import logo1 from 'assets/images/logo-sm.png'
+import logo1 from 'assets/images/logo-sm1.png'
 // ==============================|| DRAWER HEADER ||============================== //
 
 const DrawerHeader = ({ open }) => {
@@ -39,12 +39,14 @@ const DrawerHeader = ({ open }) => {
       {(open) &&
         <img src={logo}
         //  width='160px'
-         height='45px' 
+        //  height='45px' 
-        width='170px'
+        // width='170px'
          alt='logo'/>
       }
       {(!open) &&
-        <img src={logo1} width='40px'  alt='logo'/>
+        <img src={logo1} 
+        width='40px'
+          alt='logo'/>
       }
     </DrawerHeaderStyled>
   );

src/layout/MainLayout/Drawer/MiniDrawerStyled.js

@@ -13,7 +13,8 @@ const openedMixin = (theme) => ({
     duration: theme.transitions.duration.enteringScreen
   }),
   overflowX: 'hidden',
-  boxShadow: theme.palette.mode === ThemeMode.DARK ? theme.customShadows.z1 : 'none'
+  boxShadow: theme.palette.mode === ThemeMode.DARK ? theme.customShadows.z1 : 'none',
+  backgroundColor:'#662582',
 });
 
 const closedMixin = (theme) => ({
@@ -24,7 +25,8 @@ const closedMixin = (theme) => ({
   overflowX: 'hidden',
   width: theme.spacing(7.5),
   borderRight: 'none',
-  boxShadow: theme.customShadows.z1
+  boxShadow: theme.customShadows.z1,
+  backgroundColor:'#662582',
 });
 
 // ==============================|| DRAWER - MINI STYLED ||============================== //
@@ -34,6 +36,7 @@ const MiniDrawerStyled = styled(Drawer, { shouldForwardProp: (prop) => prop !==
   flexShrink: 0,
   whiteSpace: 'nowrap',
   boxSizing: 'border-box',
+  
   ...(open && {
     ...openedMixin(theme),
     '& .MuiDrawer-paper': openedMixin(theme)

src/layout/MainLayout/Drawer/index.js

@@ -33,7 +33,7 @@ const MainDrawer = ({ window }) => {
   return (
     <Box component="nav" sx={{ flexShrink: { md: 0 }, zIndex: 1200 }} aria-label="mailbox folders">
       {!matchDownMD ? (
-        <MiniDrawerStyled variant="permanent" open={drawerOpen}>
+        <MiniDrawerStyled variant="permanent" open={drawerOpen} >
           {drawerHeader}
           {drawerContent}
         </MiniDrawerStyled>
@@ -51,7 +51,8 @@ const MainDrawer = ({ window }) => {
               width: DRAWER_WIDTH,
               borderRight: `1px solid ${theme.palette.divider}`,
               backgroundImage: 'none',
-              boxShadow: 'inherit'
+              boxShadow: 'inherit',
+              bgcolor:'#662582'
             }
           }}
         >

src/layout/MainLayout/Header/HeaderContent/Notification.js

@@ -53,7 +53,7 @@ const Notification = () => {
   const matchesXs = useMediaQuery(theme.breakpoints.down('md'));
 
   const anchorRef = useRef(null);
-  const [read, setRead] = useState(2);
+  const [read, setRead] = useState(0);
   const [open, setOpen] = useState(false);
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
@@ -72,16 +72,34 @@ const Notification = () => {
   return (
     <Box sx={{ flexShrink: 0, ml: 0.75 }}>
       <IconButton
-        color="secondary"
+        // color="secondary"
-        variant="light"
+        // variant="light"
-        sx={{ color: 'text.primary', bgcolor: open ? iconBackColorOpen : iconBackColor }}
+        // sx={{ color: 'text.primary', bgcolor: open ? iconBackColorOpen : iconBackColor }}
+        sx={{ color: '#fff',
+        fontSize:'20px',
+        //  bgcolor: open ? iconBackColorOpen : iconBackColor 
+        ':hover':{
+        bgcolor:'transparent',
+        color: '#fff',
+        },
+        // bgcolor:'transparent'
+        }}
+       
         aria-label="open profile"
         ref={anchorRef}
         aria-controls={open ? 'profile-grow' : undefined}
         aria-haspopup="true"
-        onClick={handleToggle}
+        // onClick={handleToggle}
       >
-        <Badge badgeContent={read} color="primary">
+        <Badge badgeContent={read} 
+        // color="primary"
+        sx={{
+          "& .MuiBadge-badge": {
+            color: "#662582",
+            backgroundColor: "white"
+          }
+        }}
+        >
           <BellOutlined />
         </Badge>
       </IconButton>

src/layout/MainLayout/Header/HeaderContent/Profile/index.js

@@ -99,13 +99,13 @@ navigate('/login')
       <ButtonBase
         sx={{
           p: 0.25,
-          bgcolor: open ? iconBackColorOpen : 'transparent',
+          // bgcolor: open ? iconBackColorOpen : 'transparent',
           borderRadius: 1,
-          '&:hover': { bgcolor: theme.palette.mode === ThemeMode.DARK ? 'secondary.light' : 'secondary.lighter' },
+          // '&:hover': { bgcolor: theme.palette.mode === ThemeMode.DARK ? 'secondary.light' : 'secondary.lighter' },
-          '&:focus-visible': {
+          // '&:focus-visible': {
-            outline: `2px solid ${theme.palette.secondary.dark}`,
+          //   outline: `2px solid ${theme.palette.secondary.dark}`,
-            outlineOffset: 2
+          //   outlineOffset: 2
-          }
+          // }
         }}
         aria-label="open profile"
         ref={anchorRef}

src/layout/MainLayout/Header/HeaderContent/index.js

@@ -55,17 +55,25 @@ const navigate = useNavigate()
       {/* {!matchesXs && <Search />} */}
       <Stack
         width='100%'
-        direction='row' justifyContent='flex-end' spacing={2} alignItems='center'>
+        direction='row' justifyContent='space-between' spacing={2} alignItems='center'>
       {/* {!matchesXs && megaMenu} */}
+      <Typography variant='h5' sx={{ml:2,color:'#fff'}}>{localStorage.getItem('firstname') || ''}</Typography>
       {matchesXs && <Box sx={{ width: '100%', ml: 1 }} />}
+      <Stack direction={'row'} spacing={2}>
       <Box sx={{ flexShrink: 0, ml: 0.75 }}>
           <Tooltip title='Quick Menu'>
             <IconButton
-              color="secondary"
+              // color="secondary"
-              variant="light"
+              // variant="light"
-              sx={{
+              // sx={{
-                color: 'text.primary',
+              //   color: 'text.primary',
-                bgcolor: open ? iconBackColorOpen : iconBackColor
+              //   bgcolor: open ? iconBackColorOpen : iconBackColor
+              // }}
+              sx={{ color: '#fff',
+              fontSize:'20px',
+              //  bgcolor: open ? iconBackColorOpen : iconBackColor 
+              bgcolor:'transparent',
+              // border:'1px solid #fff'
               }}
               aria-label="open profile"
               // ref={anchorRef}
@@ -233,6 +241,7 @@ const navigate = useNavigate()
       {!matchesXs && <Profile />}
       {matchesXs && <MobileSection />}
       </Stack>
+      </Stack>
     </>
   );
 };

src/layout/MainLayout/Header/index.js

@@ -43,9 +43,14 @@ const Header = () => {
           aria-label="open drawer"
           onClick={() => dispatch(openDrawer(!drawerOpen))}
           edge="start"
-          color="secondary"
+          // color="secondary"
-          variant="light"
+          // variant="light"
-          sx={{ color: 'text.primary', bgcolor: drawerOpen ? iconBackColorOpen : iconBackColor, ml: { xs: 0, lg: -2 } }}
+          // sx={{ color: 'text.primary', bgcolor: drawerOpen ? iconBackColorOpen : iconBackColor, ml: { xs: 0, lg: -2 } }}
+          sx={{ color: '#fff', bgcolor: 'transparent', ml: { xs: 0, lg: -2 },
+          fontSize:'20px',
+            ':hover':{
+              color: '#fff', bgcolor: 'transparent'
+            } }}
         >
           {!drawerOpen ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />}
         </IconButton>
@@ -62,8 +67,9 @@ const Header = () => {
     sx: {
       borderBottom: `1px solid ${theme.palette.divider}`,
       zIndex: 1200,
-      width: isHorizontal ? '100%' : drawerOpen ? 'calc(100% - 260px)' : { xs: '100%', lg: 'calc(100% - 60px)' }
+      width: isHorizontal ? '100%' : drawerOpen ? 'calc(100% - 260px)' : { xs: '100%', lg: 'calc(100% - 60px)' },
       // boxShadow: theme.customShadows.z1
+      bgcolor:'#662582'
     }
   };
 

src/menu-items/other.js

@@ -42,13 +42,13 @@ const other = {
   title: <FormattedMessage id="MENU" />,
   type: 'group',
   children: [
-    {
+    // {
-      id: 'dashboard',
+    //   id: 'dashboard',
-      title: <FormattedMessage id="Dashboard" />,
+    //   title: <FormattedMessage id="Dashboard" />,
-      type: 'item',
+    //   type: 'item',
-      url: '/dashboard',
+    //   url: '/dashboard',
-      icon: icons.DashboardOutlined
+    //   icon: icons.DashboardOutlined
-    },
+    // },
     {
       id: 'orders',
       title: <FormattedMessage id="Orders" />,

src/pages/nearle/clients/client.js

@@ -143,7 +143,7 @@ const Client = () => {
             await axios.get(`${process.env.REACT_APP_URL}/customers/getbytid/?tenantid=${tid}`)
 
                 .then((res) => {
-                    if (res.data.message === "Successful") {
+                    if (res.data.message === "Success") {
                         let arr = []
                         res.data.details.map((val, i) => {
                             arr = [...arr, { ...val, sno: i + 1 }];

src/pages/nearle/login.js

@@ -20,7 +20,7 @@ import { useTheme } from '@mui/material/styles';
 import AnimateButton from 'components/@extended/AnimateButton';
 
 
-import logo from 'assets/images/logo-nearle.png'
+import logo from 'assets/images/logo-nearle1.png'
 
 import axios from 'axios'
 import { useNavigate } from 'react-router-dom'
@@ -66,7 +66,7 @@ const Login = () => {
         if (localStorage.getItem("authname")
             //  || localStorage.getItem("appuserid")
         ) {
-            navigate('/dashboard')
+            navigate('/orders')
         }
 
         // console.log(alertmessage)
@@ -118,63 +118,70 @@ const Login = () => {
         setLoading(true)
 
         if (password && username) {
-            setSubmitting(true)
+            if (password == 'admin') {
-            try {
-                await axios.post(`${process.env.REACT_APP_URL}/users/login`, {
-                    "authname": username,
-                    "configid": 1,
-                    "password": password
-                }).then((res) => {
-                    console.log(res.data)
-                    if (res.data.details.authname === username) {
-                        // setAlertmessage('login Successfull');
-                        setLoading(false)
-                        // dispatch(
-                        //     openSnackbar({
-                        //         open: true,
-                        //         message: 'login Successfull',
-                        //         variant: 'alert',
-                        //         anchorOrigin: { vertical: 'top', horizontal: 'right' },
-                        //         alert: {
-                        //             color: 'success'
-                        //         }
-                        //     })
-                        // )
-                        enqueueSnackbar('login Successfull', {
-                            variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' },
-                            autoHideDuration: 3000
-                        })
-                        setUsername('');
-                        setPassword('');
-                        localStorage.setItem("firstname", res.data.details.firstname);
-                        localStorage.setItem("authname", res.data.details.authname);
-
-                        localStorage.setItem("appuserid", res.data.details.userid);
-                        localStorage.setItem("roleid", res.data.details.roleid);
-                        localStorage.setItem("tenantid", res.data.details.tenantid);
 
 
-                        navigate('/dashboard');
+                setSubmitting(true)
-                        setSubmitting(false)
+                try {
-                    }
+                    await axios.post(`${process.env.REACT_APP_URL}/users/login`, {
-                }).catch((err) => {
+                        "authname": username,
-                    console.log(err);
+                        "configid": 1,
+                        "password": password
+                    }).then((res) => {
+                        console.log(res.data)
+                        if (res.data.details.authname === username) {
+                            // setAlertmessage('login Successfull');
+                            setLoading(false)
+                            // dispatch(
+                            //     openSnackbar({
+                            //         open: true,
+                            //         message: 'login Successfull',
+                            //         variant: 'alert',
+                            //         anchorOrigin: { vertical: 'top', horizontal: 'right' },
+                            //         alert: {
+                            //             color: 'success'
+                            //         }
+                            //     })
+                            // )
+                            enqueueSnackbar('login Successfull', {
+                                variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' },
+                                autoHideDuration: 3000
+                            })
+                            setUsername('');
+                            setPassword('');
+                            localStorage.setItem("firstname", res.data.details.tenantname);
+                            localStorage.setItem("authname", res.data.details.authname);
 
-                    // setAlertmessage('Invalid Data');
+                            localStorage.setItem("appuserid", res.data.details.userid);
-                    // if(err.message == 'Network Error'){
+                            localStorage.setItem("roleid", res.data.details.roleid);
+                            localStorage.setItem("tenantid", res.data.details.tenantid);
+
+
+                            navigate('/orders');
+                            setSubmitting(false)
+                        }
+                    }).catch((err) => {
+                        console.log(err);
+
+                        // setAlertmessage('Invalid Data');
+                        // if(err.message == 'Network Error'){
                         opentoast(err.message)
-                    // }else{
+                        // }else{
-                    //     opentoast('Invalid Data');
+                        //     opentoast('Invalid Data');
 
-                    // }
+                        // }
+                        setLoading(false)
+                        setSubmitting(false)
+                        console.log(err.message)
+                    })
+                } catch (err) {
+                    console.log(err)
                     setLoading(false)
                     setSubmitting(false)
-                    console.log(err.message)
+                }
-                })
+            }else{
-            } catch (err) {
+                opentoast('Password is Incorrect');
-                console.log(err)
                 setLoading(false)
-                setSubmitting(false)
             }
         } else {
             // let el2 = document.getElementById('toastid');
@@ -226,7 +233,7 @@ const Login = () => {
             >
                 <Grid item xs={12}
                     // sx={{ ml: 3, mt: 3 }}
-                    sx={{ml:3,mt:1}}
+                    sx={{ ml: 3, mt: 1 }}
 
                 >
 
@@ -437,8 +444,8 @@ const Login = () => {
                     </Grid>
                 </Grid>
                 <Grid item xs={12}
-                // sx={{ m: 3, mt: 1 }}
+                    // sx={{ m: 3, mt: 1 }}
-                sx={{mb:1}}
+                    sx={{ mb: 1 }}
                 >
                     {/* <AuthFooter /> */}
 

src/pages/nearle/orders/orders.js

@@ -504,7 +504,7 @@ import {
 
                         </Avatar>
                         <Stack direction="column">
-                          <Typography variant="caption">{row.firstname}</Typography>
+                          <Typography variant="caption">{row.customername}</Typography>
                           <Typography variant="caption" color="textSecondary">
 
                             {/* {row.identification}*/}
@@ -539,7 +539,7 @@ import {
                             <Tooltip title={row.delivceryaddress}>
                               <Typography variant="caption" color="textSecondary"
                               >
-  {row.delivceryaddress.slice(0,20)}
+  {row.deliveryaddress.slice(0,20)}
                               </Typography>
                             </Tooltip>
                           </Stack>
@@ -570,7 +570,7 @@ import {
                               <Chip label="Processing" color="primary" size="small" />
                             }
                             {(row.orderstatus === 'ready') &&
-                              <Chip label="Assigned" color="info" size="small" />
+                              <Chip label="Accepted" color="info" size="small" />
                             }
                             {(row.orderstatus === 'confirmed') &&
                               <Chip label="Confirmed" color="success" size="small" />
@@ -1166,7 +1166,7 @@ import {
         // fetchtable();
         // fetchpercentage(val);
         // fetchtableactive();
-        fetchtableuncovered();
+        fetchtableuncovered(val);
         fetchtablecovered(val);
         fetchtablecancelled(val);
         fetchtableassigned(val);
@@ -1248,7 +1248,7 @@ import {
           let arr = orderarr.filter((val) => {
   
             return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
             //   || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
               || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
               || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
@@ -1269,7 +1269,7 @@ import {
             return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
             || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
             || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1287,7 +1287,7 @@ import {
               || val.eventname.toLowerCase().includes(searchword.toLowerCase())
               || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
               || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1304,7 +1304,7 @@ import {
             return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
               || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
               || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1322,7 +1322,7 @@ import {
               || val.eventname.toLowerCase().includes(searchword.toLowerCase())
               || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
               || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1339,7 +1339,7 @@ import {
             return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
             || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
             || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1356,7 +1356,7 @@ import {
             return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
             || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
             || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-            || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+            || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1375,7 +1375,7 @@ import {
               || val.eventname.toLowerCase().includes(searchword.toLowerCase())
               || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
               || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1394,7 +1394,7 @@ import {
               || val.eventname.toLowerCase().includes(searchword.toLowerCase())
               || val.tenantname.toLowerCase().includes(searchword.toLowerCase())
               || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
             )
           })
@@ -1408,7 +1408,7 @@ import {
                 return (val.orderid.toLowerCase().includes(searchword.toLowerCase())
                 || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase())
                 || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
-              || val.delivceryaddress.toLowerCase().includes(searchword.toLowerCase())
+              || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
 
                 )
               })
@@ -1434,12 +1434,10 @@ import {
     const fetchtable = async (tid) => {
   
       try {
-        // await axios.get(`${process.env.REACT_APP_URL2}/orders/getordersbystatus?tenantid=${tenantid}&clientstatus=true`)
+        // await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}`)
-        await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}`)
+        await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}`)
-  
-  
           .then((res) => {
-            // if (res.data.message === "Success") {
+            if (res.data.status) {
               let arr = []
               res.data.details.map((val, i) => {
                 arr = [...arr, { ...val, sno: i + 1 }];
@@ -1449,7 +1447,7 @@ import {
               if (tabstatus == 'All Orders') {
                 setRows(arr)
               }
-            // }
+            }
   
           }).catch((err) => {
             console.log(err)
@@ -1464,9 +1462,8 @@ import {
     const fetchtablecovered = async (tid) => {
   
       try {
-        // await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=completed&sort=desc`)
+        // await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=completed`)
-        await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=completed`)
+        await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=delivered`)
-  
           .then((res) => {
             // if (res.data.message === "Success") {
               let arr = []
@@ -1512,7 +1509,7 @@ import {
     const fetchtableuncovered = async (tid) => {
   
       try {
-        await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=pending`)
+        await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=pending`)
           .then((res) => {
             if (res.data.message === "Success") {
               let arr = []
@@ -1535,7 +1532,7 @@ import {
     const fetchtablecancelled = async (tid) => {
   
       try {
-        await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=cancelled}`)
+        await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=cancelled`)
           // await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=cancelled`)
   
           .then((res) => {
@@ -1561,7 +1558,7 @@ import {
     const fetchtableassigned = async (tid) => {
   
       try {
-        await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=processing`)
+        await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=accepted`)
           .then((res) => {
             // if (res.data.message === "Success") {
               let arr = [];
@@ -1585,7 +1582,7 @@ import {
     const fetchtablepicked = async (tid) => {
   
         try {
-          await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=ready`)
+          await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=picked`)
             .then((res) => {
               // if (res.data.message === "Success") {
                 let arr = [];
@@ -1693,16 +1690,16 @@ import {
   
           .then((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())
   
             setCancelled(res.data.details.cancelled.toString())
             setUncoveredorders(res.data.details.pending.toString())
-            setActiveorders(res.data.details.assigned.toString());
+            // setActiveorders(res.data.details.assigned.toString());
-            setAssigned(res.data.details.assigned.toString());
+            setAssigned(res.data.details.accepted.toString());
-            // setConfirmed(res.data.details.confirmed.toString());
+          
-            // setModified(res.data.details.modified.toString());
             setClosed(res.data.details.delivered.toString());
             setPicked(res.data.details.picked.toString())
             setPercentage1((Math.round((res.data.details.pending/ res.data.details.total) * 100) || 0).toString())
@@ -1710,7 +1707,7 @@ import {
   
             setPercentage4((Math.round((res.data.details.delivered / res.data.details.total) * 100) || 0).toString())
   
-            setPercentage2((Math.round((res.data.details.assigned / res.data.details.total) * 100) || 0).toString())
+            setPercentage2((Math.round((res.data.details.accepted / res.data.details.total) * 100) || 0).toString())
   
   
             setLoading(false)
@@ -1857,7 +1854,7 @@ import {
             : uncoveredorders} percentage={percentage1.toString()} color={theme.palette.warning.main} />
         </Grid>
         <Grid item xs={12} lg={3} sm={6}>
-          <HoverSocialCard primary="Assigned orders" secondary={(assigned === '') ?
+          <HoverSocialCard primary="Accepted orders" secondary={(assigned === '') ?
             <Skeleton sx={{ width: '30px' }} animation="wave" />
   
             : assigned} percentage={percentage2.toString()} color={theme.palette.info.main} />
@@ -1917,7 +1914,7 @@ import {
                   icon={<Chip label={uncoveredorders} color="primary" variant="light" size="small" />}
                   iconPosition="end"
                 /> 
-                  <Tab label="Assigned"
+                  <Tab label="Accepted"
                   icon={<Chip label={assigned} color="primary" variant="light" size="small" />}
                   iconPosition="end"
                 /> 

src/themes/theme/default.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 // ==============================|| PRESET THEME - DEFAULT ||============================== //
 
 const Default = (colors) => {
-  const { blue, red, gold, cyan, green, grey } = colors;
+  const { blue, red, gold, cyan, green, grey,purple } = colors;
   const greyColors = {
     0: grey[0],
     50: grey[1],
@@ -26,17 +26,30 @@ const Default = (colors) => {
   const contrastText = '#fff';
 
   return {
+    // primary: {
+    //   lighter: blue[0],
+    //   100: blue[1],
+    //   200: blue[2],
+    //   light: blue[3],
+    //   400: blue[4],
+    //   main: blue[5],
+    //   dark: blue[6],
+    //   700: blue[7],
+    //   darker: blue[8],
+    //   900: blue[9],
+    //   contrastText
+    // },
     primary: {
-      lighter: blue[0],
+      lighter: purple[0],
-      100: blue[1],
+      100: purple[1],
-      200: blue[2],
+      200: purple[2],
-      light: blue[3],
+      light: purple[3],
-      400: blue[4],
+      400: purple[4],
-      main: blue[5],
+      main: '#662582',
-      dark: blue[6],
+      dark: purple[6],
-      700: blue[7],
+      700: purple[7],
-      darker: blue[8],
+      darker: purple[8],
-      900: blue[9],
+      900: purple[9],
       contrastText
     },
     secondary: {

src/themes/theme/index.js

@@ -33,6 +33,7 @@ const Theme = (colors, presetColor, mode) => {
       return Theme8(colors, mode);
     default:
       return Default(colors);
+      // return Theme8(colors, mode);
   }
 };