@@ -14,9 +14,9 @@ discard block |
||
| 14 | 14 | public function __invoke(SearchTipsRequest $request) |
| 15 | 15 | { |
| 16 | 16 | $dirty = false; |
| 17 | - $searchText = isset($request->search_text) ? explode(' ', $request->search_text) : null; |
|
| 18 | - $searchEquip = isset($request->search_equip_id) ? $request->search_equip_id : null; |
|
| 19 | - $searchType = isset($request->search_type) ? $request->search_type : null; |
|
| 17 | + $searchText = isset($request->search_text) ? explode(' ', $request->search_text) : null; |
|
| 18 | + $searchEquip = isset($request->search_equip_id) ? $request->search_equip_id : null; |
|
| 19 | + $searchType = isset($request->search_type) ? $request->search_type : null; |
|
| 20 | 20 | |
| 21 | 21 | // Determine if any search queries have been entered |
| 22 | 22 | if($searchText || $searchEquip || $searchType) |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | ->orderBy('sticky', 'DESC') |
| 36 | 36 | ->orderBy('created_at', 'DESC') |
| 37 | 37 | // Search text fields |
| 38 | - ->when($searchText, function ($q) use($searchText) |
|
| 38 | + ->when($searchText, function($q) use($searchText) |
|
| 39 | 39 | { |
| 40 | 40 | foreach($searchText as $text) |
| 41 | 41 | { |
@@ -35,8 +35,7 @@ discard block |
||
| 35 | 35 | ->orderBy('sticky', 'DESC') |
| 36 | 36 | ->orderBy('created_at', 'DESC') |
| 37 | 37 | // Search text fields |
| 38 | - ->when($searchText, function ($q) use($searchText) |
|
| 39 | - { |
|
| 38 | + ->when($searchText, function ($q) use($searchText) { |
|
| 40 | 39 | foreach($searchText as $text) |
| 41 | 40 | { |
| 42 | 41 | $q->orWhere('subject', 'like', '%'.$text.'%') |
@@ -45,15 +44,12 @@ discard block |
||
| 45 | 44 | } |
| 46 | 45 | }) |
| 47 | 46 | // Search Article Type field |
| 48 | - ->when($searchType, function($q) use($searchType) |
|
| 49 | - { |
|
| 47 | + ->when($searchType, function($q) use($searchType) { |
|
| 50 | 48 | $q->whereIn('tip_type_id', $searchType); |
| 51 | 49 | }) |
| 52 | 50 | // Search Equipment Type field |
| 53 | - ->when($searchEquip, function($q) use($searchEquip) |
|
| 54 | - { |
|
| 55 | - $q->whereHas('EquipmentType', function($q2) use ($searchEquip) |
|
| 56 | - { |
|
| 51 | + ->when($searchEquip, function($q) use($searchEquip) { |
|
| 52 | + $q->whereHas('EquipmentType', function($q2) use ($searchEquip) { |
|
| 57 | 53 | $q2->whereIn('equipment_types.equip_id', $searchEquip); |
| 58 | 54 | }); |
| 59 | 55 | }) |