ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v3' of github.com:snipe/snipe-it into v3

Browse Source
This commit is contained in:
snipe
2016-06-28 12:19:19 -07:00
parent 0e96a0aa3e 52c89ca889
commit 483bf1b309
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Asset.php
+15 -1
View File
@@ -736,7 +736,8 @@ class Asset extends Depreciable
$query->whereHas('category', function ($query) use ($search) {
$query->where(function ($query) use ($search) {
$query->where('categories.name', 'LIKE', '%'.$search.'%')
->orWhere('models.name', 'LIKE', '%'.$search.'%');
->orWhere('models.name', 'LIKE', '%'.$search.'%')
->orWhere('models.modelno', 'LIKE', '%'.$search.'%');
});
});
})->orWhereHas('model', function ($query) use ($search) {
@@ -794,6 +795,19 @@ class Asset extends Depreciable
return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.name', $order);
}
/**
* Query builder scope to order on model number
*
* @param Illuminate\Database\Query\Builder $query Query builder instance
* @param text $order Order
*
* @return Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeOrderModelNumber($query, $order)
{
return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.modelno', $order);
}
/**
* Query builder scope to order on assigned user