diff --git a/src/pages/nearle/orders/createorder1.js b/src/pages/nearle/orders/createorder1.js
index be3295a..391224b 100644
--- a/src/pages/nearle/orders/createorder1.js
+++ b/src/pages/nearle/orders/createorder1.js
@@ -830,7 +830,7 @@ const Createorder1 = () => {
 
       pickup: {
         address: pickCust.address || '',
-        applocationid: pickCust.applocationid,
+        applocationid: tenant.applolcationid,
         city: pickCust.city || '',
         configid: parseInt(localStorage.getItem('configid')),
         contactno: pickCust.contactno || '',
@@ -845,6 +845,7 @@ const Createorder1 = () => {
         landmark: pickCust.landmark || '',
         latitude: pickCust.latitude.toString() || '',
         longitude: pickCust.longitude.toString() || '',
+        locationid: pickCust.deliverylocationid || 0,
         postcode: pickCust.postcode || '',
         primaryaddress: 1,
         profileimage: '',
@@ -852,9 +853,10 @@ const Createorder1 = () => {
         suburb: pickCust.suburb || '',
         tenantid: tenant.tenantid
       },
+
       drop: {
         address: dropCust.address || '',
-        applocationid: dropCust.applocationid,
+        applocationid: tenant.applolcationid,
         city: dropCust.city || '',
         configid: parseInt(localStorage.getItem('configid')),
         contactno: dropCust.contactno || '',
@@ -869,6 +871,7 @@ const Createorder1 = () => {
         landmark: dropCust.landmark || '',
         latitude: dropCust.latitude.toString(),
         longitude: dropCust.longitude.toString(),
+        locationid: dropCust.deliverylocationid || 0,
         postcode: dropCust.postcode || '',
         primaryaddress: 1,
         profileimage: '',
@@ -1358,10 +1361,11 @@ const Createorder1 = () => {
                                     setPickCust({});
                                     setAddId1(1);
                                     setInputValue2('');
+                                    setSearchCustList('');
                                   }
                                 }}
                               >
-                                Saved Address
+                                Saved Locations
                               </Button>
                             </Stack>
                           </Stack>
@@ -1467,6 +1471,7 @@ const Createorder1 = () => {
                               // />
                               <div>
                                 <TextField
+                                  disabled={!isLocation}
                                   id="addressAuto1"
                                   placeholder="Search"
                                   fullWidth
@@ -1545,6 +1550,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Contact Name (pick) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 InputProps={{
                                   startAdornment: (
@@ -1564,6 +1570,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Contact Number(pick) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 type="number"
                                 InputProps={{
@@ -1589,6 +1596,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Door No (pick) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 InputProps={{
                                   startAdornment: (
@@ -1608,6 +1616,7 @@ const Createorder1 = () => {
                             {/* ====================================== || Suburb (pick) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 InputProps={{
                                   startAdornment: (
@@ -1627,6 +1636,7 @@ const Createorder1 = () => {
                             {/* ====================================== || City (pick) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 InputProps={{
                                   startAdornment: (
@@ -1646,6 +1656,7 @@ const Createorder1 = () => {
                             {/* ====================================== || postcode (pick) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 InputProps={{
                                   startAdornment: (
@@ -1665,6 +1676,7 @@ const Createorder1 = () => {
                             {/* ====================================== || Landmark (pick) || ====================================== */}
                             <Grid item xs={12}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 InputProps={{
                                   startAdornment: (
@@ -1745,10 +1757,11 @@ const Createorder1 = () => {
                                     setpickordrop(2);
                                     setAddId2(1);
                                     setInputValue3('');
+                                    setSearchCustList('');
                                   }
                                 }}
                               >
-                                Saved Address
+                                Saved Locations
                               </Button>
                             </Stack>
                           </Stack>
@@ -1848,6 +1861,7 @@ const Createorder1 = () => {
                               <div>
                                 <TextField
                                   id="addressAuto2"
+                                  disabled={!isLocation}
                                   placeholder="Search"
                                   fullWidth
                                   value={inputValue3}
@@ -1878,6 +1892,7 @@ const Createorder1 = () => {
                               </div>
                             ) : (
                               <TextField
+                                disabled={!isLocation}
                                 InputProps={{
                                   endAdornment: (
                                     <IconButton
@@ -1925,6 +1940,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Contact Name (drop) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 variant="outlined"
                                 label="Contact Name"
@@ -1944,6 +1960,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Contact Number (drop) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 type="number"
                                 variant="outlined"
@@ -1966,6 +1983,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Door No (drop) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 variant="outlined"
                                 label="Door No / Street"
@@ -1985,6 +2003,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Suburb (drop) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 variant="outlined"
                                 label="Location"
@@ -2004,6 +2023,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||City (drop) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 variant="outlined"
                                 label="City"
@@ -2024,6 +2044,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Postcode (drop) || ====================================== */}
                             <Grid item xs={6}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 variant="outlined"
                                 label="Postcode"
@@ -2043,6 +2064,7 @@ const Createorder1 = () => {
                             {/* ====================================== ||Landmark (drop) || ====================================== */}
                             <Grid item xs={12}>
                               <TextField
+                                disabled={!isLocation}
                                 fullWidth
                                 variant="outlined"
                                 label="Landmark"
@@ -2365,7 +2387,7 @@ const Createorder1 = () => {
         >
           <DialogTitle sx={{ bgcolor: theme.palette.primary.main, color: 'white' }}>
             <Stack>
-              <Typography variant="h4"> {`Select Address (${pickordrop === 1 ? 'Pickup' : 'Drop'})`}</Typography>
+              <Typography variant="h4"> {`Select Location (${pickordrop === 1 ? 'Pickup' : 'Drop'})`}</Typography>
               <FormControl
                 sx={{
                   width: '100%',