@@ -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 | }) |
@@ -183,8 +183,7 @@ |
||
183 | 183 | if(isset($equip['laravel_through_key'])) |
184 | 184 | { |
185 | 185 | // Remove that piece from the current equipment list so it is not updated later |
186 | - $currentEquip = $currentEquip->filter(function($i) use ($equip) |
|
187 | - { |
|
186 | + $currentEquip = $currentEquip->filter(function($i) use ($equip) { |
|
188 | 187 | return $i->equip_id != $equip['equip_id']; |
189 | 188 | }); |
190 | 189 | } |
@@ -19,8 +19,7 @@ |
||
19 | 19 | if($event->notify) |
20 | 20 | { |
21 | 21 | $notificationType = UserSettingType::where('name', 'Receive Email Notifications')->first(); |
22 | - $userList = User::whereHas('UserSetting', function($q) use ($notificationType) |
|
23 | - { |
|
22 | + $userList = User::whereHas('UserSetting', function($q) use ($notificationType) { |
|
24 | 23 | $q->where('setting_type_id', $notificationType->setting_type_id)->where('value', true); |
25 | 24 | })->get(); |
26 | 25 |