@@ -3,11 +3,9 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use App\Http\Controllers\Controller; |
| 8 | 7 | use App\Departments; |
| 9 | 8 | use App\Department_members; |
| 10 | -use Mail; |
|
| 11 | 9 | use App\User; |
| 12 | 10 | |
| 13 | 11 | class DepartmentsController extends Controller |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | $manager->userid = $request->get('department_manager'); |
| 51 | 51 | $manager->save(); |
| 52 | 52 | |
| 53 | - \Session::flash('message', "New department has been saved"); |
|
| 53 | + \Session::flash('message', "New department has been saved"); |
|
| 54 | 54 | return redirect('staff/departments'); |
| 55 | 55 | } |
| 56 | 56 | |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | * Store a newly created resource in storage. |
| 42 | 42 | * |
| 43 | 43 | * @param \Illuminate\Http\Request $request |
| 44 | - * @return \Illuminate\Http\Response |
|
| 44 | + * @return \Illuminate\Http\RedirectResponse |
|
| 45 | 45 | */ |
| 46 | 46 | public function store(Request $request) |
| 47 | 47 | { |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | * Store a newly created resource in storage. |
| 42 | 42 | * |
| 43 | 43 | * @param \Illuminate\Http\Request $request |
| 44 | - * @return \Illuminate\Http\Response |
|
| 44 | + * @return \Illuminate\Http\RedirectResponse |
|
| 45 | 45 | */ |
| 46 | 46 | public function store(Request $request) |
| 47 | 47 | { |
@@ -3,9 +3,7 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use App\Http\Controllers\Controller; |
| 8 | -use App\Sick; |
|
| 9 | 7 | use App\User; |
| 10 | 8 | |
| 11 | 9 | class SickController extends Controller |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $mailbox = env('MAIL_USERNAME'); |
| 70 | 70 | |
| 71 | 71 | \Session::flash('message', "Information has been saved to the database"); |
| 72 | - \Mail::send('emails.new_sick', ['data' => $data], function ($m) use ($mailbox, $subject) { |
|
| 72 | + \Mail::send('emails.new_sick', ['data' => $data], function($m) use ($mailbox, $subject) { |
|
| 73 | 73 | $m->from($mailbox); |
| 74 | 74 | $m->to("[email protected]")->subject("$subject"); |
| 75 | 75 | }); |
@@ -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'); |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use App\Http\Controllers\Controller; |
| 8 | 7 | use App\User; |
| 9 | 8 | use App\Teams; |
@@ -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 | |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | $mail_password = $request->get('password'); |
| 60 | 60 | \Session::flash('message', "New employee has been added to the application"); |
| 61 | 61 | \Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function ($m) use ($user, $mailbox) { |
| 62 | - $m->from($mailbox); |
|
| 63 | - $m->to($user->email)->subject('Your user credentials!'); |
|
| 64 | - }); |
|
| 62 | + $m->from($mailbox); |
|
| 63 | + $m->to($user->email)->subject('Your user credentials!'); |
|
| 64 | + }); |
|
| 65 | 65 | return redirect('staff'); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -105,9 +105,9 @@ discard block |
||
| 105 | 105 | { |
| 106 | 106 | \Session::flash('message', 'New user role has been created'); |
| 107 | 107 | return redirect('staff/policies'); |
| 108 | - }else { |
|
| 108 | + }else { |
|
| 109 | 109 | return "Mislukt"; |
| 110 | - } |
|
| 110 | + } |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | public function editpolicies($id) |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | public function save_permission(Request $request) |
| 162 | 162 | { |
| 163 | 163 | // $permission_name = $request->get('permission_name'); |
| 164 | - $permission = Permission::create(['name' => $request->get('permission_name')]); |
|
| 164 | + $permission = Permission::create(['name' => $request->get('permission_name')]); |
|
| 165 | 165 | \Session::flash('message', "The new permission has been added to the database"); |
| 166 | 166 | return redirect('staff/permissions'); |
| 167 | 167 | } |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | { |
| 106 | 106 | \Session::flash('message', 'New user role has been created'); |
| 107 | 107 | return redirect('staff/policies'); |
| 108 | - }else { |
|
| 108 | + } else { |
|
| 109 | 109 | return "Mislukt"; |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use App\Http\Controllers\Controller; |
| 8 | 7 | use App\User; |
| 9 | 8 | use App\Teams; |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | * Store a newly created resource in storage. |
| 42 | 42 | * |
| 43 | 43 | * @param \Illuminate\Http\Request $request |
| 44 | - * @return \Illuminate\Http\Response |
|
| 44 | + * @return \Illuminate\Http\RedirectResponse |
|
| 45 | 45 | */ |
| 46 | 46 | public function store(Request $request) |
| 47 | 47 | { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $mailbox = env('MAIL_USERNAME'); |
| 60 | 60 | $mail_password = $request->get('password'); |
| 61 | 61 | \Session::flash('message', "New employee has been added to the application"); |
| 62 | - \Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function ($m) use ($user, $mailbox) { |
|
| 62 | + \Mail::send('emails.new_user', ['user' => $user, 'password' => $mail_password], function($m) use ($user, $mailbox) { |
|
| 63 | 63 | $m->from($mailbox); |
| 64 | 64 | $m->to($user->email)->subject('Your user credentials!'); |
| 65 | 65 | }); |
@@ -102,11 +102,11 @@ discard block |
||
| 102 | 102 | foreach ($request->get('permissions') as $permission) { |
| 103 | 103 | $role->givePermissionTo($permission); |
| 104 | 104 | } |
| 105 | - if($assign_role) |
|
| 105 | + if ($assign_role) |
|
| 106 | 106 | { |
| 107 | 107 | \Session::flash('message', 'New user role has been created'); |
| 108 | 108 | return redirect('staff/policies'); |
| 109 | - }else { |
|
| 109 | + } else { |
|
| 110 | 110 | return "Mislukt"; |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -225,10 +225,10 @@ discard block |
||
| 225 | 225 | $user->address = $request->get('address'); |
| 226 | 226 | $user->email = '[email protected]'; |
| 227 | 227 | |
| 228 | - if(Input::file()) { |
|
| 228 | + if (Input::file()) { |
|
| 229 | 229 | $image = Input::file('avatar'); |
| 230 | - $filename = time() . '.' . $image->getClientOriginalExtension(); |
|
| 231 | - $path = public_path('profilepics/' . $filename); |
|
| 230 | + $filename = time().'.'.$image->getClientOriginalExtension(); |
|
| 231 | + $path = public_path('profilepics/'.$filename); |
|
| 232 | 232 | |
| 233 | 233 | Image::make($image->getRealPath())->resize(200, 200)->save($path); |
| 234 | 234 | $user->image = $filename; |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | public function destroy($id) |
| 247 | 247 | { |
| 248 | - if (! Auth::user()->is('Administrator')) { |
|
| 248 | + if (!Auth::user()->is('Administrator')) { |
|
| 249 | 249 | return Redorect::back(); |
| 250 | 250 | } |
| 251 | 251 | |
@@ -25,6 +25,6 @@ |
||
| 25 | 25 | protected function schedule(Schedule $schedule) |
| 26 | 26 | { |
| 27 | 27 | $schedule->command('inspire') |
| 28 | - ->hourly(); |
|
| 28 | + ->hourly(); |
|
| 29 | 29 | } |
| 30 | 30 | } |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function map(Router $router) |
| 39 | 39 | { |
| 40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
| 40 | + $router->group(['namespace' => $this->namespace], function($router) { |
|
| 41 | 41 | require app_path('Http/routes.php'); |
| 42 | 42 | }); |
| 43 | 43 | } |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use App\Http\Controllers\Controller; |
| 8 | 7 | use App\User; |
| 9 | 8 | use App\Teams; |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | public function boot() |
| 16 | 16 | { |
| 17 | - Bouncer::seeder(function () { |
|
| 17 | + Bouncer::seeder(function() { |
|
| 18 | 18 | Bouncer::allow('Agent'); |
| 19 | 19 | |
| 20 | 20 | Bouncer::allow('Administrator') |