diff --git a/nearlexpressbuild b/nearlexpressbuild index c178408..7af3112 160000 --- a/nearlexpressbuild +++ b/nearlexpressbuild @@ -1 +1 @@ -Subproject commit c178408d139a244d63b6414235b538b1582acd39 +Subproject commit 7af311220edb54480cdd5bb19465df348e0aec9b diff --git a/src/layout/MainLayout/Drawer/MiniDrawerStyled.js b/src/layout/MainLayout/Drawer/MiniDrawerStyled.js index 3b5e1d9..ec2de91 100644 --- a/src/layout/MainLayout/Drawer/MiniDrawerStyled.js +++ b/src/layout/MainLayout/Drawer/MiniDrawerStyled.js @@ -7,7 +7,8 @@ import { DRAWER_WIDTH, ThemeMode } from 'config'; const openedMixin = (theme) => ({ width: DRAWER_WIDTH, - borderRight: `1px solid ${theme.palette.divider}`, + // borderRight: `1px solid ${theme.palette.divider}`, + borderRight: 'none', transition: theme.transitions.create('width', { easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.enteringScreen @@ -22,7 +23,7 @@ const closedMixin = (theme) => ({ easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.leavingScreen }), - overflowX: 'hidden', + // overflowX: 'hidden', width: theme.spacing(7.5), borderRight: 'none', boxShadow: theme.customShadows.z1, @@ -36,7 +37,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 8c19ce5..18e1d55 100644 --- a/src/layout/MainLayout/Drawer/index.js +++ b/src/layout/MainLayout/Drawer/index.js @@ -33,8 +33,11 @@ const MainDrawer = ({ window }) => { return ( {!matchDownMD ? ( - - {drawerHeader} + + {drawerHeader} {drawerContent} ) : ( diff --git a/src/layout/MainLayout/Header/HeaderContent/MobileSection.js b/src/layout/MainLayout/Header/HeaderContent/MobileSection.js index 8d002d8..a2f7fc7 100644 --- a/src/layout/MainLayout/Header/HeaderContent/MobileSection.js +++ b/src/layout/MainLayout/Header/HeaderContent/MobileSection.js @@ -50,7 +50,12 @@ const MobileSection = () => { <> { return ( + { + + + - + + {/* */} - {!matchesXs && } - {matchesXs && } + {/* {!matchesXs && } + {matchesXs && } */} + + + + diff --git a/src/pages/nearle/orders/createorder.js b/src/pages/nearle/orders/createorder.js index 4ec7e17..9a8050f 100644 --- a/src/pages/nearle/orders/createorder.js +++ b/src/pages/nearle/orders/createorder.js @@ -142,7 +142,7 @@ const Createorder = () => { const [stafflist, setStafflist] = useState([]); const [loading2, setLoading2] = useState(false); - const [loading,setLoading]=useState(false) + const [loading, setLoading] = useState(false) const [shiftarr, setShiftarr] = useState([]); @@ -167,7 +167,9 @@ const Createorder = () => { "deliverytime": dayjs(), "deliverylocationid": '', "clientname": '', - "contactno": '' + "contactno": '', + "latitude": '', + "longitude": '' }]) // console.log(dayjs()) } @@ -227,7 +229,7 @@ const Createorder = () => { - const createsubmitobj1 = async() => { + const createsubmitobj1 = async () => { let arr = [] let timecheck = false; let addresscheck = false; @@ -247,7 +249,7 @@ const Createorder = () => { "moduleid": tenantinfo.moduleid, "configid": 7, "orderid": "", - "customerid": val.customerid, + "customerid": val.customerid, "orderdate": dayjs().format('YYYY-MM-DD HH:mm:ss'), "orderstatus": "created", "pending": "", @@ -269,7 +271,7 @@ const Createorder = () => { "paymentstatus": 0, "deliverycharge": 0, "deliverytime": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val.deliverytime.$d).format('HH:mm:ss')}`, - "deliverylocationid": val.deliverylocationid, // + "deliverylocationid": val.deliverylocationid, "deliveryaddress": val.address, "pickupaddress": tenantinfo.address, "pickuplat": tenantinfo.latitude, @@ -277,9 +279,12 @@ const Createorder = () => { "ordernotes": otherinstructions, "remarks": "", "tenantuserid": parseInt(localStorage.getItem('tenantid')), - "categoryid":tenantinfo.categoryid, - "subcategoryid":tenantinfo.subcategoryid, - "partnerid":tenantinfo.partnerid + "categoryid": tenantinfo.categoryid, + "subcategoryid": tenantinfo.subcategoryid, + "partnerid": tenantinfo.partnerid, + "deliverylat":val.latitude, + "deliverylong":val.longitude + }) }) @@ -291,26 +296,26 @@ const Createorder = () => { } else { setLoading(true) - await axios.post(`${process.env.REACT_APP_URL}/orders/createorders`,arr) - .then((res) => { - if (res.data.status) { - enqueueSnackbar('Order Created Successfully', { - variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' }, - autoHideDuration: 2000 - }) - navigate('/orders') - }else{ - opentoast(res.data.message) - } - setLoading(false) - console.log(res) + await axios.post(`${process.env.REACT_APP_URL}/orders/createorders`, arr) + .then((res) => { + if (res.data.status) { + enqueueSnackbar('Order Created Successfully', { + variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' }, + autoHideDuration: 2000 + }) + navigate('/orders') + } else { + opentoast(res.data.message) + } + setLoading(false) + console.log(res) - }).catch((err) => { - console.log(err) - opentoast(err.data.message) - setLoading(false) + }).catch((err) => { + console.log(err) + opentoast(err.data.message) + setLoading(false) - }) + }) // opentoast('success') } @@ -461,11 +466,11 @@ const Createorder = () => { return <> - {(loading) && + {(loading) && - + - } + } { sno: 1, address: '', "customerid": '', - "deliverytime":dayjs(), + "deliverytime": dayjs(), "deliverylocationid": '', "clientname": '', - "contactno": '' + "contactno": '', + "latitude": '', + "longitude": '' }]) }}>Single @@ -822,7 +831,9 @@ const Createorder = () => { "deliverytime": dayjs(), "deliverylocationid": address.deliverylocationid, "clientname": address.firstname, - "contactno": address.contactno + "contactno": address.contactno, + "latitude": address.latitude, + "longitude": address.longitude }]) } else { if (orderarr.find((val2) => val2.customerid == address.customerid)) { @@ -839,7 +850,9 @@ const Createorder = () => { "deliverytime": val2.deliverytime, "deliverylocationid": val2.deliverylocationid, "clientname": val2.clientname, - "contactno": val2.contactno + "contactno": val2.contactno, + "latitude": val2.latitude, + "longitude": val2.longitude }) }) setOrderarr([...arr1]) @@ -851,7 +864,9 @@ const Createorder = () => { "deliverytime": dayjs(), "deliverylocationid": '', "clientname": '', - "contactno": '' + "contactno": '', + "latitude": '', + "longitude": '' }]) } } else { @@ -863,8 +878,10 @@ const Createorder = () => { "customerid": address.customerid, "deliverytime": dayjs(), "deliverylocationid": address.deliverylocationid, - "clientname":address.firstname, - "contactno": address.contactno + "clientname": address.firstname, + "contactno": address.contactno, + "latitude": address.latitude, + "longitude": address.longitude }) setOrderarr([...arr]) } @@ -880,8 +897,10 @@ const Createorder = () => { "customerid": address.customerid, "deliverytime": dayjs(), "deliverylocationid": address.deliverylocationid, - "clientname":address.firstname, - "contactno": address.contactno + "clientname": address.firstname, + "contactno": address.contactno, + "latitude": address.latitude, + "longitude": address.longitude }]) // console.log({ @@ -905,7 +924,7 @@ const Createorder = () => { '&:hover': { // bgcolor: theme.palette.primary.lighter, // borderColor: theme.palette.primary.lighter - bgcolor:(orderarr.find((val2) => val2.customerid == address.customerid)) ? '#e1bee7' : '' + bgcolor: (orderarr.find((val2) => val2.customerid == address.customerid)) ? '#e1bee7' : '' }, bgcolor: (orderarr.find((val2) => val2.customerid == address.customerid)) ? '#e1bee7' : '' }} @@ -1004,8 +1023,8 @@ const Createorder = () => { {val.clientname} - - { val.contactno} + + {val.contactno} diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index 8aa872b..e28c7e0 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -1,6 +1,9 @@ // import React from 'react'; // import Createstaff from 'pages/createstaff' import { enqueueSnackbar } from 'notistack'; +import { DeleteFilled, NotificationOutlined } from '@ant-design/icons'; + + import { useState, useEffect, @@ -64,7 +67,8 @@ import { import { SearchOutlined, EnvironmentOutlined, UserOutlined, - // MoreOutlined + // MoreOutlined , + CloseOutlined } from '@ant-design/icons'; import { PopupTransition } from 'components/@extended/Transitions'; @@ -224,11 +228,11 @@ import { disablePadding: false, label: 'STATUS', }, - // { - // id: 'action', - // disablePadding: false, - // label: 'ACTION', - // } + { + id: 'action', + disablePadding: false, + label: 'ACTION', + } ]; @@ -294,6 +298,53 @@ import { const [dialogopen, setDialogopen] = useState(false); const [stafflist, setStafflist] = useState([]) const [loading1, setLoading1] = useState(false) + const [open,setOpen]=useState(false); + 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') + + + + }) + .then((res) => { + console.log(res) + if (res.data.status) { + // if (orderheaderid && tenantid) { + // fetchorderdetails(); + // fetchorderaddons(); + // fetchorderattires(); + // } + enqueueSnackbar('Order Cancelled Successfully', { + variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' }, + autoHideDuration: 2000 + }) + handleClose(true); + + if (localStorage.getItem('tenantid')) { + setTenantid(localStorage.getItem('tenantid')) + let val = localStorage.getItem('tenantid') + + fetchtable(val); + fetchpercentage(val); + fetchtableuncovered(val); + fetchtablecovered(val); + fetchtablecancelled(val); + fetchtableassigned(val); + fetchtablepicked(val); + fetchtablecreated(val); + } + } + + }).catch((err) => { + console.log(err) + }) + + } const fetchstafflist = async (odid) => { @@ -370,11 +421,74 @@ import { ), [order, orderBy, page, rowsPerPage], ); + + const handleClose = () => { + setOpen(false); + setOrderheaderid('') + }; + + function AlertCustomerDelete({ + // title, + open, handleClose }) { + // const [deletepassword, setDeletepassword] = useState(''); + + return ( + handleClose(false)} + // keepMounted + // TransitionComponent={PopupTransition} + maxWidth="xs" + // aria-labelledby="column-delete-title" + // aria-describedby="column-delete-description" + > + + + + + + {/* + + */} + + + Are you sure you want to cancel this order? + + + {/* + Please type in the order number to confirm. + */} + + + + + + + + + + + + + ); + } return ( + @@ -517,9 +631,14 @@ import { {row.orderid} - {dayjs(row.deliverydate).utc().format('MM/DD/YYYY hh:mm A')} + {dayjs(row.deliverydate).utc().format('MM/DD/YYYY')} + + + {dayjs(row.deliverydate).utc().format('hh:mm A')} - @@ -648,25 +767,39 @@ import { - - {/* + + + {(row.orderstatus == 'created')&& + + <> + + { e.stopPropagation(); - - navigate(`/details`, { - state: { - orderheaderid: row.orderheaderid, - tenantid: row.tenantid - } - }) + setOrderheaderid(row.orderheaderid) + setOpen(true) + // navigate(`/details`, { + // state: { + // orderheaderid: row.orderheaderid, + // tenantid: row.tenantid + // } + // }) }}> - + {/* */} + - - */} + + +} + @@ -1085,10 +1218,10 @@ import { const [completed, setCompleted] = useState(''); const [closed, setClosed] = useState(''); const [picked,setPicked] = useState('') + const [created,setCreated]=useState('') - - const [tabstatus, setTabstatus] = useState('All Orders'); + const [tabstatus, setTabstatus] = useState('Created'); const [loading, setLoading] = useState(true) const theme = useTheme(); let [rows, setRows] = useState([]) @@ -1109,8 +1242,8 @@ import { setTabvalue(i); - if (i === 0) setTabstatus('All orders') - // if (i === 1) setTabstatus('Created') + // if (i === 0) setTabstatus('All orders') + if (i === 0) setTabstatus('Created') // if (i === 2) setTabstatus('Modified') if (i === 1) setTabstatus('Pending') @@ -1195,11 +1328,11 @@ import { // if (tabstatus === 'Cancelled') setRows(orderarrcancelled) // if (tabstatus === 'Assigned') setRows(orderarrassigned) // if (tabstatus === 'Confirmed') setRows(orderarrconfirmed) - // if (tabstatus === 'Modified') setRows(orderarrmodified) + if (tabstatus === 'Created') setRows(orderarrcreated) if (tabstatus === 'All orders') setRows(orderarr) if (tabstatus === 'Delivered') setRows(orderarrcovered) - if (tabstatus === 'Pending') setRows(orderarrcreated) + if (tabstatus === 'Pending') setRows(orderarruncovered) // if (tabstatus === 'Active') setRows(orderarractive) // if (tabstatus === 'Pending') setRows(orderarruncovered) @@ -1256,9 +1389,10 @@ import { return (val.orderid.toLowerCase().includes(searchword.toLowerCase()) || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) - // || val.tenantname.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.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) ) }) @@ -1277,6 +1411,8 @@ import { || 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()) ) }) @@ -1292,9 +1428,10 @@ import { return (val.orderid.toLowerCase().includes(searchword.toLowerCase()) || val.eventname.toLowerCase().includes(searchword.toLowerCase()) - || val.tenantname.toLowerCase().includes(searchword.toLowerCase()) + || val.customername.toLowerCase().includes(searchword.toLowerCase()) || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) + || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) ) }) @@ -1306,19 +1443,21 @@ import { } else if (tabstatus === 'Pending') { if (searchword) { - let arr = orderarruncovered.filter((val) => { + 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()) + || val.customername.toLowerCase().includes(searchword.toLowerCase()) + || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) ) }) console.log(arr) setRows([...arr]) } else { - setRows([...orderarruncovered]) + setRows([...orderarrcreated]) } } else if (tabstatus === 'Cancelled') { @@ -1327,9 +1466,10 @@ import { return (val.orderid.toLowerCase().includes(searchword.toLowerCase()) || val.eventname.toLowerCase().includes(searchword.toLowerCase()) - || val.tenantname.toLowerCase().includes(searchword.toLowerCase()) + || val.customername.toLowerCase().includes(searchword.toLowerCase()) || val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) || val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) + || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase()) ) }) @@ -1347,6 +1487,8 @@ import { || 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()) ) }) @@ -1364,6 +1506,8 @@ import { || 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()) ) }) @@ -1383,6 +1527,7 @@ import { || 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()) ) }) @@ -1402,6 +1547,7 @@ import { || 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()) ) }) @@ -1416,6 +1562,8 @@ import { || 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()) ) }) @@ -1501,6 +1649,9 @@ import { arr = [...arr, { ...val, sno: i + 1 }]; }) setArrcreated(arr) + if(tabstatus == 'Created'){ + setRows(arr) + } // } }).catch((err) => { console.log(err) @@ -1729,7 +1880,7 @@ import { setUncoveredorders(res.data.details.pending.toString()) // setActiveorders(res.data.details.assigned.toString()); setAssigned(res.data.details.accepted.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.pending/ res.data.details.total) * 100) || 0).toString()) @@ -1935,14 +2086,14 @@ import { }}> - } - /> - {/* } - iconPosition="end" /> */} + } + iconPosition="end" + /> } iconPosition="end" @@ -2026,7 +2177,7 @@ import { - + {/* Select Filter Options @@ -2116,7 +2267,7 @@ import { - + */}