deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix supplier_user being unique for each supplier and id, fix search looking for users with a supplier_id

Browse Source
This commit is contained in:
Deon George
2022-08-10 17:05:57 +10:00
parent d358620b46
commit f5d535daa7
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/SearchController.php
View File

@@ -44,13 +44,16 @@ class SearchController extends Controller
# Look for User by Supplier
if (is_numeric($request->input('term')))
foreach (Supplier::Search($request->input('term'))
foreach (User::select(['users.*','suppliers.name AS supplier_name','supplier_user.id AS pivot_id'])
->join('supplier_user',['supplier_user.user_id'=>'users.id'])
->join('suppliers',['suppliers.id'=>'supplier_user.supplier_id'])
->whereIN('user_id',$user_ids)
->orderBy('name')
->where('supplier_user.id','like','%'.$request->input('term').'%')
->orderBy('lastname')
->orderBy('firstname')
->limit(10)->get() as $o)
{
$oo = $o->users->filter(function($item) use ($request) { return str_contains($item->pivot->id,$request->input('term')); })->pop();
$result->push(['name'=>sprintf('%s (%s:%s)',$oo->name,$o->name,$oo->pivot->id),'value'=>'/u/home/'.$oo->id,'category'=>'Suppliers']);
$result->push(['name'=>sprintf('%s (%s:%s)',$o->name,$o->supplier_name,$o->pivot_id),'value'=>'/u/home/'.$o->id,'category'=>'Suppliers']);
}
# Look for Account