@@ -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 |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | 'm.d.Y' => '12.23.2010', |
| 31 | 31 | ); |
| 32 | 32 | |
| 33 | - $data['time_formats'] = array ( |
|
| 33 | + $data['time_formats'] = array( |
|
| 34 | 34 | 'H:i' => '23:00', |
| 35 | 35 | 'h:ia' => '11:00pm', |
| 36 | 36 | 'h:iA' => '11:00PM', |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $config->set('time', $request->get('time')); |
| 63 | 63 | $config->save(); |
| 64 | 64 | |
| 65 | - if ($config){ |
|
| 65 | + if ($config) { |
|
| 66 | 66 | sleep(2); |
| 67 | 67 | session()->flash('message', 'Settings have been saved'); |
| 68 | 68 | return redirect('settings/general'); |
@@ -66,9 +66,7 @@ |
||
| 66 | 66 | sleep(2); |
| 67 | 67 | session()->flash('message', 'Settings have been saved'); |
| 68 | 68 | return redirect('settings/general'); |
| 69 | - } |
|
| 70 | - |
|
| 71 | - else { |
|
| 69 | + } else { |
|
| 72 | 70 | session()->flash('message', 'Settings have not been saved, please verify'); |
| 73 | 71 | return redirect('settings/general'); |
| 74 | 72 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | 'Y.m.d' => '2010.12.23', |
| 29 | 29 | 'd.m.Y' => '23.12.2010', |
| 30 | 30 | 'm.d.Y' => '12.23.2010', |
| 31 | - ); |
|
| 31 | + ); |
|
| 32 | 32 | |
| 33 | 33 | $data['time_formats'] = array ( |
| 34 | 34 | 'H:i' => '23:00', |
@@ -36,14 +36,14 @@ discard block |
||
| 36 | 36 | 'h:iA' => '11:00PM', |
| 37 | 37 | 'h:i a' => '11:00 pm', |
| 38 | 38 | 'h:i A' => '11:00 PM', |
| 39 | - ); |
|
| 39 | + ); |
|
| 40 | 40 | |
| 41 | 41 | $data['title'] = config('timecontrol.title'); |
| 42 | 42 | $data['email'] = config('timecontrol.email'); |
| 43 | 43 | $data['date'] = config('timecontrol.date'); |
| 44 | 44 | $data['time'] = config('timecontrol.time'); |
| 45 | 45 | |
| 46 | - return view('settings/basic', $data); |
|
| 46 | + return view('settings/basic', $data); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | session()->flash('message', 'Settings have not been saved, please verify'); |
| 73 | 73 | return redirect('settings/general'); |
| 74 | 74 | } |
| 75 | - } |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | 78 | * Display a form to configure the backup settings. |
@@ -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 |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function store(Request $request) |
| 39 | 39 | { |
| 40 | - // |
|
| 40 | + // |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -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 | { |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | |
| 73 | 73 | $injectionData = ['user' => $user, 'password' => $mail_password]; |
| 74 | 74 | |
| 75 | - Mail::send('emails.new_user', $injectionData, function ($m) use ($user, $mailbox) { |
|
| 75 | + Mail::send('emails.new_user', $injectionData, function($m) use ($user, $mailbox) { |
|
| 76 | 76 | $m->from($mailbox); |
| 77 | 77 | $m->to($user->email)->subject('Your user credentials!'); |
| 78 | 78 | }); |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use App\Http\Requests; |
| 7 | 7 | use App\Departments; |
| 8 | 8 | use App\Department_members; |
| 9 | -use Mail; |
|
| 10 | 9 | use App\User; |
| 11 | 10 | |
| 12 | 11 | class DepartmentsController extends Controller |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * Store a newly created resource in storage. |
| 36 | 36 | * |
| 37 | 37 | * @param \Illuminate\Http\Request $request |
| 38 | - * @return \Illuminate\Http\Response |
|
| 38 | + * @return \Illuminate\Http\RedirectResponse |
|
| 39 | 39 | */ |
| 40 | 40 | public function store(Request $request) |
| 41 | 41 | { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * Remove the specified resource from storage. |
| 86 | 86 | * |
| 87 | 87 | * @param int $id |
| 88 | - * @return \Illuminate\Http\Response |
|
| 88 | + * @return \Illuminate\Http\RedirectResponse |
|
| 89 | 89 | */ |
| 90 | 90 | public function destroy($id) |
| 91 | 91 | { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Tasks; |
| 6 | 6 | use Illuminate\Http\Request; |
| 7 | - |
|
| 8 | 7 | use App\Http\Requests; |
| 9 | 8 | use App\Http\Controllers\Controller; |
| 10 | 9 | |