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

Merge branch 'develop' into custom_fields

Browse Source 
Conflicts:
	app/controllers/admin/AssetsController.php
	app/views/backend/hardware/index.blade.php
This commit is contained in:
Brady Wetherington
2015-10-22 02:30:30 -07:00
parent 0f6de6a477 a3f5dc331d
commit a67951fbce
119 changed files with 10674 additions and 1719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/Model.php
+31
View File
@@ -83,4 +83,35 @@ class Model extends Elegant
return $query->whereIn( 'category_id', $categoryIdListing );
}
/**
* Query builder scope to search on text
*
* @param Illuminate\Database\Query\Builder $query Query builder instance
* @param text $search Search term
*
* @return Illuminate\Database\Query\Builder Modified query builder
*/
public function scopeTextSearch($query, $search)
{
return $query->where('name', 'LIKE', "%$search%")
->orWhere('modelno', 'LIKE', "%$search%")
->orWhere(function($query) use ($search) {
$query->whereHas('depreciation', function($query) use ($search) {
$query->where('name','LIKE','%'.$search.'%');
});
})
->orWhere(function($query) use ($search) {
$query->whereHas('category', function($query) use ($search) {
$query->where('name','LIKE','%'.$search.'%');
});
})
->orWhere(function($query) use ($search) {
$query->whereHas('manufacturer', function($query) use ($search) {
$query->where('name','LIKE','%'.$search.'%');
});
});
}
}