From be9d119961e9b4176c59a794ca4372f4579b595f Mon Sep 17 00:00:00 2001 From: Malai Raja Date: Mon, 11 Dec 2023 19:00:29 +0530 Subject: [PATCH] 11122023 --- nearlexpressbuild | 2 +- src/assets/images/logo-nearle1.png | Bin 4552 -> 4172 bytes src/assets/images/logo-nearle2.png | Bin 4172 -> 0 bytes src/layout/MainLayout/Header/index.js | 2 +- src/pages/nearle/accountsettings.js | 206 ++++------------------- src/pages/nearle/clients/createclient.js | 26 ++- src/pages/nearle/orders/createorder.js | 79 ++++++--- src/pages/nearle/orders/orders.js | 59 +++++-- 8 files changed, 163 insertions(+), 211 deletions(-) delete mode 100644 src/assets/images/logo-nearle2.png diff --git a/nearlexpressbuild b/nearlexpressbuild index 97d9155..c178408 160000 --- a/nearlexpressbuild +++ b/nearlexpressbuild @@ -1 +1 @@ -Subproject commit 97d9155b79317a1cef6ddd1e7dfc0b566371aec8 +Subproject commit c178408d139a244d63b6414235b538b1582acd39 diff --git a/src/assets/images/logo-nearle1.png b/src/assets/images/logo-nearle1.png index 5c955838d1b91ff05c22eca7ca8eb09c9429db00..87ca867ddacc579cb57b28629ad51ac868f2393c 100644 GIT binary patch literal 4172 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 WG~gE!y!@vC0000Nklr-r4M3dN3aFS@^1-m~9 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 WG~gE!y!@vC0000 { // 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', + fontSize:'25px', ':hover':{ color: '#fff', bgcolor: 'transparent' } }} diff --git a/src/pages/nearle/accountsettings.js b/src/pages/nearle/accountsettings.js index 608ff29..4e963ec 100644 --- a/src/pages/nearle/accountsettings.js +++ b/src/pages/nearle/accountsettings.js @@ -88,20 +88,17 @@ const Accountsettings = () => { - + {/* - {/* */} {info.companyname || ''} @@ -109,27 +106,7 @@ const Accountsettings = () => { - {/* - - - - - - 86 - Post - - - - 40 - Project - - - - 4.5K - Members - - - */} + @@ -149,7 +126,6 @@ const Accountsettings = () => { - {/* (+1-876) 8654 239 581 */} {info.primarycontact || ''} @@ -160,7 +136,6 @@ const Accountsettings = () => { - {/* New York */} {info.city} @@ -170,9 +145,7 @@ const Accountsettings = () => { - {/* - https://anshan.dh.url - */} + {info.state} @@ -181,55 +154,41 @@ const Accountsettings = () => { - {/* - - - - Junior - - - - - - UX Reseacher - - - - - - Wordpress - - - - - - HTML - - - - - - Graphic Design - - - - - - Code Style - - - - - - - */} + - - + */} + - + + + + + + {info.companyname} + {/* + + {info.registrationno} + */} + + } + > @@ -253,7 +212,6 @@ const Accountsettings = () => { Phone - {/* (+1-876) */} {info.primarycontact || ''} @@ -315,101 +273,7 @@ const Accountsettings = () => { - {/* - - - - - - - Master Degree (Year) - 2014-2017 - - - - - Institute - - - - - - - - - - - Bachelor (Year) - 2011-2013 - - - - - Institute - Imperial College London - - - - - - - - - School (Year) - 2009-2011 - - - - - Institute - School of London, England - - - - - - - */} - {/* - - - - - - - Senior - Senior UI/UX designer (Year) - - - - - Job Responsibility - - Perform task related to project manager with the 100+ team under my observation. Team management is key role in - this company. - - - - f - - - - - - Trainee cum Project Manager (Year) - 2017-2019 - - - - - Job Responsibility - Team management is key role in this company. - - - - - - - */} + diff --git a/src/pages/nearle/clients/createclient.js b/src/pages/nearle/clients/createclient.js index 77c485d..6156607 100644 --- a/src/pages/nearle/clients/createclient.js +++ b/src/pages/nearle/clients/createclient.js @@ -65,7 +65,10 @@ const Createclient = () => { const [primarycontact,setPrimarycontact]=useState('') const [firstname,setFirstname]=useState(''); const [doorno,setDoorno]=useState(''); - const [landmark,setLandmark]=useState('') + const [landmark,setLandmark]=useState(''); + const [tenantinfo, setTenantinfo] = useState({}); + + const navigate = useNavigate(); @@ -78,7 +81,9 @@ const Createclient = () => { useEffect(() => { // fetchprofiledetails(localStorage.getItem('appuserid')); // fetchprofiledetails(181); - + if(localStorage.getItem('tenantid')){ + fetchtenantinfo(localStorage.getItem('tenantid')) + } }, []) useEffect(() => { @@ -158,6 +163,21 @@ const Createclient = () => { } } + const fetchtenantinfo = async (tid) => { + setLoading(true) + await axios.get(`${process.env.REACT_APP_URL}/tenants/gettenantinfo/?tenantid=${tid}`) + .then((res) => { + console.log(res) + if (res.data.status) { + setTenantinfo(res.data.details); + } + setLoading(false) + }).catch((err) => { + console.log(err) + setLoading(false) + }) + } + useEffect(() => { if (selectedImage) { setAvatar(URL.createObjectURL(selectedImage)); @@ -241,7 +261,7 @@ const Createclient = () => { "customerid":0, "configid":1, "firstname":firstname, - "applocationid":3, + "applocationid":tenantinfo.applolcationid, "profileimage":"", "dialcode":"+91", "contactno":mobilenumber, diff --git a/src/pages/nearle/orders/createorder.js b/src/pages/nearle/orders/createorder.js index ab127a1..4ec7e17 100644 --- a/src/pages/nearle/orders/createorder.js +++ b/src/pages/nearle/orders/createorder.js @@ -59,6 +59,7 @@ import Geocode from "react-geocode"; // import {setApi} from "react-geocode"; import Autocomplete1 from "react-google-autocomplete"; // import logo from 'assets/images/location.png' +import Loader from 'components/Loader' import { // EditOutlined, @@ -141,7 +142,7 @@ const Createorder = () => { const [stafflist, setStafflist] = useState([]); const [loading2, setLoading2] = useState(false); - + const [loading,setLoading]=useState(false) const [shiftarr, setShiftarr] = useState([]); @@ -163,12 +164,12 @@ const Createorder = () => { sno: 1, address: '', "customerid": '', - "deliverytime": "", + "deliverytime": dayjs(), "deliverylocationid": '', "clientname": '', "contactno": '' }]) - console.log(orderarr) + // console.log(dayjs()) } }, []) @@ -195,14 +196,17 @@ const Createorder = () => { }, [searchword]) const fetchtenantinfo = async (tid) => { + setLoading(true) await axios.get(`${process.env.REACT_APP_URL}/tenants/gettenantinfo/?tenantid=${tid}`) .then((res) => { console.log(res) if (res.data.status) { setTenantinfo(res.data.details); } + setLoading(false) }).catch((err) => { console.log(err) + setLoading(false) }) } @@ -223,7 +227,7 @@ const Createorder = () => { - const createsubmitobj1 = () => { + const createsubmitobj1 = async() => { let arr = [] let timecheck = false; let addresscheck = false; @@ -243,7 +247,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": "", @@ -266,13 +270,16 @@ const Createorder = () => { "deliverycharge": 0, "deliverytime": `${dayjs(startdate).format('YYYY-MM-DD')} ${dayjs(val.deliverytime.$d).format('HH:mm:ss')}`, "deliverylocationid": val.deliverylocationid, // - "delivceryaddress": val.address, + "deliveryaddress": val.address, "pickupaddress": tenantinfo.address, "pickuplat": tenantinfo.latitude, "pickuplong": tenantinfo.longitude, "ordernotes": otherinstructions, "remarks": "", - "tenantuserid": parseInt(localStorage.getItem('tenantid')) + "tenantuserid": parseInt(localStorage.getItem('tenantid')), + "categoryid":tenantinfo.categoryid, + "subcategoryid":tenantinfo.subcategoryid, + "partnerid":tenantinfo.partnerid }) }) @@ -283,7 +290,28 @@ const Createorder = () => { opentoast('Choose Client') } else { - opentoast('success') + 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) + + }).catch((err) => { + console.log(err) + opentoast(err.data.message) + setLoading(false) + + }) + // opentoast('success') } console.log(arr) @@ -433,6 +461,11 @@ const Createorder = () => { return <> + {(loading) && + + + + } { sno: 1, address: '', "customerid": '', - "deliverytime": "", + "deliverytime":dayjs(), "deliverylocationid": '', "clientname": '', "contactno": '' @@ -475,7 +508,7 @@ const Createorder = () => { sno: 1, address: '', "customerid": '', - "deliverytime": "", + "deliverytime": dayjs(), "deliverylocationid": '', "clientname": '', "contactno": '' @@ -785,17 +818,18 @@ const Createorder = () => { setOrderarr([{ sno: 1, address: address.address, - "customerid": '', - "deliverytime": "", - "deliverylocationid": '', + "customerid": address.customerid, + "deliverytime": dayjs(), + "deliverylocationid": address.deliverylocationid, "clientname": address.firstname, "contactno": address.contactno }]) } else { - if (orderarr.find((val2) => val2.address == address.address)) { + if (orderarr.find((val2) => val2.customerid == address.customerid)) { if (orderarr.length > 1) { let arr = orderarr; - arr.splice(address.sno - 1, 1); + let res = orderarr.find((val2) => val2.customerid == address.customerid) + arr.splice(res.sno - 1, 1); let arr1 = [] arr.map((val2, k) => { arr1.push({ @@ -814,7 +848,7 @@ const Createorder = () => { sno: 1, address: '', "customerid": '', - "deliverytime": "", + "deliverytime": dayjs(), "deliverylocationid": '', "clientname": '', "contactno": '' @@ -827,7 +861,7 @@ const Createorder = () => { sno: arr.length + 1, 'address': address.address, "customerid": address.customerid, - "deliverytime": "", + "deliverytime": dayjs(), "deliverylocationid": address.deliverylocationid, "clientname":address.firstname, "contactno": address.contactno @@ -844,7 +878,7 @@ const Createorder = () => { sno: 1, address: address.address, "customerid": address.customerid, - "deliverytime": "", + "deliverytime": dayjs(), "deliverylocationid": address.deliverylocationid, "clientname":address.firstname, "contactno": address.contactno @@ -869,10 +903,11 @@ const Createorder = () => { cursor: 'pointer', p: 1.25, '&:hover': { - bgcolor: theme.palette.primary.lighter, - borderColor: theme.palette.primary.lighter + // bgcolor: theme.palette.primary.lighter, + // borderColor: theme.palette.primary.lighter + bgcolor:(orderarr.find((val2) => val2.customerid == address.customerid)) ? '#e1bee7' : '' }, - bgcolor: (orderarr.find((val2) => val2.address == address.address)) ? '#e1bee7' : '' + bgcolor: (orderarr.find((val2) => val2.customerid == address.customerid)) ? '#e1bee7' : '' }} > @@ -880,7 +915,7 @@ const Createorder = () => { {address.firstname} {(orderarr.find((val2) => val2.address == address.address)) && - + } diff --git a/src/pages/nearle/orders/orders.js b/src/pages/nearle/orders/orders.js index ccbf3fa..8aa872b 100644 --- a/src/pages/nearle/orders/orders.js +++ b/src/pages/nearle/orders/orders.js @@ -517,9 +517,9 @@ import { {row.orderid} - {dayjs(row.orderdate).utc().format('MM/DD/YYYY')} + {dayjs(row.deliverydate).utc().format('MM/DD/YYYY hh:mm A')} - + @@ -536,7 +536,7 @@ import { {/* {row.eventname} */} - + {row.deliveryaddress.slice(0,20)} @@ -1065,6 +1065,8 @@ import { let [orderarrmodified, setArrmodified] = useState([]); let [orderarrclosed, setArrclosed] = useState([]); let [orderarrpicked, setArrpicked] = useState([]); + let [orderarrcreated, setArrcreated] = useState([]); + @@ -1108,8 +1110,9 @@ import { setTabvalue(i); if (i === 0) setTabstatus('All orders') - if (i === 1) setTabstatus('Pending') + // if (i === 1) setTabstatus('Created') // if (i === 2) setTabstatus('Modified') + if (i === 1) setTabstatus('Pending') if (i === 2) setTabstatus('Assigned') if (i === 3) setTabstatus('Picked') @@ -1147,6 +1150,7 @@ import { fetchtablecancelled(val); fetchtableassigned(val); fetchtablepicked(val); + fetchtablecreated(val); // fetchtableconfirmed(val); // fetchtablemodified(val); // fetchtableclosed(val) @@ -1175,6 +1179,7 @@ import { // fetchtablemodified(val); // fetchtableclosed(val) fetchtable(val) + fetchtablecreated(val) console.log(activeorders); } @@ -1186,7 +1191,7 @@ import { // if (tabstatus === 'All orders') setRows(orderarr) // if (tabstatus === 'Completed') setRows(orderarrcovered) // if (tabstatus === 'Active') setRows(orderarractive) - if (tabstatus === 'Pending') setRows(orderarruncovered) + // if (tabstatus === 'Pending') setRows(orderarruncovered) // if (tabstatus === 'Cancelled') setRows(orderarrcancelled) // if (tabstatus === 'Assigned') setRows(orderarrassigned) // if (tabstatus === 'Confirmed') setRows(orderarrconfirmed) @@ -1194,6 +1199,8 @@ import { if (tabstatus === 'All orders') setRows(orderarr) if (tabstatus === 'Delivered') setRows(orderarrcovered) + if (tabstatus === 'Pending') setRows(orderarrcreated) + // if (tabstatus === 'Active') setRows(orderarractive) // if (tabstatus === 'Pending') setRows(orderarruncovered) if (tabstatus === 'Cancelled') setRows(orderarrcancelled) @@ -1434,8 +1441,8 @@ import { const fetchtable = async (tid) => { try { - // await axios.get(`${process.env.REACT_APP_URL}/orders/getorders/?tenantid=${tid}`) - await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}`) + // await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}`) + await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}`) .then((res) => { if (res.data.status) { let arr = [] @@ -1463,7 +1470,7 @@ import { try { // 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`) + await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=delivered`) .then((res) => { // if (res.data.message === "Success") { let arr = [] @@ -1481,6 +1488,29 @@ import { } } + + 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`) + .then((res) => { + // if (res.data.message === "Success") { + let arr = [] + res.data.details.map((val, i) => { + arr = [...arr, { ...val, sno: i + 1 }]; + }) + setArrcreated(arr) + // } + }).catch((err) => { + console.log(err) + }) + + } catch (err) { + console.log(err); + } + + } const fetchtableactive = async () => { @@ -1509,7 +1539,7 @@ import { const fetchtableuncovered = async (tid) => { try { - await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=pending`) + await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=pending`) .then((res) => { if (res.data.message === "Success") { let arr = [] @@ -1532,7 +1562,7 @@ import { const fetchtablecancelled = async (tid) => { try { - await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=cancelled`) + await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=cancelled`) // await axios.get(`${process.env.REACT_APP_URL2}/client/orders/getordersbystatus?tenantid=${tid}&status=cancelled`) .then((res) => { @@ -1558,7 +1588,7 @@ import { const fetchtableassigned = async (tid) => { try { - await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=accepted`) + await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=accepted`) .then((res) => { // if (res.data.message === "Success") { let arr = []; @@ -1582,7 +1612,7 @@ import { const fetchtablepicked = async (tid) => { try { - await axios.get(`${process.env.REACT_APP_URL}/orders/tenantorders/?tenantid=${tid}&status=picked`) + await axios.get(`${process.env.REACT_APP_URL}/orders/tenant/getorders/?tenantid=${tid}&status=picked`) .then((res) => { // if (res.data.message === "Success") { let arr = []; @@ -1909,7 +1939,10 @@ import { iconPosition="end" icon={} /> - + {/* } + iconPosition="end" + /> */} } iconPosition="end"