v1.18.1

Author: matthew-inamdar

app/Http/Controllers/Core/V1/LocationController.php

@@ -59,7 +59,7 @@ public function index(IndexRequest $request)
                 'postcode',
                 'country',
             ])
-            ->defaultSort([
+            ->defaultSorts([
                 'address_line_1',
                 'address_line_2',
                 'address_line_3',

app/Http/Controllers/Core/V1/Service/RelatedController.php

@@ -58,7 +58,7 @@ public function __invoke(Request $request, Service $service)
 
                 $query->orderByRaw($sql, [$location->lat(), $location->lon(), $location->lat()]);
             })
-            ->orderBy('name');
+            ->orderBy('services.name');
 
         $services = QueryBuilder::for($baseQuery)
             ->allowedIncludes(['organisation'])

app/Http/Controllers/Core/V1/UserController.php

@@ -78,7 +78,7 @@ public function index(IndexRequest $request)
                 'last_name',
                 'highest_role',
             ])
-            ->defaultSort([
+            ->defaultSorts([
                 'first_name',
                 'last_name',
             ])

composer.json

@@ -24,7 +24,7 @@
         "php-http/guzzle6-adapter": "^1.1",
         "phpoffice/phpspreadsheet": "^1.4",
         "predis/predis": "^1.1",
-        "spatie/laravel-query-builder": "^1.10",
+        "spatie/laravel-query-builder": "v1.17.2",
         "symfony/yaml": "^4.1"
     },
     "require-dev": {