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

Update framework and javascript

Browse Source
This commit is contained in:
Deon George
2020-05-26 11:44:02 +10:00
parent 32c562cf30
commit dd1460463f
13 changed files with 2623 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ class SearchController extends Controller
->orderBy('firstname')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('US:%s %s',$o->aid,$o->name),'value'=>'/u/home/'.$o->id]);
$result->push(['name'=>sprintf('US:%s %s',$o->aid,$o->name),'value'=>'/u/home/'.$o->id,'category'=>'Users']);
}
# Look for Account
@@ -43,7 +43,7 @@ class SearchController extends Controller
->orderBy('company')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('AC:%s %s',$o->aid,$o->company),'value'=>'/u/home/'.$o->user_id]);
$result->push(['name'=>sprintf('AC:%s %s',$o->aid,$o->company),'value'=>'/u/home/'.$o->user_id,'category'=>'Accounts']);
}
# Look for a Service
@@ -52,7 +52,7 @@ class SearchController extends Controller
->orderBy('id')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('SV:%s (%s)',$o->name,$o->sid),'value'=>'/u/service/'.$o->id]);
$result->push(['name'=>sprintf('SV:%s (%s)',$o->name,$o->sid),'value'=>'/u/service/'.$o->id,'category'=>'Services']);
}
# Look for an Invoice
@@ -61,7 +61,7 @@ class SearchController extends Controller
->orderBy('id')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('IN:%s #%s',$o->account->name,$o->invoice_id),'value'=>'/u/invoice/'.$o->id]);
$result->push(['name'=>sprintf('IN:%s #%s',$o->account->name,$o->invoice_id),'value'=>'/u/invoice/'.$o->id,'category'=>'Invoices']);
}
# Look for an ADSL/NBN Service
@@ -70,7 +70,7 @@ class SearchController extends Controller
->orderBy('service_number')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('SV:%s (%s)',$o->name,$o->service->sid),'value'=>'/u/service/'.$o->id]);
$result->push(['name'=>sprintf('SV:%s (%s)',$o->name,$o->service->sid),'value'=>'/u/service/'.$o->id,'category'=>'Broadband']);
}
return $result;

14
app/User.php
View File

@@ -205,20 +205,6 @@ class User extends Authenticatable
->filter();
}
/**
* Get the users language
*
* For non logged in users we need to populate with a default language
* @param $value
* @return mixed
* @todo This doesnt appear to be used?
*/
public function getLanguageAttribute($value)
{
if (is_null($value))
return config('SITE_SETUP')->language;
}
/**
* Return a Carbon Date if it has a value.
*