DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Only pull category matches for accessory category

Browse source
This commit is contained in:
snipe 2018-03-05 20:22:44 -08:00
parent 0ef4251462
commit 2df19bcbb4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Models/Accessory.php
View file

@ -163,13 +163,12 @@ class Accessory extends SnipeModel
*/ */
public function scopeTextSearch($query, $search) public function scopeTextSearch($query, $search)
{ {
$search = explode('+', $search);
return $query->where(function ($query) use ($search) { return $query->where(function ($query) use ($search) {
foreach ($search as $search) {
$query->whereHas('category', function ($query) use ($search) { $query->whereHas('category', function ($query) use ($search) {
$query->where('categories.name', 'LIKE', '%'.$search.'%'); $query->where('categories.name', 'LIKE', '%'.$search.'%')
->where('categories.category_type', '=', 'accessory');
})->orWhere(function ($query) use ($search) { })->orWhere(function ($query) use ($search) {
$query->whereHas('company', function ($query) use ($search) { $query->whereHas('company', function ($query) use ($search) {
$query->where('companies.name', 'LIKE', '%'.$search.'%'); $query->where('companies.name', 'LIKE', '%'.$search.'%');
@ -182,7 +181,7 @@ class Accessory extends SnipeModel
->orWhere('accessories.model_number', 'LIKE', '%'.$search.'%') ->orWhere('accessories.model_number', 'LIKE', '%'.$search.'%')
->orWhere('accessories.order_number', 'LIKE', '%'.$search.'%') ->orWhere('accessories.order_number', 'LIKE', '%'.$search.'%')
->orWhere('accessories.purchase_cost', '=', $search); ->orWhere('accessories.purchase_cost', '=', $search);
}
}); });
} }