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

Fix search now that supplier_user is account_supplier

Browse Source
This commit is contained in:
Deon George 2024-07-24 14:53:18 +10:00
parent d6a2c70146
commit 1bae121481
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,16 +44,15 @@ class SearchController extends Controller
// Look for User by their Supplier ID with some suppliers // Look for User by their Supplier ID with some suppliers
if (is_numeric($request->input('term'))) if (is_numeric($request->input('term')))
foreach (User::select(['users.*','suppliers.name AS supplier_name','supplier_user.id AS pivot_id']) foreach (Account::select(['user_id','suppliers.name AS supplier_name','account_supplier.supplier_ref AS pivot_id'])
->join('supplier_user',['supplier_user.user_id'=>'users.id']) ->join('account_supplier',['account_supplier.account_id'=>'accounts.id'])
->join('suppliers',['suppliers.id'=>'supplier_user.supplier_id']) ->join('suppliers',['suppliers.id'=>'account_supplier.supplier_id'])
->whereIN('user_id',$user_ids) ->whereIN('accounts.id',$account_ids)
->where('supplier_user.id','like','%'.$request->input('term').'%') ->where('account_supplier.supplier_ref','like','%'.$request->input('term').'%')
->orderBy('lastname') ->orderBy('company')
->orderBy('firstname')
->limit(10)->get() as $o) ->limit(10)->get() as $o)
{ {
$result->push(['name'=>sprintf('%s (%s:%s)',$o->name,$o->supplier_name,$o->pivot_id),'value'=>'/u/home/'.$o->id,'category'=>'Suppliers']); $result->push(['name'=>sprintf('%s (%s:%s)',$o->company,$o->supplier_name,$o->supplier_ref),'value'=>'/u/home/'.$o->user_id,'category'=>'Suppliers']);
} }
// Look for Account // Look for Account