@@ -14,7 +14,8 @@ |
||
14 | 14 | */ |
15 | 15 | protected function redirectTo($request) |
16 | 16 | { |
17 | - if (! $request->expectsJson()) { |
|
17 | + if (! $request->expectsJson()) |
|
18 | + { |
|
18 | 19 | return route('login.index'); |
19 | 20 | } |
20 | 21 | } |
@@ -21,8 +21,10 @@ |
||
21 | 21 | { |
22 | 22 | $guards = empty($guards) ? [null] : $guards; |
23 | 23 | |
24 | - foreach ($guards as $guard) { |
|
25 | - if (Auth::guard($guard)->check()) { |
|
24 | + foreach ($guards as $guard) |
|
25 | + { |
|
26 | + if (Auth::guard($guard)->check()) |
|
27 | + { |
|
26 | 28 | return redirect(RouteServiceProvider::HOME); |
27 | 29 | } |
28 | 30 | } |
@@ -29,8 +29,7 @@ discard block |
||
29 | 29 | ($request->city == null && |
30 | 30 | $request->name == null && |
31 | 31 | $request->equipment == null) |
32 | - ) |
|
33 | - { |
|
32 | + ) { |
|
34 | 33 | return $this->getAllCustomers(); |
35 | 34 | } |
36 | 35 | |
@@ -45,25 +44,20 @@ discard block |
||
45 | 44 | { |
46 | 45 | return Customer::orderBy($this->sortField, $this->sortType) |
47 | 46 | // Search by equipment |
48 | - ->when(isset($params['equipment']), function($q) use ($params) |
|
49 | - { |
|
50 | - $q->whereHas('ParentEquipment', function($q2) use ($params) |
|
51 | - { |
|
47 | + ->when(isset($params['equipment']), function($q) use ($params) { |
|
48 | + $q->whereHas('ParentEquipment', function($q2) use ($params) { |
|
52 | 49 | $q2->where('name', $params['equipment']); |
53 | 50 | }) |
54 | - ->orWhereHas('EquipmentType', function($q2) use ($params) |
|
55 | - { |
|
51 | + ->orWhereHas('EquipmentType', function($q2) use ($params) { |
|
56 | 52 | $q2->where('name', $params['equipment']); |
57 | 53 | }); |
58 | 54 | }) |
59 | 55 | // Search by City |
60 | - ->when(isset($params['city']), function($q) use ($params) |
|
61 | - { |
|
56 | + ->when(isset($params['city']), function($q) use ($params) { |
|
62 | 57 | $q->where('city', 'like', '%'.$params['city'].'%'); |
63 | 58 | }) |
64 | 59 | // Search by Name or ID |
65 | - ->when(isset($params['name']), function($q) use ($params) |
|
66 | - { |
|
60 | + ->when(isset($params['name']), function($q) use ($params) { |
|
67 | 61 | $q->where('name', 'like', '%'.$params['name'].'%') |
68 | 62 | ->orWhere('cust_id', 'like', '%'.$params['name'].'%') |
69 | 63 | ->orWhere('dba_name', 'like', '%'.$params['name'].'%'); |
@@ -12,8 +12,7 @@ |
||
12 | 12 | { |
13 | 13 | protected function checkPermission(User $user, $description) |
14 | 14 | { |
15 | - $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) use ($description) |
|
16 | - { |
|
15 | + $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) use ($description) { |
|
17 | 16 | $q->where('description', $description); |
18 | 17 | })->first(); |
19 | 18 |
@@ -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 | }) |
@@ -20,8 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | $status = Password::reset( |
22 | 22 | $request->only('email', 'password', 'password_confirmation', 'token'), |
23 | - function($user, $password) |
|
24 | - { |
|
23 | + function($user, $password) { |
|
25 | 24 | // Determine the new expiration date |
26 | 25 | $expires = config('auth.passwords.settings.expire') ? Carbon::now()->addDays(config('auth.passwords.settings.expire')) : null; |
27 | 26 |
@@ -19,8 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | $this->configureRateLimiting(); |
21 | 21 | |
22 | - $this->routes(function () |
|
23 | - { |
|
22 | + $this->routes(function () { |
|
24 | 23 | // Basic Login and Logout Routes |
25 | 24 | Route::middleware('web') |
26 | 25 | ->namespace($this->namespace) |
@@ -15,8 +15,7 @@ |
||
15 | 15 | */ |
16 | 16 | public function adminLink(User $user) |
17 | 17 | { |
18 | - $userRole = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) |
|
19 | - { |
|
18 | + $userRole = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) { |
|
20 | 19 | $q->whereIsAdminLink(1); |
21 | 20 | })->whereAllow(1)->count(); |
22 | 21 |
@@ -65,7 +65,8 @@ |
||
65 | 65 | $fileType = CustomerFileType::find($id); |
66 | 66 | $this->authorize('delete', $fileType); |
67 | 67 | |
68 | - try{ |
|
68 | + try |
|
69 | + { |
|
69 | 70 | $fileType->delete(); |
70 | 71 | } |
71 | 72 | // The deletion may fail if the file type is currently in use |