Merge master into v4

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Oct 27, 2024 · f514c23 · f514c23
1 parent ebadd73
commit f514c23
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/Classes/OrderManager.php b/src/Classes/OrderManager.php
@@ -150,15 +150,10 @@ public function validateDeliveryAddress(array $address)
             $address['country'] = app('country')->getCountryNameById($address['country_id']);
         }
 
-        $addressString = implode(' ', array_only($address, [
+        $collection = app('geocoder')->geocode(implode(' ', array_only($address, [
             'address_1', 'address_2', 'city', 'state', 'postcode', 'country',
-        ]));
+        ])));
 
-        if (!$this->location->requiresUserPosition()) {
-            return;
-        }
-
-        $collection = app('geocoder')->geocode($addressString);
         if (!$collection || $collection->isEmpty()) {
             throw new ApplicationException(lang('igniter.local::default.alert_invalid_search_query'));
         }