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

Changed account search to user search, show connection charges on invoice for pending services

Browse Source
This commit is contained in:
Deon George
2020-02-07 07:11:02 +09:00
parent ebd4367975
commit b61e00d80f
17 changed files with 314 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use App\User;
use App\Models\{Account,Invoice,Service,Service\Adsl};
class SearchController extends Controller
@@ -23,17 +24,17 @@ class SearchController extends Controller
return [];
$result = collect();
$accounts = Auth::user()->all_accounts()->pluck('id');
$accounts = ($x=Auth::user()->all_accounts())->pluck('id');
$users = $x->transform(function($item) { return $item->user;});
# Look for Account
foreach (Account::Search($request->input('term'))
->whereIN('id',$accounts)
->orderBy('company')
->orderBy('last_name')
->orderBy('first_name')
foreach (User::Search($request->input('term'))
->whereIN('id',$users->pluck('id'))
->orderBy('lastname')
->orderBy('firstname')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('AC:%s %s',$o->aid,$o->name),'value'=>'/u/account/'.$o->id]);
$result->push(['label'=>sprintf('US:%s %s',$o->aid,$o->name),'value'=>'/u/home/'.$o->id]);
}
# Look for a Service