orders page
This commit is contained in:
@@ -811,11 +811,17 @@ const MultipleOrders = () => {
|
||||
))}
|
||||
{dropCust.length != 0 && (
|
||||
<TableRow>
|
||||
<TableCell>Total</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="h5">Total</Typography>
|
||||
</TableCell>
|
||||
<TableCell></TableCell>
|
||||
<TableCell></TableCell>
|
||||
<TableCell>{totaldist}</TableCell>
|
||||
<TableCell align="right">{`₹${totalAmt}.00`}</TableCell>
|
||||
<TableCell>
|
||||
<Typography variant="h5">{`${totaldist} `}</Typography>
|
||||
</TableCell>
|
||||
<TableCell align="right">
|
||||
<Typography variant="h5"> {`₹${totalAmt}.00`}</Typography>
|
||||
</TableCell>
|
||||
<TableCell></TableCell>
|
||||
</TableRow>
|
||||
)}
|
||||
@@ -1127,11 +1133,11 @@ const MultipleOrders = () => {
|
||||
<Divider />
|
||||
<DialogActions sx={{ p: 2.5 }}>
|
||||
<Button
|
||||
color="error"
|
||||
color={dropCust.length !== 0 ? 'primary' : 'error'}
|
||||
variant="outlined"
|
||||
sx={{
|
||||
'&:hover': {
|
||||
bgcolor: 'red',
|
||||
bgcolor: dropCust.length !== 0 ? theme.palette.primary.main : theme.palette.error.main,
|
||||
color: 'white'
|
||||
}
|
||||
}}
|
||||
@@ -1139,7 +1145,7 @@ const MultipleOrders = () => {
|
||||
setIsCustomerOpen(false);
|
||||
}}
|
||||
>
|
||||
Close
|
||||
{dropCust.length !== 0 ? 'Continue' : 'Close'}
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
|
||||
@@ -10,34 +10,23 @@ var utc = require('dayjs/plugin/utc');
|
||||
dayjs.extend(utc);
|
||||
import axios from 'axios';
|
||||
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
|
||||
// import { DataGrid } from '@mui/x-data-grid'
|
||||
// material-ui
|
||||
import HoverSocialCard from 'components/cards/statistics/HoverSocialCard';
|
||||
// import {FacebookOutlined} from '@ant-design/icons';
|
||||
import { useTheme } from '@mui/material/styles';
|
||||
// import { edittabstatus1 } from 'store/reducers/dashboard1';
|
||||
import {
|
||||
Avatar,
|
||||
// AvatarGroup,
|
||||
// Button as Button1,
|
||||
Box,
|
||||
// DateRangePicker,
|
||||
Button,
|
||||
Grid,
|
||||
Tabs,
|
||||
Tab,
|
||||
IconButton,
|
||||
Stack,
|
||||
// TextField,
|
||||
Chip,
|
||||
// TableSortLabel,
|
||||
Typography,
|
||||
// Divider,
|
||||
Table,
|
||||
TableCell,
|
||||
TableBody,
|
||||
TableHead,
|
||||
// TableSortLabel,
|
||||
Collapse,
|
||||
Dialog,
|
||||
TableRow,
|
||||
@@ -52,23 +41,9 @@ import {
|
||||
DialogActions
|
||||
} from '@mui/material';
|
||||
import MainCard from 'components/MainCard';
|
||||
|
||||
import { SearchOutlined, CloseOutlined } from '@ant-design/icons';
|
||||
import ClearIcon from '@mui/icons-material/Clear';
|
||||
|
||||
import {
|
||||
addDays,
|
||||
addMonths,
|
||||
addWeeks,
|
||||
// addYears,
|
||||
endOfMonth,
|
||||
endOfWeek,
|
||||
// endOfYear,
|
||||
startOfMonth,
|
||||
startOfWeek
|
||||
// startOfYear,
|
||||
} from 'date-fns';
|
||||
|
||||
import { addDays, addMonths, addWeeks, endOfMonth, endOfWeek, startOfMonth, startOfWeek } from 'date-fns';
|
||||
import { DateRangePicker } from 'mui-daterange-picker';
|
||||
import { useNavigate } from 'react-router';
|
||||
import PropTypes from 'prop-types';
|
||||
@@ -93,7 +68,6 @@ const Orders = () => {
|
||||
function getComparator(order, orderBy) {
|
||||
return order === 'desc' ? (a, b) => descendingComparator(a, b, orderBy) : (a, b) => -descendingComparator(a, b, orderBy);
|
||||
}
|
||||
|
||||
function stableSort(array, comparator) {
|
||||
const stabilizedThis = array.map((el, index) => [el, index]);
|
||||
stabilizedThis.sort((a, b) => {
|
||||
@@ -112,12 +86,6 @@ const Orders = () => {
|
||||
disablePadding: true,
|
||||
label: 'S NO'
|
||||
},
|
||||
// {
|
||||
// id: 'tenantname',
|
||||
// numeric: false,
|
||||
// disablePadding: false,
|
||||
// label: 'CUSTOMER',
|
||||
// },
|
||||
{
|
||||
id: 'orderid',
|
||||
numeric: false,
|
||||
@@ -191,15 +159,6 @@ const Orders = () => {
|
||||
);
|
||||
}
|
||||
|
||||
EnhancedTableHead.propTypes = {
|
||||
numSelected: PropTypes.number.isRequired,
|
||||
onRequestSort: PropTypes.func.isRequired,
|
||||
onSelectAllClick: PropTypes.func.isRequired,
|
||||
order: PropTypes.oneOf(['asc', 'desc']).isRequired,
|
||||
orderBy: PropTypes.string.isRequired,
|
||||
rowCount: PropTypes.number.isRequired
|
||||
};
|
||||
|
||||
function EnhancedTable() {
|
||||
const [order, setOrder] = React.useState('asc');
|
||||
const [orderBy, setOrderBy] = React.useState('calories');
|
||||
@@ -235,20 +194,8 @@ const Orders = () => {
|
||||
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);
|
||||
}
|
||||
fetchtablecovered();
|
||||
fetchorderscount();
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
@@ -978,40 +925,21 @@ const Orders = () => {
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
const tid = localStorage.getItem('tenantid');
|
||||
const [startdate, setStartdate] = useState(dayjs().format('YYYY-MM-DD'));
|
||||
const [enddate, setEnddate] = useState(dayjs().format('YYYY-MM-DD'));
|
||||
|
||||
const [tenantid, setTenantid] = useState('');
|
||||
|
||||
const [percentage1, setPercentage1] = useState('0');
|
||||
const [percentage2, setPercentage2] = useState('0');
|
||||
const [percentage3, setPercentage3] = useState('0');
|
||||
const [percentage4, setPercentage4] = useState('0');
|
||||
let [orderarr, setArr] = useState([]);
|
||||
let [orderarrcovered, setArrcovered] = useState([]);
|
||||
let [orderarractive, setArractive] = useState([]);
|
||||
let [orderarruncovered, setArruncovered] = useState([]);
|
||||
let [orderarrcancelled, setArrcancelled] = useState([]);
|
||||
let [orderarrassigned, setArrassigned] = useState([]);
|
||||
let [orderarrconfirmed, setArrconfirmed] = useState([]);
|
||||
let [orderarrmodified, setArrmodified] = useState([]);
|
||||
let [orderarrclosed, setArrclosed] = useState([]);
|
||||
let [orderarrpicked, setArrpicked] = useState([]);
|
||||
let [orderarrcreated, setArrcreated] = useState([]);
|
||||
|
||||
const [allorders, setAllorders] = useState('');
|
||||
const [activeorders, setActiveorders] = useState('');
|
||||
const [coveredorders, setCoveredorders] = useState('');
|
||||
const [uncoveredorders, setUncoveredorders] = useState('');
|
||||
const [cancelled, setCancelled] = useState('');
|
||||
|
||||
const [assigned, setAssigned] = useState('');
|
||||
const [confirmed, setConfirmed] = useState('');
|
||||
const [modified, setModified] = useState('');
|
||||
const [completed, setCompleted] = useState('');
|
||||
const [closed, setClosed] = useState('');
|
||||
const [picked, setPicked] = useState('');
|
||||
const [created, setCreated] = useState('');
|
||||
const [tabstatus, setTabstatus] = useState('Created');
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -1021,109 +949,37 @@ const Orders = () => {
|
||||
let navigate = useNavigate();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [dateselect, setDateselect] = useState('select');
|
||||
// const [tabstatus1, setTabstatus1] = useState('All');
|
||||
const [tabstatus1, setTabstatus1] = useState('Today');
|
||||
|
||||
// const [datestatus, setDatestatus] = useState('All');
|
||||
const [datestatus, setDatestatus] = useState('Today');
|
||||
|
||||
const [searchword, setSearchword] = useState('');
|
||||
const [currentStatus, setCurrentStatus] = useState('created');
|
||||
const [createdLenght, setCreatedLenght] = useState();
|
||||
const [pendingLenght, setPendingLenght] = useState();
|
||||
const [deliveredlenght, setDeliveredlenght] = useState();
|
||||
const [cancelledLenght, setCancelledLenght] = useState();
|
||||
|
||||
const handleChangetab = (e, i) => {
|
||||
setTabvalue(i);
|
||||
|
||||
// if (i === 0) setTabstatus('All orders')
|
||||
if (i === 0) setTabstatus('Created');
|
||||
// if (i === 2) setTabstatus('Modified')
|
||||
if (i === 1) setTabstatus('Pending');
|
||||
|
||||
// if (i === 2) setTabstatus('Assigned')
|
||||
// if (i === 3) setTabstatus('Picked')
|
||||
if (i === 2) setTabstatus('Delivered');
|
||||
if (i === 3) setTabstatus('Cancelled');
|
||||
|
||||
// if (i === 0) setTabstatus('All orders')
|
||||
// if (i === 1) setTabstatus('Pending')
|
||||
// if (i === 1) setTabstatus('Modified')
|
||||
|
||||
// if (i === 3) setTabstatus('Assigned')
|
||||
// if (i === 0) setTabstatus('Confirmed')
|
||||
// if (i === 2) setTabstatus('Completed')
|
||||
// if (i === 3) setTabstatus('Closed')
|
||||
|
||||
if (i === 0) {
|
||||
setTabstatus('Created');
|
||||
setCurrentStatus('created');
|
||||
}
|
||||
if (i === 1) {
|
||||
setTabstatus('Pending');
|
||||
setCurrentStatus('pending');
|
||||
}
|
||||
if (i === 2) {
|
||||
setTabstatus('Delivered');
|
||||
setCurrentStatus('delivered');
|
||||
}
|
||||
if (i === 3) {
|
||||
setTabstatus('Cancelled');
|
||||
setCurrentStatus('cancelled');
|
||||
}
|
||||
console.log(i);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
console.log(localStorage.getItem('appuserid'));
|
||||
|
||||
if (localStorage.getItem('tenantid')) {
|
||||
setTenantid(localStorage.getItem('tenantid'));
|
||||
let val = localStorage.getItem('tenantid');
|
||||
|
||||
fetchtable(val);
|
||||
fetchpercentage(val);
|
||||
// fetchtableactive();
|
||||
fetchtableuncovered(val);
|
||||
fetchtablecovered(val);
|
||||
fetchtablecancelled(val);
|
||||
// fetchtableassigned(val);
|
||||
// fetchtablepicked(val);
|
||||
fetchtablecreated(val);
|
||||
// fetchtableconfirmed(val);
|
||||
// fetchtablemodified(val);
|
||||
// fetchtableclosed(val)
|
||||
// fetchtable(val)
|
||||
// console.log(activeorders);
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (localStorage.getItem('tenantid')) {
|
||||
let val = localStorage.getItem('tenantid');
|
||||
|
||||
// fetchtable();
|
||||
// fetchpercentage(val);
|
||||
// fetchtableactive();
|
||||
fetchtableuncovered(val);
|
||||
fetchtablecovered(val);
|
||||
fetchtablecancelled(val);
|
||||
// fetchtableassigned(val);
|
||||
// fetchtablepicked(val);
|
||||
// fetchtableconfirmed(val);
|
||||
// fetchtablemodified(val);
|
||||
// fetchtableclosed(val)
|
||||
fetchtable(val);
|
||||
fetchtablecreated(val);
|
||||
|
||||
console.log(activeorders);
|
||||
}
|
||||
}, [startdate, enddate]);
|
||||
|
||||
useEffect(() => {
|
||||
// if (tabstatus === 'All orders') setRows(orderarr)
|
||||
// if (tabstatus === 'Completed') setRows(orderarrcovered)
|
||||
// if (tabstatus === 'Active') setRows(orderarractive)
|
||||
// if (tabstatus === 'Pending') setRows(orderarruncovered)
|
||||
// if (tabstatus === 'Cancelled') setRows(orderarrcancelled)
|
||||
// if (tabstatus === 'Assigned') setRows(orderarrassigned)
|
||||
// if (tabstatus === 'Confirmed') setRows(orderarrconfirmed)
|
||||
if (tabstatus === 'Created') setRows(orderarrcreated);
|
||||
|
||||
if (tabstatus === 'All orders') setRows(orderarr);
|
||||
if (tabstatus === 'Delivered') setRows(orderarrcovered);
|
||||
if (tabstatus === 'Pending') setRows(orderarruncovered);
|
||||
|
||||
// if (tabstatus === 'Active') setRows(orderarractive)
|
||||
// if (tabstatus === 'Pending') setRows(orderarruncovered)
|
||||
if (tabstatus === 'Cancelled') setRows(orderarrcancelled);
|
||||
if (tabstatus === 'Assigned') setRows(orderarrassigned);
|
||||
// if (tabstatus === 'Confirmed') setRows(orderarrconfirmed)
|
||||
// if (tabstatus === 'Modified') setRows(orderarrmodified)
|
||||
// if (tabstatus === 'Closed') setRows(orderarrclosed)
|
||||
if (tabstatus === 'Picked') setRows(orderarrpicked);
|
||||
}, [tabstatus]);
|
||||
|
||||
const okclicked = () => {
|
||||
setOpen(false);
|
||||
};
|
||||
@@ -1179,17 +1035,20 @@ const Orders = () => {
|
||||
setEnddate(date.$d.toISOString().substring(0, 10));
|
||||
setTabstatus1('');
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (tabstatus === 'All Orders') {
|
||||
if (searchword) {
|
||||
let arr = orderarr.filter((val) => {
|
||||
return (
|
||||
val.tenantname.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupcustomer.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupcontactno.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupsuburb.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliverycustomer.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliverycontactno.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliverysuburb.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
@@ -1197,198 +1056,22 @@ const Orders = () => {
|
||||
} else {
|
||||
setRows([...orderarr]);
|
||||
}
|
||||
} else if (tabstatus === 'Delivered') {
|
||||
if (searchword) {
|
||||
let arr = orderarrcovered.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrcovered]);
|
||||
}
|
||||
} else if (tabstatus === 'Active') {
|
||||
if (searchword) {
|
||||
let arr = orderarractive.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.eventname.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
// || 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())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarractive]);
|
||||
}
|
||||
} else if (tabstatus === 'Pending') {
|
||||
if (searchword) {
|
||||
let arr = orderarruncovered.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarruncovered]);
|
||||
}
|
||||
} else if (tabstatus === 'Cancelled') {
|
||||
if (searchword) {
|
||||
let arr = orderarrcancelled.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrcancelled]);
|
||||
}
|
||||
} else if (tabstatus === 'Assigned') {
|
||||
if (searchword) {
|
||||
let arr = orderarrassigned.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrassigned]);
|
||||
}
|
||||
} else if (tabstatus === 'Confirmed') {
|
||||
if (searchword) {
|
||||
let arr = orderarrconfirmed.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrconfirmed]);
|
||||
}
|
||||
} else if (tabstatus === 'Modified') {
|
||||
if (searchword) {
|
||||
let arr = orderarrmodified.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.eventname.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.tenantname.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrmodified]);
|
||||
}
|
||||
} else if (tabstatus === 'Closed') {
|
||||
if (searchword) {
|
||||
let arr = orderarrclosed.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.eventname.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.tenantname.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordervalue.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
}
|
||||
} else if (tabstatus === 'Picked') {
|
||||
if (searchword) {
|
||||
let arr = orderarrpicked.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.customername.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrpicked]);
|
||||
}
|
||||
} else if (tabstatus === 'Created') {
|
||||
if (searchword) {
|
||||
let arr = orderarrcreated.filter((val) => {
|
||||
return (
|
||||
val.orderid.toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.pickupaddress.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.ordernotes.toString().toLowerCase().includes(searchword.toLowerCase()) ||
|
||||
val.deliveryaddress.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.customername.toLowerCase().includes(searchword.toLowerCase())
|
||||
// || val.contactno.toString().toLowerCase().includes(searchword.toLowerCase())
|
||||
);
|
||||
});
|
||||
console.log(arr);
|
||||
setRows([...arr]);
|
||||
} else {
|
||||
setRows([...orderarrcreated]);
|
||||
}
|
||||
}
|
||||
}, [orderarr, searchword]);
|
||||
}, [searchword]);
|
||||
|
||||
const handleChange1 = (e) => {
|
||||
setTabstatus1(e.target.innerText);
|
||||
setDatestatus(e.target.innerText);
|
||||
};
|
||||
|
||||
const fetchtable = async (tid) => {
|
||||
const fetchtablecovered = async () => {
|
||||
try {
|
||||
await axios
|
||||
.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}`)
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=${currentStatus}&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
.then((res) => {
|
||||
if (res.data.status) {
|
||||
let arr = [];
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
console.log(currentStatus, arr);
|
||||
setArr(arr);
|
||||
console.log(res.data.Details);
|
||||
if (tabstatus == 'All Orders') {
|
||||
setRows(arr);
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
@@ -1397,296 +1080,67 @@ const Orders = () => {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
useEffect(() => {
|
||||
fetchtablecovered();
|
||||
fetchorderscount();
|
||||
}, [tabstatus, startdate, enddate]);
|
||||
|
||||
const fetchtablecovered = async (tid) => {
|
||||
try {
|
||||
// await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=completed`)
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=delivered&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
.then((res) => {
|
||||
// if (res.data.message === "Success") {
|
||||
let arr = [];
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
console.log('delivered', arr);
|
||||
setArrcovered(arr);
|
||||
// }
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtablecreated = async (tid) => {
|
||||
try {
|
||||
// await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}&status=completed`)
|
||||
await axios
|
||||
.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=created&fromdate=${startdate}&todate=${enddate}`)
|
||||
.then((res) => {
|
||||
// if (res.data.message === "Success") {
|
||||
let arr = [];
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
console.log('created', arr);
|
||||
setArrcreated(arr);
|
||||
if (tabstatus == 'Created') {
|
||||
setRows(arr);
|
||||
}
|
||||
// }
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtableactive = async () => {
|
||||
try {
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=processing&sort=desc`
|
||||
)
|
||||
.then((res) => {
|
||||
if (res.data.message === 'Success') {
|
||||
let arr = [];
|
||||
res.data.Details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
setArractive(arr);
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtableuncovered = async (tid) => {
|
||||
try {
|
||||
await axios
|
||||
.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=pending&fromdate=${startdate}&todate=${enddate}`)
|
||||
.then((res) => {
|
||||
if (res.data.message === 'Success') {
|
||||
let arr = [];
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
console.log('pending', arr);
|
||||
setArruncovered(arr);
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtablecancelled = async (tid) => {
|
||||
try {
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=cancelled&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
// await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=cancelled`)
|
||||
|
||||
.then((res) => {
|
||||
// if (res.data.message === "Success") {
|
||||
let arr = [];
|
||||
console.log(res.data.details);
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
console.log('cancelled', arr);
|
||||
setArrcancelled(arr);
|
||||
// }
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtableassigned = async (tid) => {
|
||||
try {
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=accepted&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
.then((res) => {
|
||||
// if (res.data.message === "Success") {
|
||||
let arr = [];
|
||||
console.log(res.data.details);
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
setArrassigned(arr);
|
||||
// }
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtablepicked = async (tid) => {
|
||||
try {
|
||||
await axios
|
||||
.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=picked&fromdate=${startdate}&todate=${enddate}`)
|
||||
.then((res) => {
|
||||
// if (res.data.message === "Success") {
|
||||
let arr = [];
|
||||
console.log(res.data.details);
|
||||
res.data.details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
setArrpicked(arr);
|
||||
// }
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtableconfirmed = async (tid) => {
|
||||
try {
|
||||
// await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=confirmed&sort=desc`)
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=confirmed&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
|
||||
.then((res) => {
|
||||
if (res.data.message === 'Success') {
|
||||
let arr = [];
|
||||
console.log(res.data.Details);
|
||||
res.data.Details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
setArrconfirmed(arr);
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtablemodified = async (tid) => {
|
||||
try {
|
||||
// await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=modified&sort=desc`)
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=modified&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
|
||||
.then((res) => {
|
||||
if (res.data.message === 'Success') {
|
||||
let arr = [];
|
||||
console.log(res.data.Details);
|
||||
res.data.Details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
setArrmodified(arr);
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchtableclosed = async (tid) => {
|
||||
try {
|
||||
// await axios.get(`${process.env.REACT_APP_URL2}/orders/orderliststatus?fromdate=${startdate}&todate=${enddate}&type=${dateselect}&status=modified&sort=desc`)
|
||||
await axios
|
||||
.get(
|
||||
`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=closed&fromdate=${startdate}&todate=${enddate}`
|
||||
)
|
||||
.then((res) => {
|
||||
if (res.data.message === 'Success') {
|
||||
let arr = [];
|
||||
console.log(res.data.Details);
|
||||
res.data.Details.map((val, i) => {
|
||||
arr = [...arr, { ...val, sno: i + 1 }];
|
||||
});
|
||||
setArrclosed(arr);
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchpercentage = async (tid) => {
|
||||
const fetchpercentage = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
// await axios.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}&fromdate=${startdate}&todate=${enddate}`)
|
||||
await axios
|
||||
.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?applocationid=${tid}`)
|
||||
|
||||
.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}`)
|
||||
.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.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.created / res.data.details.total) * 100) || 0).toString());
|
||||
setPercentage3((Math.round((res.data.details.delivered / res.data.details.total) * 100) || 0).toString());
|
||||
|
||||
setPercentage4((Math.round((res.data.details.cancelled / res.data.details.total) * 100) || 0).toString());
|
||||
|
||||
setPercentage2((Math.round((res.data.details.pending / res.data.details.total) * 100) || 0).toString());
|
||||
|
||||
setLoading(false);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
setLoading(false);
|
||||
// enqueueSnackbar(err.message, {
|
||||
// variant: 'error', anchorOrigin: { vertical: 'top', horizontal: 'right' },
|
||||
// autoHideDuration: 2000
|
||||
// })
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
useEffect(() => {
|
||||
fetchpercentage();
|
||||
}, []);
|
||||
const fetchorderscount = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
await axios
|
||||
.get(`${process.env.REACT_APP_URL}/orders/getordersummary/?tenantid=${tid}&fromdate=${startdate}&todate=${enddate}`)
|
||||
.then((res) => {
|
||||
console.log('fetchorderscount', res.data.details);
|
||||
setCreatedLenght(res.data.details.created);
|
||||
setPendingLenght(res.data.details.pending);
|
||||
setDeliveredlenght(res.data.details.delivered);
|
||||
setCancelledLenght(res.data.details.cancelled);
|
||||
setLoading(false);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
setLoading(false);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
useEffect(() => {
|
||||
fetchorderscount();
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -1786,50 +1240,24 @@ const Orders = () => {
|
||||
}}
|
||||
>
|
||||
<Tabs value={tabvalue} onChange={handleChangetab} variant="scrollable" scrollButtons="auto">
|
||||
{/* <Tab label="All orders"
|
||||
iconPosition="end"
|
||||
icon={<Chip label={allorders} color="primary" variant="light" size="small" />}
|
||||
/> */}
|
||||
<Tab
|
||||
label="Created"
|
||||
icon={<Chip label={orderarrcreated.length} color="primary" variant="light" size="small" />}
|
||||
icon={<Chip label={createdLenght} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/>
|
||||
<Tab
|
||||
label="Pending"
|
||||
icon={<Chip label={orderarruncovered.length} color="primary" variant="light" size="small" />}
|
||||
icon={<Chip label={pendingLenght} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/>
|
||||
{/* <Tab label="Accepted"
|
||||
icon={<Chip label={assigned} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/> */}
|
||||
{/* <Tab label="Confirmed"
|
||||
icon={<Chip label={confirmed} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/> */}
|
||||
{/* <Tab label="Modified"
|
||||
icon={<Chip label={modified} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/> */}
|
||||
{/* <Tab label="Picked"
|
||||
icon={<Chip label={picked} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/> */}
|
||||
|
||||
<Tab
|
||||
label="Delivered"
|
||||
icon={<Chip label={orderarrcovered.length} color="primary" variant="light" size="small" />}
|
||||
icon={<Chip label={deliveredlenght} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/>
|
||||
|
||||
{/* <Tab label="Closed"
|
||||
icon={<Chip label={closed} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/> */}
|
||||
<Tab
|
||||
label="Cancelled"
|
||||
icon={<Chip label={orderarrcancelled.length} color="primary" variant="light" size="small" />}
|
||||
icon={<Chip label={cancelledLenght} color="primary" variant="light" size="small" />}
|
||||
iconPosition="end"
|
||||
/>
|
||||
</Tabs>
|
||||
@@ -1860,6 +1288,8 @@ const Orders = () => {
|
||||
sx={{ visibility: searchword ? 'visible' : 'hidden' }}
|
||||
onClick={() => {
|
||||
setSearchword('');
|
||||
fetchtablecovered();
|
||||
fetchorderscount();
|
||||
}}
|
||||
>
|
||||
<ClearIcon fontSize="small" sx={{ color: theme.palette.primary.main }} />
|
||||
|
||||
Reference in New Issue
Block a user