From ecafa8fb25e7c47f3fe7abf9a23d4b914b785b75 Mon Sep 17 00:00:00 2001 From: Malai Raja Date: Fri, 8 Dec 2023 19:01:21 +0530 Subject: [PATCH] 08122023 --- src/assets/images/logo-nearle.png | Bin 4172 -> 1096 bytes src/assets/images/logo-nearle2.png | Bin 0 -> 4172 bytes src/assets/images/logo-nearle3.png | Bin 0 -> 3349 bytes src/assets/images/logo-nearle4.png | Bin 0 -> 1557 bytes src/assets/images/logo-nearle5.png | Bin 0 -> 1232 bytes src/assets/images/logo-nearle6.png | Bin 0 -> 1338 bytes src/assets/images/logo-nearle7.png | Bin 0 -> 1471 bytes src/assets/images/logo-nearle8.png | Bin 0 -> 1557 bytes src/assets/images/logo-nearle9.png | Bin 0 -> 1953 bytes src/assets/images/logo-sm1.png | Bin 0 -> 2177 bytes .../DrawerContent/Navigation/NavGroup.js | 5 +- .../DrawerContent/Navigation/NavItem.js | 33 +- .../MainLayout/Drawer/DrawerContent/index.js | 3 +- .../MainLayout/Drawer/DrawerHeader/index.js | 12 +- .../MainLayout/Drawer/MiniDrawerStyled.js | 7 +- src/layout/MainLayout/Drawer/index.js | 5 +- .../Header/HeaderContent/Notification.js | 30 +- .../Header/HeaderContent/Profile/index.js | 12 +- .../MainLayout/Header/HeaderContent/index.js | 21 +- src/layout/MainLayout/Header/index.js | 14 +- src/menu-items/other.js | 14 +- src/pages/nearle/clients/client.js | 2 +- src/pages/nearle/login.js | 115 +- src/pages/nearle/orders/createorder.js | 1118 +++++++---------- src/pages/nearle/orders/orders.js | 67 +- src/themes/theme/default.js | 35 +- src/themes/theme/index.js | 1 + 27 files changed, 658 insertions(+), 836 deletions(-) create mode 100644 src/assets/images/logo-nearle2.png create mode 100644 src/assets/images/logo-nearle3.png create mode 100644 src/assets/images/logo-nearle4.png create mode 100644 src/assets/images/logo-nearle5.png create mode 100644 src/assets/images/logo-nearle6.png create mode 100644 src/assets/images/logo-nearle7.png create mode 100644 src/assets/images/logo-nearle8.png create mode 100644 src/assets/images/logo-nearle9.png create mode 100644 src/assets/images/logo-sm1.png diff --git a/src/assets/images/logo-nearle.png b/src/assets/images/logo-nearle.png index 87ca867ddacc579cb57b28629ad51ac868f2393c..30e412c8307f98858bb66a1985dd67e5a259f1de 100644 GIT binary patch literal 1096 zcmV-O1h@N%P)7#RQ`7BzmHpNW56oGlCyL$|s=2M30ojgPuS+dY~j;6;N(QTTCS4 zrR9RcrH_9R5``iG@wCpoH?Q4p_q}cb<@GkZrwSp2wYR;W-QPXj z!G5Aa!w|tHh7{$Y0#c@-p&i|o5^;>Y@q z(<-1^7lk_h2^w*8W7sC-!L_ejaN}OP)5rQowN3s_Ik5A^2Wvifo zas`df2$agJ2~Smc_DOPDy+JtEx;Ry&?AR1Z)@1Cz!VY@9mA5-`+4pG z&JtVE5!ICl1s1m}a6Ggd%te@01Ckt)15UGpUx&_M$L%&)U)+S5v5(I8BXpHLdyO*uuBat4660(wfy*)g O0000VoH(UYRoRK`M#OnwY*?U7#?47l9;efm$ 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/logo-nearle7.png b/src/assets/images/logo-nearle7.png new file mode 100644 index 0000000000000000000000000000000000000000..dca29719fad5e48fde97593bffba8efb206e5111 GIT binary patch literal 1471 zcmV;w1wi_VP)+a(ihJK_@Dn#BMxzwA(*GvPDqD!%l>Xx1{yvWfSnA zf;JT|)s|g7*u+b>7u)nQ6Oy2X)=g5fNl(x3ciwy1x08AEbC;IQeBiM&Z{B?0kNM8` z$D0Mn$a zWx_Cw4agZdJVh}Kx2qz^blhLtVBcN1x_4gt0%wg!YC##0ri z^Voh))R*z+43@O<(s`8C)bwfM&rE>qz5X@#(LF^-kBeoR%ss^mVhltR>&`<47*9yv zfRyWn{ZHrw*Mdw1MaN&f_f1!@Tl@41`^>t;ZvJ*hXJJ~3Tu0NU8a7bIQ+A0h>Z&X| zR!E;t%KPdpI}Vlt@;Sw7`i z6tXPW=a;-X+K-{{3hjrF@b~E;nJ(xDQNh7e6m5w<>v%qqP-#;6cgFV;R@8IoHr>Wp_xu4xDBDSjC{ zaSWBJ1sYrkXHscn0=G1eW2abkMRR_o71l(}RHphg&Uqsub9|B@3-depJ}R|EP= zhJxJU+b==$+VbA@5e$ZJT)qWkFCX*EbEB*UJqWTYz%7LdJm#Skd=lb83ZBL_Y{~-> zla!Tfv~gL}+$SwC6;d)?y1M}SaaqtESW`Ub0$;BN^p^(o5KO8m-UK|IK%l0^vG&#CCf zCETBUK?rhnNnLRoNFgVnhYX1~o&r1>jKW)IPkC15`OzcZIk~2HKYAU0`0`ipoD^#H z_P>5vF7UT37PRQt?>Xo^yh==ye-7KZkemfE*D{2s(NWOmTB3&_UJ%u)QVEOSiej8e zaiKdTD2OeLG!}V58{~_PBZoymp9*O6jy?};Z|(RmmwYmvs7)Zz&JO9)7H#S*JCq)q ztb3lesEaB^zpQ|9jY9-NR!h0ZVIt!T=pzkvA*;o*GahF$4oim}AkUE(A$lS0Fu9B` zX4XX@g{dm%iLwW5KkL7jB~%#ATpZR>npu_&sW26moxu4RzRA$QRbLy0mq{1_-&+_r zg`SJS>vohN(RT^DQ~ZVu3dQvzr2lp^2i<{gBT2x?xVxq?ts}|Wc zI^WDJ;B!oqk*RV_*uS1hh&>rK6*psMqJJTB6QDIya^U`w3IZCGK8j)|5@rl Z@;^+Dx0@xr!t?+D002ovPDHLkV1le|z(xQ7 literal 0 HcmV?d00001 diff --git a/src/assets/images/logo-nearle8.png b/src/assets/images/logo-nearle8.png new file mode 100644 index 0000000000000000000000000000000000000000..9c5150b84f8f828e1e8242de37587cb1bff517ee GIT binary patch literal 1557 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 DYvU{r literal 0 HcmV?d00001 diff --git a/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.js b/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.js index 763fa9a..4cb2d4e 100644 --- a/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.js +++ b/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavGroup.js @@ -227,7 +227,10 @@ const NavGroup = ({ item, lastItem, remItems, lastItemId, setSelectedItems, sele item.title && drawerOpen && ( - + {item.title} {item.caption && ( diff --git a/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.js b/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.js index a662ed4..292eb6d 100644 --- a/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.js +++ b/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 ? : false; const isSelected = openItem.findIndex((id) => id === item.id) > -1; + const itemIcon = item.icon ? : 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 }) => { { 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 && diff --git a/src/layout/MainLayout/Drawer/DrawerContent/index.js b/src/layout/MainLayout/Drawer/DrawerContent/index.js index 4cbadc8..a67ce82 100644 --- a/src/layout/MainLayout/Drawer/DrawerContent/index.js +++ b/src/layout/MainLayout/Drawer/DrawerContent/index.js @@ -22,7 +22,8 @@ const DrawerContent = () => { '& .simplebar-content': { display: 'flex', flexDirection: 'column' - } + }, + }} > diff --git a/src/layout/MainLayout/Drawer/DrawerHeader/index.js b/src/layout/MainLayout/Drawer/DrawerHeader/index.js index 093873e..fab34d9 100644 --- a/src/layout/MainLayout/Drawer/DrawerHeader/index.js +++ b/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 logo1 from 'assets/images/logo-sm.png' +import logo from 'assets/images/logo-nearle9.png' +import logo1 from 'assets/images/logo-sm1.png' // ==============================|| DRAWER HEADER ||============================== // const DrawerHeader = ({ open }) => { @@ -39,12 +39,14 @@ const DrawerHeader = ({ open }) => { {(open) && logo } {(!open) && - logo + logo } ); diff --git a/src/layout/MainLayout/Drawer/MiniDrawerStyled.js b/src/layout/MainLayout/Drawer/MiniDrawerStyled.js index 5fc1efa..3b5e1d9 100644 --- a/src/layout/MainLayout/Drawer/MiniDrawerStyled.js +++ b/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) diff --git a/src/layout/MainLayout/Drawer/index.js b/src/layout/MainLayout/Drawer/index.js index bc790c4..8c19ce5 100644 --- a/src/layout/MainLayout/Drawer/index.js +++ b/src/layout/MainLayout/Drawer/index.js @@ -33,7 +33,7 @@ const MainDrawer = ({ window }) => { return ( {!matchDownMD ? ( - + {drawerHeader} {drawerContent} @@ -51,7 +51,8 @@ const MainDrawer = ({ window }) => { width: DRAWER_WIDTH, borderRight: `1px solid ${theme.palette.divider}`, backgroundImage: 'none', - boxShadow: 'inherit' + boxShadow: 'inherit', + bgcolor:'#662582' } }} > diff --git a/src/layout/MainLayout/Header/HeaderContent/Notification.js b/src/layout/MainLayout/Header/HeaderContent/Notification.js index d11234a..da0e2b1 100644 --- a/src/layout/MainLayout/Header/HeaderContent/Notification.js +++ b/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 ( - + diff --git a/src/layout/MainLayout/Header/HeaderContent/Profile/index.js b/src/layout/MainLayout/Header/HeaderContent/Profile/index.js index 06edae8..cfd1447 100644 --- a/src/layout/MainLayout/Header/HeaderContent/Profile/index.js +++ b/src/layout/MainLayout/Header/HeaderContent/Profile/index.js @@ -99,13 +99,13 @@ navigate('/login') } */} + direction='row' justifyContent='space-between' spacing={2} alignItems='center'> {/* {!matchesXs && megaMenu} */} + {localStorage.getItem('firstname') || ''} {matchesXs && } + } {matchesXs && } + ); }; diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index edd5bf4..c8fe4e9 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -43,9 +43,14 @@ const Header = () => { aria-label="open drawer" onClick={() => dispatch(openDrawer(!drawerOpen))} edge="start" - color="secondary" - variant="light" - sx={{ color: 'text.primary', bgcolor: drawerOpen ? iconBackColorOpen : iconBackColor, ml: { xs: 0, lg: -2 } }} + // color="secondary" + // variant="light" + // 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 ? : } @@ -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' } }; diff --git a/src/menu-items/other.js b/src/menu-items/other.js index c157be0..3730b2c 100644 --- a/src/menu-items/other.js +++ b/src/menu-items/other.js @@ -42,13 +42,13 @@ const other = { title: , type: 'group', children: [ - { - id: 'dashboard', - title: , - type: 'item', - url: '/dashboard', - icon: icons.DashboardOutlined - }, + // { + // id: 'dashboard', + // title: , + // type: 'item', + // url: '/dashboard', + // icon: icons.DashboardOutlined + // }, { id: 'orders', title: , diff --git a/src/pages/nearle/clients/client.js b/src/pages/nearle/clients/client.js index 55c6d34..340d3f8 100644 --- a/src/pages/nearle/clients/client.js +++ b/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 }]; diff --git a/src/pages/nearle/login.js b/src/pages/nearle/login.js index 8150936..d18e18d 100644 --- a/src/pages/nearle/login.js +++ b/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) - 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); + if (password == 'admin') { - navigate('/dashboard'); - setSubmitting(false) - } - }).catch((err) => { - console.log(err); + setSubmitting(true) + 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.tenantname); + localStorage.setItem("authname", res.data.details.authname); - // setAlertmessage('Invalid Data'); - // if(err.message == 'Network Error'){ + localStorage.setItem("appuserid", res.data.details.userid); + 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{ - // opentoast('Invalid Data'); + // }else{ + // opentoast('Invalid Data'); - // } + // } + setLoading(false) + setSubmitting(false) + console.log(err.message) + }) + } catch (err) { + console.log(err) setLoading(false) setSubmitting(false) - console.log(err.message) - }) - } catch (err) { - console.log(err) + } + }else{ + opentoast('Password is Incorrect'); setLoading(false) - setSubmitting(false) } } else { // let el2 = document.getElementById('toastid'); @@ -226,7 +233,7 @@ const Login = () => { > @@ -437,8 +444,8 @@ const Login = () => { {/* */} diff --git a/src/pages/nearle/orders/createorder.js b/src/pages/nearle/orders/createorder.js index 5c74aa5..ab127a1 100644 --- a/src/pages/nearle/orders/createorder.js +++ b/src/pages/nearle/orders/createorder.js @@ -47,6 +47,8 @@ import { // LinkOutlined } from '@mui/material'; import { useNavigate } from 'react-router'; +import CheckCircleIcon from '@mui/icons-material/CheckCircle'; + import { PopupTransition } from 'components/@extended/Transitions'; // var utc = require('dayjs/plugin/utc') @@ -150,7 +152,9 @@ const Createorder = () => { const [alertmessage, setAlertmessage] = useState(''); const [tabstatus, setTabstatus] = useState('') - const [tenantinfo, setTenantinfo] = useState({}) + const [tenantinfo, setTenantinfo] = useState({}); + const [searchword, setSearchword] = useState(''); + const [clientdetailarr, setClientdetailarr] = useState([]) useEffect(() => { @@ -161,10 +165,34 @@ const Createorder = () => { "customerid": '', "deliverytime": "", "deliverylocationid": '', + "clientname": '', + "contactno": '' }]) console.log(orderarr) } - }, [clientdetail]) + }, []) + + useEffect(() => { + if (searchword) { + // setClientdetailarr() + let arr = clientdetail.filter((val) => { + + return (val.address.toLowerCase().includes(searchword.toLowerCase()) + || val.firstname.toLowerCase().includes(searchword.toLowerCase()) + || val.contactno.toLowerCase().includes(searchword.toLowerCase()) + // || val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) + // || val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) + + ) + }) + console.log(arr) + setClientdetailarr([...arr]) + } else { + setClientdetailarr([...clientdetail]) + + } + + }, [searchword]) const fetchtenantinfo = async (tid) => { await axios.get(`${process.env.REACT_APP_URL}/tenants/gettenantinfo/?tenantid=${tid}`) @@ -192,420 +220,69 @@ const Createorder = () => { function closeAddressModal() { setOpen2(false); } - const createsubmitobj = () => { - let orderdetailtemp = [] - let orderdetailtemp1 = [] - - let orderamount1 = 0; - let ordervalue1 = 0; - let taxamount1 = 0; - let itemcount1 = 0; - let shiftcount = 0; - - let datecheck = false; - let shiftcheck = false; - let timeupcomingcheck = false; - let shiftcontactcheck = false; - - - let loweststarttime = shiftarr1[0].details[0].starttime; - - - let dateres11 = dayjs().diff(dayjs(`${dayjs(startdate).format('YYYY-MM-DD')}`), 'd'); - - - let temp = shiftarr1[shiftarr1.length - 1].details; - - console.log(temp.length, shiftarr1[shiftarr1.length - 1].orderattires.length) - - - console.log('shiftarr1') - console.log(shiftarr1) - shiftarr1.map((val3) => { - shiftcount = shiftcount + 1; - - console.log("val3"); - console.log(val3) - if (val3.clientstaff.length === 0) { - shiftcontactcheck = true; - } - val3.details.map((val1) => { - console.log('leasttime', (val1.starttime.$d > val1.endtime.$d)) - if (val1.starttime.$d < loweststarttime.$d) { - loweststarttime = val1.starttime - } - let dateres22 = dayjs().diff(dayjs(`${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val1.starttime).format('HH:mm:ss')}`), 'm'); - if (dateres22 > 0 || isNaN(dateres22)) { - timeupcomingcheck = true; - - } - console.log('timeupcomingcheck') - console.log(timeupcomingcheck, dateres22) - - console.log(val1) - let dateres = dayjs(`${dayjs(enddate).format('YYYY-MM-DD')} ${dayjs(val1.endtime).format('HH:mm:ss')}`) - .diff(dayjs(`${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val1.starttime).format('HH:mm:ss')}`), 'm'); - - - if (dateres < 240) { - datecheck = true; - } - console.log("val1") - console.log(val1) - console.log(shiftcheck) - - if (!val1.role || !val1.starttime || !val1.endtime || !val1.orderqty) { - shiftcheck = true - } - }) - - let tempobj1 = []; - let temptenantstaffobj1 = []; - let tempattire1 = []; - - val3.details.map((val) => { - - orderamount1 = orderamount1 + parseFloat(val.landingamount); - ordervalue1 = ordervalue1 + parseFloat(val.productsumprice); - taxamount1 = taxamount1 + val.taxamount; - itemcount1 = itemcount1 + val.orderqty; - console.log('val.productsumprice') - console.log(val.productsumprice) - console.log(ordervalue1) - - - - - - let tempobj = { - "orderdetailid": val.orderdetailid, - "orderheaderid": val.orderheaderid, - "tenantid": val.tenantid, - "locationid": val.locationid, - "shiftid": val3.sno, - "locationaddress": val3.address, - "locationcity": val3.city, - "locationstate": val3.state, - "locationlat": val3.latitude.toString(), - "locationlong": val3.longitude.toString(), - "productid": val.productid, - "productname": val.productname, - "productdescription": val.productdescription, - "starttime": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val.starttime).format('HH:mm:ss')}`, - "endtime": `${dayjs(enddate).format('YYYY-MM-DD')} ${dayjs(val.endtime).format('HH:mm:ss')}`, - "unpaidbreak": val.unpaidbreak, - "orderqty": val.orderqty, - "price": val.price, - "unitid": val.unitid, - "unitname": val.unitname, - "landingamount": parseFloat(parseFloat(val.landingamount.toString()).toFixed(2)), - "taxamount": parseFloat(parseFloat(val.taxamount.toString()).toFixed(2)), - "productsumprice": parseFloat(parseFloat(val.productsumprice.toString()).toFixed(2)), - "workhours": parseFloat(val.workhours), - "orderattires": [] - } - - tempobj1.push({ - "shiftid": 0, - "orderdetailid": val.orderdetailid, - "orderheaderid": val.orderheaderid, - "tenantid": clientdetail.tenantid, - "productid": val.productid, - "productname": val.productname, - "productdescription": val.productdescription, - "starttime": dayjs(`${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val.starttime).format('HH:mm:ss')}`) - .format('YYYY-MM-DD HH:mm:ss'), - "endtime": dayjs(`${dayjs(enddate).format('YYYY-MM-DD')} ${dayjs(val.endtime).format('HH:mm:ss')}`) - .format('YYYY-MM-DD HH:mm:ss'), - "workhours": `${Math.floor(val.workhours)}.${Math.floor((val.workhours * 60) - (Math.floor(val.workhours) * 60))}`, - "unpaidbreak": val.unpaidbreak, - "price": val.price, - "orderqty": val.orderqty, - "unitid": val.unitid, - "unitname": val.unitname, - "taxpercent": 0.00, - "landingamount": parseFloat(parseFloat(val.landingamount.toString()).toFixed(2)), - "taxamount": parseFloat(parseFloat(val.taxamount.toString()).toFixed(2)), - "productsumprice": parseFloat(parseFloat(val.productsumprice.toString()).toFixed(2)), - "orderattires": [] - }) - - - - console.log("val3") - - console.log(val3) - val3.orderattires.map((val2) => { - if (val.sno === val2.ordersno) { - - - tempobj.orderattires.push({ - "orderattireid": val2.orderattireid, - "orderdetailid": val2.orderdetailid, - "apptypeid": val2.apptypeid, - "attireid": val2.attireid, - "attirename": val2.attirename, - "Status": val2.Status - }) - - tempattire1.push({ - "orderattireid": val2.orderattireid, - "orderdetailid": val2.orderdetailid, - "apptypeid": val2.apptypeid, - "attireid": val2.attireid, - "attirename": val2.attirename, - "Status": val2.Status - }) - } - }) - - - - orderdetailtemp.push(tempobj) - - - - - }) - - val3.clientstaff.map((val11) => { - temptenantstaffobj1.push({ - "ordercontactid": 0, - "shiftid": 0, - "orderheaderid": 0, - "tenantid": clientdetail.tenantid, - "userid": val11.userid, - "tenantstaffid": 12, - "contactname": val11.contactname, - "contactno": val11.contactno, - "shift": val11.shift - }) - - }) - - - - - orderdetailtemp1.push({ - "shiftid": 0, - "orderheaderid": 0, - "tenantid": clientdetail.tenantid, - "locationid": 0, - "locationaddress": val3.address, - "locationcity": val3.city, - "locationstate": val3.state, - "locationlat": val3.latitude.toString(), - "locationlong": val3.longitude.toString(), - "orderdetails": tempobj1, - "ordercontacts": temptenantstaffobj1 - }) - - }) - - let addonobj = []; - orderaddonobj.map((val) => { - addonobj.push({ - "orderaddonid": val.orderaddonid, - "orderheaderid": val.orderheaderid, - "tenantid": clientdetail.tenantid, - "addonid": val.addonid, - "addon": val.addon, - "status": val.status - }) - - - - }) - - - if (!clientdetail.tenantname) { - setAlertmessage('choose client name'); - opentoast('choose client name'); - } else if (!eventname) { - setAlertmessage('choose Event name'); - opentoast('choose Event name'); - } else if (!startdate || !enddate) { - setAlertmessage('choose shift Date'); - opentoast('choose shift Date'); - } else if (datecheck) { - setAlertmessage('Shift time should be greater than 4 hours'); - opentoast('Shift time should be greater than 4 hours'); - } else if (dateres11 > 0 || timeupcomingcheck) { - setAlertmessage('choose upcoming date and time'); - opentoast('choose upcoming date and time'); - } else if (shiftarr1.length <= 0) { - setAlertmessage('Add shift'); - opentoast('Add shift'); - } - else if (shiftcheck) { - setAlertmessage('choose all shift details'); - opentoast('choose all shift details'); - } - else if (shiftcontactcheck) { - opentoast('choose shift contacts'); - } - else { - - - - let obj = - { - "orderheaderid": 0, - "tenantid": clientdetail.tenantid, - "locationid": 0, - "customerid": 0, - "configid": 4, - "orderid": "", - "orderdate": dayjs() - .format('YYYY-MM-DD HH:mm:ss'), - "orderstatus": "pending", - "pending": dayjs() - .format('YYYY-MM-DD HH:mm:ss'), - - "orderamount": parseFloat(parseFloat(orderamount1).toFixed(2)), - "taxpercent": 0.0, - "taxamount": parseFloat(parseFloat(taxamount1).toFixed(2)), - "ordercharges": 0, - "ordervalue": parseFloat(parseFloat(ordervalue1).toFixed(2)), - "itemcount": itemcount1, - "refundvalue": 0, - "unserviceableitems": 0, - "paymenttype": 0, - "paymentstatus": 0, - "startdate": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(startdate).format('HH:mm:ss')}`, - "enddate": `${dayjs(enddate).format('YYYY-MM-DD')} ${dayjs(enddate).format('HH:mm:ss')}`, - "deliveryaddress": "", - "deliverylocationid": 0, - "deliverylat": "", - "deliverylong": "", - "ordernotes": eventname, - "remarks": otherinstructions, - "primarycontact": '', - "primarycontactno": '', - "seccontact": '', - "seccontactno": '', - "tenantuserid": clientdetail.tenantid, - "orderdetails": orderdetailtemp, - "orderaddons": addonobj - } - console.log(obj) - - - - let obj1 = { - - "orderheaderid": 0, - "tenantid": clientdetail.tenantid, - "locationid": 0, - "customerid": 0, - "configid": 4, - "orderid": "", - "orderdate": dayjs() - .format('YYYY-MM-DD HH:mm:ss'), - "orderstatus": "pending", - "pending": dayjs() - .format('YYYY-MM-DD HH:mm:ss'), - "orderamount": parseFloat(parseFloat(orderamount1).toFixed(2)), - "taxpercent": 0.0, - "taxamount": parseFloat(parseFloat(taxamount1).toFixed(2)), - "ordercharges": 0, - "ordervalue": parseFloat(parseFloat(ordervalue1).toFixed(2)), - "itemcount": shiftcount, - "startdate": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(loweststarttime.$d).format('HH:mm:ss')}`, - "enddate": `${dayjs(enddate).format('YYYY-MM-DD')} ${dayjs(enddate).format('HH:mm:ss')}`, - "ordernotes": eventname, - "remarks": otherinstructions, - "primarycontact": '', - "primarycontactno": '', - "seccontact": '', - "seccontactno": '', - "tenantuserid": 0, - "ordershifts": orderdetailtemp1, - "orderaddons": addonobj - } - console.log("obj1,orderdetailtemp1") - console.log(obj1, orderdetailtemp1) - - - - - - - navigate('/orders/create/review', { - state: { - obj: obj, client: clientdetail, - obj1: obj1 - - } - }) - - } - - } - const createsubmitobj1 = () => { - let arr=[] - let timecheck=false; - let addresscheck=false; - orderarr.map((val)=>{ - if(!val.address){ - addresscheck=true; - } + let arr = [] + let timecheck = false; + let addresscheck = false; + orderarr.map((val) => { + if (!val.address) { + addresscheck = true; + } - if(!val.deliverytime){ - timecheck=true; - } + if (!val.deliverytime) { + timecheck = true; + } arr.push({ "orderheaderid": 0, - "tenantid": parseInt(localStorage.getItem('tenantid')), - "locationid": 784, - "moduleid": 6, - "configid": 5, - "orderid": "", - "customerid": 1332, - "orderdate": dayjs().format('YYYY-MM-DD HH:mm:ss'), - "orderstatus": "created", - "pending": "", - "processing": "", - "ready": "", - "delivered": "", - "cancellled": "", - "promoid": 0, - "promoname": "", - "promoterms": "", - "promovalue": 0, - "promoamount": 0, - "orderamount": 48, - "taxamount": 0, - "ordercharges": 0, - "ordervalue": 48, - "itemcount": 1, - "paymenttype": 64, - "paymentstatus": 2, - "deliverycharge":34.6, - "deliverytime": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val.deliverytime).format('HH:mm:ss')}`, - "deliverylocationid": 1597, - "delivceryaddress": val.address, - "pickupaddress": "3rd Cross Rd, Jeeva Nagar, Kuppakonam Pudur, K K Pudur, Coimbatore, Tamil Nadu 641038", - "pickuplat": "11.033176", - "pickuplong": "76.946232", - "ordernotes":otherinstructions, - "remarks": "", - "tenantuserid": 0 + "tenantid": parseInt(localStorage.getItem('tenantid')), + "locationid": tenantinfo.locationid, + "moduleid": tenantinfo.moduleid, + "configid": 7, + "orderid": "", + "customerid": val.customerid, // + "orderdate": dayjs().format('YYYY-MM-DD HH:mm:ss'), + "orderstatus": "created", + "pending": "", + "processing": "", + "ready": "", + "delivered": "", + "cancellled": "", + "promoid": 0, + "promoname": "", + "promoterms": "", + "promovalue": 0, + "promoamount": 0, + "orderamount": 0, + "taxamount": 0, + "ordercharges": 0, + "ordervalue": 0, + "itemcount": 1, + "paymenttype": 64, + "paymentstatus": 0, + "deliverycharge": 0, + "deliverytime": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val.deliverytime.$d).format('HH:mm:ss')}`, + "deliverylocationid": val.deliverylocationid, // + "delivceryaddress": val.address, + "pickupaddress": tenantinfo.address, + "pickuplat": tenantinfo.latitude, + "pickuplong": tenantinfo.longitude, + "ordernotes": otherinstructions, + "remarks": "", + "tenantuserid": parseInt(localStorage.getItem('tenantid')) }) }) - if(timecheck){ + if (timecheck) { opentoast('Choose Schedule Time') - }else if(addresscheck){ + } else if (addresscheck) { opentoast('Choose Client') - }else{ + } else { opentoast('success') } @@ -697,28 +374,28 @@ const Createorder = () => { const clientdetails = async (tid) => { - // setClientdetail([{ - // "address": 'ttt uuu vvvv', - // "customerid":10, - // "deliverylocationid": 20, - // "contactno":4444, - // "firstname":'test1', - // }, - // { - // "address": '2ttt uuu vvvv', - // "customerid":11, - // "deliverylocationid": 21, - // "contactno":5555, - // "firstname":'test2', - // }, - // { - // "address": '3ttt uuu vvvv', - // "customerid":12, - // "deliverylocationid": 22, - // "contactno":6666, - // "firstname":'test3', - // } - // ]) + // setClientdetail([{ + // "address": 'ttt uuu vvvv', + // "customerid":10, + // "deliverylocationid": 20, + // "contactno":4444, + // "firstname":'test1', + // }, + // { + // "address": '2ttt uuu vvvv', + // "customerid":11, + // "deliverylocationid": 21, + // "contactno":5555, + // "firstname":'test2', + // }, + // { + // "address": '3ttt uuu vvvv', + // "customerid":12, + // "deliverylocationid": 22, + // "contactno":6666, + // "firstname":'test3', + // } + // ]) setLoading2(true) try { @@ -728,7 +405,9 @@ const Createorder = () => { if (res.data.status) { setClientdetail(res.data.details) - + if (!searchword) { + setClientdetailarr(res.data.details) + } } setLoading2(false) @@ -785,7 +464,9 @@ const Createorder = () => { address: '', "customerid": '', "deliverytime": "", - "deliverylocationid": '' + "deliverylocationid": '', + "clientname": '', + "contactno": '' }]) }}>Single @@ -850,7 +533,7 @@ const Createorder = () => { - {' '}{tenantinfo.address1 || ''} + {' '}{tenantinfo.address || ''} {/* {'123, Tamil Kudimagan Nagar Rd, Vadakkuppattu, Kulattur, Chennai, Tamil Nadu 600117, India'} */} @@ -906,26 +589,26 @@ const Createorder = () => { - - + + - + - {/* Shift {result.sno} */} + {/* Shift {result.sno} */} - + - {/* */} - - + + - + - {/* + {/* { /> */} - + - - {/* + + {/* @@ -1020,58 +703,58 @@ const Createorder = () => { */} - - - - + }} color="success" startIcon={}>ADD Clients + + - - - - Select Address - {/* */} + + + + + {(loading2) ? + + <> + + - - - - {(loading2) ? - - <> - - - - - : - <> + + : + <> - {/* + { }} placeholder="Search" fullWidth + onChange={(e) => { + setSearchword(e.target.value) + }} - /> - */} - - {/*
*/} + + + {/*
*/} - {clientdetail.map((address) => ( - handlerAddress(address)} - onClick={() => { - if (tabstatus == 1) { - if (orderarr[0].address == '') { + {clientdetailarr.map((address) => ( + handlerAddress(address)} + onClick={() => { + if (tabstatus == 1) { + if (orderarr[0].address == '') { + setOrderarr([{ + sno: 1, + address: address.address, + "customerid": '', + "deliverytime": "", + "deliverylocationid": '', + "clientname": address.firstname, + "contactno": address.contactno + }]) + } else { + if (orderarr.find((val2) => val2.address == address.address)) { + if (orderarr.length > 1) { + let arr = orderarr; + arr.splice(address.sno - 1, 1); + let arr1 = [] + arr.map((val2, k) => { + arr1.push({ + sno: k + 1, + 'address': val2.address, + "customerid": val2.customerid, + "deliverytime": val2.deliverytime, + "deliverylocationid": val2.deliverylocationid, + "clientname": val2.clientname, + "contactno": val2.contactno + }) + }) + setOrderarr([...arr1]) + } else { setOrderarr([{ sno: 1, - address: address.address, + address: '', "customerid": '', "deliverytime": "", "deliverylocationid": '', + "clientname": '', + "contactno": '' }]) - } else { - if (orderarr.find((val2) => val2.address == address.address)) { - if (orderarr.length > 1) { - let arr = orderarr; - arr.splice(address.sno - 1, 1); - let arr1 = [] - arr.map((val2, k) => { - arr1.push({ - sno: k + 1, - 'address': val2.address - }) - }) - setOrderarr([...arr1]) - } else { - setOrderarr([{ - sno: 1, - address: '', - "customerid": '', - "deliverytime": "", - "deliverylocationid": '', - }]) - } - } else { - console.log(clientdetail) - let arr = orderarr; - arr.push({ - sno: arr.length + 1, - 'address': address.address, - "customerid": '', - "deliverytime": "", - "deliverylocationid": '', - }) - setOrderarr([...arr]) - } - } - - } - - if (tabstatus == 0) { - setOrderarr([{ - sno: 1, - address: address.address, - "customerid": '', + } else { + console.log(clientdetail) + let arr = orderarr; + arr.push({ + sno: arr.length + 1, + 'address': address.address, + "customerid": address.customerid, "deliverytime": "", - "deliverylocationid": '', - }]) + "deliverylocationid": address.deliverylocationid, + "clientname":address.firstname, + "contactno": address.contactno + }) + setOrderarr([...arr]) } - }} - key={address.contactno} - sx={{ - width: '100%', - border: '1px solid', - borderColor: 'grey.200', - borderRadius: 1, - cursor: 'pointer', - p: 1.25, - '&:hover': { - bgcolor: theme.palette.primary.lighter, - borderColor: theme.palette.primary.lighter - }, - bgcolor: (orderarr.find((val2) => val2.address == address.address)) ? theme.palette.primary.lighter : '' - }} - > - - {address.firstname} - - - - {address.address} - - - {address.contactno} - - - {/* {address.email} */} - - - - ))} + } + + } + + if (tabstatus == 0) { + setOrderarr([{ + sno: 1, + address: address.address, + "customerid": address.customerid, + "deliverytime": "", + "deliverylocationid": address.deliverylocationid, + "clientname":address.firstname, + "contactno": address.contactno + }]) + + // console.log({ + // sno: 1, + // address: address.address, + // "customerid": address.customerid, + // "deliverytime": "", + // "deliverylocationid": address.deliverylocationid, + // }) + } + + }} + key={address.contactno} + sx={{ + width: '100%', + border: '1px solid', + borderColor: 'grey.200', + borderRadius: 1, + cursor: 'pointer', + p: 1.25, + '&:hover': { + bgcolor: theme.palette.primary.lighter, + borderColor: theme.palette.primary.lighter + }, + bgcolor: (orderarr.find((val2) => val2.address == address.address)) ? '#e1bee7' : '' + }} + > + + + {address.firstname} + + {(orderarr.find((val2) => val2.address == address.address)) && + + } + + + + + {address.address} + + + {address.contactno} + + + {/* {address.email} */} + + + + ))} + + + } + + + + + + +
+ + + + + + + + + + # + {/* Role */} + Client + Schedule Time + {/* End Time */} + {/* Pickup Location */} + {/* Break */} + Drop Location + {/* Value */} + Action + + + + + + {orderarr.map((val) => { + return <> + + + + {val.sno} + + + + + + + {val.clientname} + + + + { val.contactno} + - - } - - - - - - - - + + - + + + { + console.log(e) + if (e.$d) { - -
- - - # - {/* Role */} - {/* Count */} - Schedule Time - {/* End Time */} - {/* Pickup Location */} - {/* Break */} - Drop Location - {/* Value */} - Action - - - - - - {orderarr.map((val) => { - return <> - - - - {val.sno} - - - { - console.log(e) - - let arr=orderarr; - arr[val.sno-1].deliverytime=e.$d - setOrderarr([...arr]) - console.log(arr) - // let arr = shiftarr1; - // let dateres11 = dayjs().diff(dayjs(`${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(e).format('HH:mm:ss')}`), 'm'); - // console.log('dateres11') - // console.log(dateres11) - // if (dateres11 < 0) { + let arr = orderarr; + arr[val.sno - 1].deliverytime = e + setOrderarr([...arr]) + console.log(arr) + } + // let arr = shiftarr1; + // let dateres11 = dayjs().diff(dayjs(`${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(e).format('HH:mm:ss')}`), 'm'); + // console.log('dateres11') + // console.log(dateres11) + // if (dateres11 < 0) { - // arr[result.sno - 1].details[val.sno - 1].starttime = dayjs(e.$d); + // arr[result.sno - 1].details[val.sno - 1].starttime = dayjs(e.$d); - // arr[result.sno - 1].details[val.sno - 1].endtime = dayjs(dayjs(e.$d).add(4, 'hours').$d); + // arr[result.sno - 1].details[val.sno - 1].endtime = dayjs(dayjs(e.$d).add(4, 'hours').$d); - // } + // } @@ -1273,19 +1012,21 @@ const Createorder = () => { - } - } + } + } - sx={{ width: '150px' }} - value={val.deliverytime || null} + sx={{ width: '150px' }} + value={val.deliverytime || null} - /> - - {val.address} + /> + + + + {val.address} - {/* + {/* {(val.cost) && <> {`${val.cost}/hr`} @@ -1295,7 +1036,7 @@ const Createorder = () => { */} - {/* {(val.role && val.position) && + {/* {(val.role && val.position) && <> {val.landingamount} @@ -1305,55 +1046,54 @@ const Createorder = () => { } */} - + - - - + // arr[val.sno-1] + }}> + - + - - - - - }) - } + + + }) - -
- - {/* + } + + + + + {/* */} - + - + - {/* + {/* }) */} {/* } */} diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index 6fcf91b..ccbf3fa 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -504,7 +504,7 @@ import { - {row.firstname} + {row.customername} {/* {row.identification}*/} @@ -539,7 +539,7 @@ import { - {row.delivceryaddress.slice(0,20)} + {row.deliveryaddress.slice(0,20)} @@ -570,7 +570,7 @@ import { } {(row.orderstatus === 'ready') && - + } {(row.orderstatus === 'confirmed') && @@ -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()); - setAssigned(res.data.details.assigned.toString()); - // setConfirmed(res.data.details.confirmed.toString()); - // setModified(res.data.details.modified.toString()); + // setActiveorders(res.data.details.assigned.toString()); + setAssigned(res.data.details.accepted.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} /> - : assigned} percentage={percentage2.toString()} color={theme.palette.info.main} /> @@ -1917,7 +1914,7 @@ import { icon={} iconPosition="end" /> - } iconPosition="end" /> diff --git a/src/themes/theme/default.js b/src/themes/theme/default.js index cd944aa..655a567 100644 --- a/src/themes/theme/default.js +++ b/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], - 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], + lighter: purple[0], + 100: purple[1], + 200: purple[2], + light: purple[3], + 400: purple[4], + main: '#662582', + dark: purple[6], + 700: purple[7], + darker: purple[8], + 900: purple[9], contrastText }, secondary: { diff --git a/src/themes/theme/index.js b/src/themes/theme/index.js index 0a5ea72..961f509 100644 --- a/src/themes/theme/index.js +++ b/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); } };