@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace plunner\Http\Controllers\Companies\Auth; |
| 4 | 4 | |
| 5 | -use plunner\Company; |
|
| 6 | -use Validator; |
|
| 7 | -use plunner\Http\Controllers\Controller; |
|
| 8 | 5 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
| 9 | 6 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
| 7 | +use Validator; |
|
| 8 | +use plunner\Company; |
|
| 9 | +use plunner\Http\Controllers\Controller; |
|
| 10 | 10 | |
| 11 | 11 | class AuthController extends Controller |
| 12 | 12 | { |
@@ -4,9 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | 6 | |
| 7 | -use plunner\Http\Requests; |
|
| 8 | -use plunner\Http\Controllers\Controller; |
|
| 9 | 7 | use Tymon\JWTAuth\Facades\JWTAuth; |
| 8 | +use plunner\Http\Controllers\Controller; |
|
| 10 | 9 | |
| 11 | 10 | class ExampleController extends Controller |
| 12 | 11 | { |
@@ -3,13 +3,12 @@ |
||
| 3 | 3 | namespace plunner\Http\Controllers\Employees\Auth; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use plunner\Company; |
|
| 7 | -use plunner\employee; |
|
| 8 | -use Validator; |
|
| 9 | -use plunner\Http\Controllers\Controller; |
|
| 10 | 6 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
| 11 | 7 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
| 12 | -use Log; |
|
| 8 | +use Validator; |
|
| 9 | +use plunner\Company; |
|
| 10 | +use plunner\Http\Controllers\Controller; |
|
| 11 | +use plunner\employee; |
|
| 13 | 12 | |
| 14 | 13 | class AuthController extends Controller |
| 15 | 14 | { |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | namespace plunner\Http\Controllers\Employees\Auth; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use plunner\Http\Controllers\Controller; |
|
| 7 | 6 | use Tymon\JWTAuth\Support\auth\ResetsPasswords; |
| 7 | +use plunner\Http\Controllers\Controller; |
|
| 8 | 8 | use \plunner\Company; |
| 9 | 9 | use \plunner\Employee; |
| 10 | 10 | |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | namespace plunner\Http\Controllers\Employees\Auth; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use plunner\Http\Controllers\Controller; |
|
| 7 | 6 | use Tymon\JWTAuth\Support\auth\ResetsPasswords; |
| 7 | +use plunner\Http\Controllers\Controller; |
|
| 8 | 8 | use \plunner\Company; |
| 9 | 9 | use \plunner\Employee; |
| 10 | 10 | |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | 6 | |
| 7 | -use plunner\Http\Requests; |
|
| 8 | 7 | use plunner\Http\Controllers\Controller; |
| 9 | 8 | |
| 10 | 9 | class GroupsController extends Controller |
@@ -4,9 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | 6 | |
| 7 | -use plunner\Group; |
|
| 8 | -use plunner\Employee; |
|
| 9 | -use plunner\Http\Requests; |
|
| 10 | 7 | use plunner\Http\Controllers\Controller; |
| 11 | 8 | |
| 12 | 9 | class GroupsController extends Controller |
@@ -51,8 +51,9 @@ |
||
| 51 | 51 | |
| 52 | 52 | public function getPlannerNameAttribute() |
| 53 | 53 | { |
| 54 | - if(is_object($this->planner) && $this->planner->exists) |
|
| 55 | - return $this->planner->name; |
|
| 54 | + if(is_object($this->planner) && $this->planner->exists) { |
|
| 55 | + return $this->planner->name; |
|
| 56 | + } |
|
| 56 | 57 | } |
| 57 | 58 | |
| 58 | 59 | /** |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | namespace plunner\Http\Controllers\Companies\Groups; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Support\Facades\Response; |
| 6 | -use plunner\Group; |
|
| 7 | 6 | use plunner\Employee; |
| 7 | +use plunner\Group; |
|
| 8 | 8 | use plunner\Http\Controllers\Controller; |
| 9 | 9 | use plunner\Http\Requests\Companies\Groups\EmployeeRequest; |
| 10 | 10 | |
@@ -71,8 +71,9 @@ |
||
| 71 | 71 | $employee = Employee::findOrFail($employeeId); |
| 72 | 72 | $this->authorize($employee); |
| 73 | 73 | $group = Group::findOrFail($groupId); |
| 74 | - if(!$employee->belongsToGroup($group)) |
|
| 75 | - return Response::json(['error' => 'employId <> groupId'],404); |
|
| 74 | + if(!$employee->belongsToGroup($group)) { |
|
| 75 | + return Response::json(['error' => 'employId <> groupId'],404); |
|
| 76 | + } |
|
| 76 | 77 | $employee->groups()->detach($groupId); |
| 77 | 78 | return $group->employees; |
| 78 | 79 | } |