sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 4

Browse Source
This commit is contained in:
Simon Pocrnjič 2024-11-19 20:29:04 +01:00
parent e804d6f4d5
commit 1620136d7d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Client.php
View File

@ -41,10 +41,9 @@ public function toSearchableArray(): array
'phones' => $this->person->phones 'phones' => $this->person->phones
];*/ ];*/
$this->loadMissing('person');
$array = $this->toArray(); $array = $this->toArray();
$array['person'] = $this->person ? $this->person->toArray() : []; $array['person'] = $this->person ? $this->person->only('full_name') : null;
return $array; return $array;
} }

3
app/Models/ClientCase.php
View File

@ -34,10 +34,9 @@ protected function makeAllSearchableUsing(Builder $query): Builder
public function toSearchableArray(): array public function toSearchableArray(): array
{ {
$this->loadMissing('person');
$array = $this->toArray(); $array = $this->toArray();
$array['person'] = $this->person ? $this->person->toArray() : []; $array['person'] = $this->person ? $this->person->only('full_name') : null;
return $array; return $array;
} }

16
routes/web.php
View File

@ -44,17 +44,21 @@
Route::get('search', function(Request $request) { Route::get('search', function(Request $request) {
if( !empty($request->input('query')) ) { if( !empty($request->input('query')) ) {
$clients = App\Models\Client::search($request->input('query')) /*$clients = App\Models\Client::search($request->input('query'))
->query(function($q) use($request) { ->query(function($q) use($request) {
$q->with('person')->limit($request->input('limit')); $q->with('person')->limit($request->input('limit'));
}) })
->get(); ->get();*/
$clients = App\Models\Client::search($request->input('query'))
->get()
->load('person:id,full_name')
->take(5);
$clientCases = App\Models\ClientCase::search($request->input('query')) $clientCases = App\Models\ClientCase::search($request->input('query'))
->query(function($q) use($request) { ->get()
$q->with('person')->limit($request->input('limit')); ->load('person:id,full_name')
}) ->take(5);
->get();
return [ return [
'clients' => $clients, 'clients' => $clients,