@@ -17,31 +17,31 @@ |
||
17 | 17 | public function dataTable($query) |
18 | 18 | { |
19 | 19 | return datatables($query) |
20 | - ->editColumn('causer_id', function ($activity) { |
|
20 | + ->editColumn('causer_id', function($activity) { |
|
21 | 21 | if ($activity->causer_id && is_object($activity->causer)) { |
22 | - return '<a href="' . route($this->getRouteFromType($activity->causer_type), $activity->causer_id) . '">' . $activity->causer->name ?? '' . '</a>'; |
|
22 | + return '<a href="'.route($this->getRouteFromType($activity->causer_type), $activity->causer_id).'">'.$activity->causer->name ?? ''.'</a>'; |
|
23 | 23 | } else { |
24 | 24 | return ''; |
25 | 25 | } |
26 | 26 | }) |
27 | - ->editColumn('subject_id', function ($activity) { |
|
27 | + ->editColumn('subject_id', function($activity) { |
|
28 | 28 | if ($activity->subject_id && is_object($activity->subject)) { |
29 | - return '<a href="' . route($this->getRouteFromType($activity->subject_type), $activity->subject_id) . '">' . $activity->subject->name ?? '' . '</a>'; |
|
29 | + return '<a href="'.route($this->getRouteFromType($activity->subject_type), $activity->subject_id).'">'.$activity->subject->name ?? ''.'</a>'; |
|
30 | 30 | } else { |
31 | 31 | return ''; |
32 | 32 | } |
33 | 33 | }) |
34 | - ->editColumn('properties', function ($activity) { |
|
34 | + ->editColumn('properties', function($activity) { |
|
35 | 35 | return $activity->properties; |
36 | 36 | }) |
37 | - ->editColumn('created_at', function ($activity) { |
|
37 | + ->editColumn('created_at', function($activity) { |
|
38 | 38 | if ($activity->created_at->diffInDays() > 0) { |
39 | 39 | return $activity->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a'); |
40 | 40 | } else { |
41 | 41 | return $activity->created_at->diffForHumans(); |
42 | 42 | } |
43 | 43 | }) |
44 | - ->rawColumns(['causer_id', 'subject_id', 'properties']); |
|
44 | + ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | public function getRouteFromType($type) { |
@@ -66,7 +66,7 @@ |
||
66 | 66 | $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15); |
67 | 67 | |
68 | 68 | if (\Request::ajax()) |
69 | - return response()->json(['site' => $site, 'locations' => $locations]); |
|
69 | + return response()->json([ 'site' => $site, 'locations' => $locations ]); |
|
70 | 70 | else |
71 | 71 | return view('site.show', [ 'site' => $site, 'locations' => $locations ]); |
72 | 72 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | 'email' => $request->input('email'), |
62 | 62 | 'password' => bcrypt($request->input('password')), |
63 | 63 | 'phone' => $request->input('phone'), |
64 | - 'role' => $request->input('role'),]); |
|
64 | + 'role' => $request->input('role'), ]); |
|
65 | 65 | |
66 | 66 | return redirect()->route('user.show', $user->id) |
67 | 67 | ->with('success', 'User created successfully'); |