From 51e4ea978fc09a512d45648beaa86ae737a47a3c Mon Sep 17 00:00:00 2001
From: Malai Raja <malairaja22@gmail.com>
Date: Fri, 29 Dec 2023 10:28:20 +0530
Subject: [PATCH] 28122023

---
 .env                                          |  2 +-
 nearlexpressbuild                             |  2 +-
 .../Header/HeaderContent/Profile/index.js     |  3 +-
 src/pages/nearle/clients/client.js            | 10 ++++
 src/pages/nearle/clients/createclient.js      |  2 +-
 src/pages/nearle/login.js                     |  1 +
 src/pages/nearle/orders/createorder.js        | 59 +++++++++++++++++++
 7 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 9face82..b59f623 100644
--- a/.env
+++ b/.env
@@ -7,7 +7,7 @@ REACT_APP_API_URL=https://mock-data-api-nextjs.vercel.app/
 ## Google Map Key
 
 REACT_APP_GOOGLE_MAPS_API_KEY=AIzaSyCF4KatYCI3vqz1_H3kiHeyS3yCMfYToh8
-
+REACT_APP_RIDER_ACCESS_ID=AAAAILMpCEU:APA91bEavuOllBI6sFgYtxXAgNmAVwNA-MnCMHLGlR4_t7UqpLajAkdn3T0CZr_zaLBknLyim9ytFLMZgbeXmKqTad_PKCbqlYjHpaizVrLXtecxqyEy4UktIacK2UvHVUATHL-7VQQk
 ## Firebase - Google Auth 
 
 REACT_APP_FIREBASE_API_KEY=
diff --git a/nearlexpressbuild b/nearlexpressbuild
index 5a4660f..c351223 160000
--- a/nearlexpressbuild
+++ b/nearlexpressbuild
@@ -1 +1 @@
-Subproject commit 5a4660f08da6de5f4cd800429e11bb2899eb4e7a
+Subproject commit c351223c495964a124c331453b1b23b096bae217
diff --git a/src/layout/MainLayout/Header/HeaderContent/Profile/index.js b/src/layout/MainLayout/Header/HeaderContent/Profile/index.js
index 72507a1..42888ba 100644
--- a/src/layout/MainLayout/Header/HeaderContent/Profile/index.js
+++ b/src/layout/MainLayout/Header/HeaderContent/Profile/index.js
@@ -163,10 +163,11 @@ navigate('/login')
                           <Stack>
                             <Typography variant="h6">
                               {/* {user?.name} */}
+                              {localStorage.getItem('fullname') || ''}
                               </Typography>
                             <Typography variant="body2" color="textSecondary">
                               {/* UI/UX Designer */}
-                              user
+                             
                             </Typography>
                           </Stack>
                         </Stack>
diff --git a/src/pages/nearle/clients/client.js b/src/pages/nearle/clients/client.js
index af46cdc..23db33d 100644
--- a/src/pages/nearle/clients/client.js
+++ b/src/pages/nearle/clients/client.js
@@ -516,12 +516,22 @@ const Client = () => {
                             })
                             setCurrentcustomerid('')
                             fetchtable(localStorage.getItem('tenantid'))
+                        }else{
+                            enqueueSnackbar(res.data.message, {
+                                variant: 'error', anchorOrigin: { vertical: 'top', horizontal: 'right' },
+                                autoHideDuration: 2000
+                            })
                         }
                         setLoading(false)
 
                     }).catch((err) => {
                         console.log(err)
+                        enqueueSnackbar(err.message, {
+                            variant: 'error', anchorOrigin: { vertical: 'top', horizontal: 'right' },
+                            autoHideDuration: 2000
+                        })
                         setLoading(false)
+
                     })
 
             } catch (err) {
diff --git a/src/pages/nearle/clients/createclient.js b/src/pages/nearle/clients/createclient.js
index 1344857..7c18bfc 100644
--- a/src/pages/nearle/clients/createclient.js
+++ b/src/pages/nearle/clients/createclient.js
@@ -542,7 +542,7 @@ const Createclient = () => {
 
                             <Grid item xs={12} sm={6}>
                                 <Stack spacing={1.25}>
-                                    <InputLabel htmlFor="personal-location">Suburb</InputLabel>
+                                    <InputLabel htmlFor="personal-location">Location</InputLabel>
                                     <TextField fullWidth
                                         // defaultValue="New York"
                                         id="personal-location" placeholder="Location"
diff --git a/src/pages/nearle/login.js b/src/pages/nearle/login.js
index 2ce1109..65cda67 100644
--- a/src/pages/nearle/login.js
+++ b/src/pages/nearle/login.js
@@ -156,6 +156,7 @@ const Login = () => {
                             localStorage.setItem("roleid", res.data.details.roleid);
                             localStorage.setItem("tenantid", res.data.details.tenantid);
                             localStorage.setItem("applocationid", res.data.details.applocationid);
+                            localStorage.setItem("fullname", res.data.details.fullname);
 
 
                             navigate('/orders');
diff --git a/src/pages/nearle/orders/createorder.js b/src/pages/nearle/orders/createorder.js
index d8b6939..3fac29e 100644
--- a/src/pages/nearle/orders/createorder.js
+++ b/src/pages/nearle/orders/createorder.js
@@ -156,6 +156,7 @@ const Createorder = () => {
     const [tenantinfo, setTenantinfo] = useState({});
     const [searchword, setSearchword] = useState('');
     const [clientdetailarr, setClientdetailarr] = useState([])
+    const [admintoken,setAdmintoken]=useState('');
 
 
     useEffect(() => {
@@ -204,6 +205,24 @@ const Createorder = () => {
                 console.log(res)
                 if (res.data.status) {
                     setTenantinfo(res.data.details);
+                    fetchadmintoken(res.data.details.partnerid)
+                }
+                setLoading(false)
+            }).catch((err) => {
+                console.log(err)
+                setLoading(false)
+            })
+    }
+
+    
+    const fetchadmintoken = async (tid) => {
+        setLoading(true)
+        await axios.get(`${process.env.REACT_APP_URL}/partners/getadmintoken/?partnerid=${tid}`)
+            .then((res) => {
+                console.log(res)
+                if (res.data.status) {
+                    // setTenantinfo(res.data.details);
+                    setAdmintoken(res.data.details.userfcmtokem)
                 }
                 setLoading(false)
             }).catch((err) => {
@@ -304,6 +323,11 @@ const Createorder = () => {
                             variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' },
                             autoHideDuration: 2000
                         })
+                        if(admintoken){
+                            notifyadmin(admintoken)
+
+                        }
+                        
                         navigate('/orders')
                     } else {
                         opentoast(res.data.message)
@@ -461,6 +485,41 @@ const Createorder = () => {
         }
     }
 
+    const notifyadmin = async (id1) => {
+        setLoading(true)
+        await axios.post(`${process.env.REACT_APP_URL}/utils/notifyuser`, {
+          "sender": localStorage.getItem('firstname'),
+          "accessid": process.env.REACT_APP_RIDER_ACCESS_ID,
+          "notification": {
+            "priority": "high",
+            "to": id1,
+            "notification": {
+              "title": "Nearle Admin",
+              "body": "Orders has been placed for delivery.Kindly accept and process deliveries",
+              "sound": "ring"
+            }
+          }
+        })
+          .then((res) => {
+            console.log(res)
+            if (res.data.message == 'Success') {
+              enqueueSnackbar("Notification sent Successfully", {
+                variant: 'success', anchorOrigin: { vertical: 'top', horizontal: 'right' },
+                autoHideDuration: 2000
+              })
+            }
+            setLoading(false)
+  
+          }).catch((err) => {
+            console.log(err)
+            enqueueSnackbar(err.message, {
+              variant: 'error', anchorOrigin: { vertical: 'top', horizontal: 'right' },
+              autoHideDuration: 2000
+            })
+            setLoading(false)
+  
+          })
+      }