@@ -72,8 +72,8 @@ |
||
72 | 72 | \Mail::send('emails.new_sick', ['data' => $data], function ($m) use ($mailbox, $subject) { |
73 | 73 | $m->from($mailbox); |
74 | 74 | /** Send confirmation mail to all managers in the department from the user. |
75 | - *$m->to("")->subject("$subject"); |
|
76 | - */ |
|
75 | + *$m->to("")->subject("$subject"); |
|
76 | + */ |
|
77 | 77 | }); |
78 | 78 | |
79 | 79 | return redirect('sick'); |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | public function index() |
20 | 20 | { |
21 | - $teams = Teams::orderBy('name', 'asc')->paginate(10);; |
|
21 | + $teams = Teams::orderBy('name', 'asc')->paginate(10); ; |
|
22 | 22 | return view('teams/list', ['teams' => $teams]); |
23 | 23 | } |
24 | 24 |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use App\Http\Requests; |
|
8 | 6 | use App\Http\Controllers\Controller; |
9 | 7 | |
10 | 8 | class SettingsController extends Controller |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | 'Y.m.d' => '2010.12.23', |
28 | 28 | 'd.m.Y' => '23.12.2010', |
29 | 29 | 'm.d.Y' => '12.23.2010', |
30 | - ); |
|
30 | + ); |
|
31 | 31 | |
32 | 32 | $time_formats = array ( |
33 | 33 | 'H:i' => '23:00', |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | 'h:iA' => '11:00PM', |
36 | 36 | 'h:i a' => '11:00 pm', |
37 | 37 | 'h:i A' => '11:00 PM', |
38 | - ); |
|
38 | + ); |
|
39 | 39 | |
40 | - return view('settings/basic', ['date_formats' => $date_formats, 'time_formats' => $time_formats]); |
|
40 | + return view('settings/basic', ['date_formats' => $date_formats, 'time_formats' => $time_formats]); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -29,7 +29,7 @@ |
||
29 | 29 | 'm.d.Y' => '12.23.2010', |
30 | 30 | ); |
31 | 31 | |
32 | - $time_formats = array ( |
|
32 | + $time_formats = array( |
|
33 | 33 | 'H:i' => '23:00', |
34 | 34 | 'h:ia' => '11:00pm', |
35 | 35 | 'h:iA' => '11:00PM', |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use App\Http\Requests; |
|
8 | 6 | use App\Http\Controllers\Controller; |
9 | 7 | |
10 | 8 | class SettingsController extends Controller |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use App\Http\Requests; |
|
8 | 6 | use App\Http\Controllers\Controller; |
9 | 7 | |
10 | 8 | class SettingsController extends Controller |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * Store a newly created employee in storage. |
48 | 48 | * |
49 | 49 | * @param Request $request |
50 | - * @return mixed |
|
50 | + * @return \Illuminate\Http\RedirectResponse |
|
51 | 51 | */ |
52 | 52 | public function store(Request $request) |
53 | 53 | { |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * |
79 | 79 | * @param Int, $id |
80 | 80 | * @param Request $request |
81 | - * @return mixed |
|
81 | + * @return \Illuminate\Http\RedirectResponse |
|
82 | 82 | */ |
83 | 83 | public function updateUser($id, Request $request) |
84 | 84 | { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * Remove the user role. |
151 | 151 | * |
152 | 152 | * @param int, $id |
153 | - * @return redirect |
|
153 | + * @return \Illuminate\Http\RedirectResponse |
|
154 | 154 | */ |
155 | 155 | public function destroyRole($id) |
156 | 156 | { |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | * Save the new permission. |
184 | 184 | * |
185 | 185 | * @param Request $request |
186 | - * @return redirect |
|
186 | + * @return \Illuminate\Http\RedirectResponse |
|
187 | 187 | */ |
188 | 188 | public function save_permission(Request $request) |
189 | 189 | { |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | * Update the specified resource in storage. |
250 | 250 | * |
251 | 251 | * @param \Illuminate\Http\Request $request |
252 | - * @return \Illuminate\Http\Response |
|
252 | + * @return \Illuminate\Http\RedirectResponse |
|
253 | 253 | */ |
254 | 254 | public function update(Request $request) |
255 | 255 | { |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $mail_password = $request->get('password'); |
66 | 66 | session()->flash('message', "New employee has been added to the application"); |
67 | 67 | |
68 | - Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function ($m) use ($user, $mailbox) { |
|
68 | + Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function($m) use ($user, $mailbox) { |
|
69 | 69 | $m->from($mailbox); |
70 | 70 | $m->to($user->email)->subject('Your user credentials!'); |
71 | 71 | }); |
@@ -262,8 +262,8 @@ discard block |
||
262 | 262 | |
263 | 263 | if (Input::file()) { |
264 | 264 | $image = Input::file('avatar'); |
265 | - $filename = time() . '.' . $image->getClientOriginalExtension(); |
|
266 | - $path = public_path('profilepics/' . $filename); |
|
265 | + $filename = time().'.'.$image->getClientOriginalExtension(); |
|
266 | + $path = public_path('profilepics/'.$filename); |
|
267 | 267 | |
268 | 268 | Image::make($image->getRealPath())->resize(200, 200)->save($path); |
269 | 269 | $user->image = $filename; |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | */ |
283 | 283 | public function destroy($id) |
284 | 284 | { |
285 | - if (! Auth::user()->is('Administrator')) { |
|
285 | + if (!Auth::user()->is('Administrator')) { |
|
286 | 286 | return Redirect::back(); |
287 | 287 | } |
288 | 288 |