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