Nearle_express/dailygrubs_console
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

08122023

Browse Source
This commit is contained in:
Malai Raja
2023-12-08 19:01:21 +05:30
parent 743cae09b8
commit ecafa8fb25
27 changed files with 658 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/nearle/clients/client.js
View File

@@ -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 }];

115
src/pages/nearle/login.js
View File

@@ -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 = () => {
>
<Grid item xs={12}
// sx={{ ml: 3, mt: 3 }}
sx={{ml:3,mt:1}}
sx={{ ml: 3, mt: 1 }}
>
@@ -437,8 +444,8 @@ const Login = () => {
</Grid>
</Grid>
<Grid item xs={12}
// sx={{ m: 3, mt: 1 }}
sx={{mb:1}}
// sx={{ m: 3, mt: 1 }}
sx={{ mb: 1 }}
>
{/* <AuthFooter /> */}

1118
src/pages/nearle/orders/createorder.js
View File

File diff suppressed because it is too large Load Diff

67
src/pages/nearle/orders/orders.js
View File

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