DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 00:54:07 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-03-05 20:58:08 -08:00
parent d42361bac1 052132ec37
commit 90bff709a4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Models/Accessory.php
View file

@ -167,8 +167,7 @@ class Accessory extends SnipeModel
return $query->where(function ($query) use ($search) { return $query->where(function ($query) use ($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.'%');
@ -179,8 +178,7 @@ class Accessory extends SnipeModel
}); });
})->orWhere('accessories.name', 'LIKE', '%'.$search.'%') })->orWhere('accessories.name', 'LIKE', '%'.$search.'%')
->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);
}); });
} }