@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | { |
12 | 12 | public function __construct() |
13 | 13 | { |
14 | - config(['auth.model' => \plunner\Employee::class]); |
|
15 | - config(['jwt.user' => \plunner\Employee::class]); |
|
14 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
15 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
16 | 16 | $this->middleware('jwt.authandrefresh:mode-en'); |
17 | 17 | } |
18 | 18 | |
@@ -24,9 +24,9 @@ discard block |
||
24 | 24 | public function index() |
25 | 25 | { |
26 | 26 | $employee = \Auth::user(); |
27 | - return $employee->groups()->with(['meetings' => function ($query) { |
|
27 | + return $employee->groups()->with([ 'meetings' => function($query) { |
|
28 | 28 | $query->where('start_time', '=', NULL); |
29 | - }])->get(); |
|
29 | + } ])->get(); |
|
30 | 30 | //TODO get only current meetings via a query |
31 | 31 | } |
32 | 32 |
@@ -30,6 +30,6 @@ |
||
30 | 30 | 'auth' => \plunner\Http\Middleware\Authenticate::class, |
31 | 31 | 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, |
32 | 32 | 'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class, |
33 | - 'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh', |
|
33 | + 'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh', |
|
34 | 34 | ]; |
35 | 35 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | public function rules() |
25 | 25 | { |
26 | 26 | return [ |
27 | - 'name' => 'sometimes|required|min:1|max:255|unique:companies,name,' . $this->user()->id, |
|
27 | + 'name' => 'sometimes|required|min:1|max:255|unique:companies,name,'.$this->user()->id, |
|
28 | 28 | 'password' => 'sometimes|required|confirmed|min:6', |
29 | 29 | ]; |
30 | 30 | } |
@@ -32,8 +32,8 @@ |
||
32 | 32 | { |
33 | 33 | return [ |
34 | 34 | 'name' => 'required|min:1|max:255', |
35 | - 'email' => 'required|email|max:255|unique:employees,email,' . $this->route('employees') . ',id,company_id,' . $this->user()->id, |
|
36 | - 'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|') . 'required|confirmed|min:6', |
|
35 | + 'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id, |
|
36 | + 'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|').'required|confirmed|min:6', |
|
37 | 37 | ]; |
38 | 38 | } |
39 | 39 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | public function rules() |
32 | 32 | { |
33 | 33 | return [ |
34 | - 'id' => 'required|array|exists:employees,id,company_id,' . $this->user()->id, |
|
34 | + 'id' => 'required|array|exists:employees,id,company_id,'.$this->user()->id, |
|
35 | 35 | ]; |
36 | 36 | } |
37 | 37 | } |
@@ -31,9 +31,9 @@ |
||
31 | 31 | public function rules() |
32 | 32 | { |
33 | 33 | return [ |
34 | - 'name' => 'required|max:255|unique:groups,name,' . $this->route('groups') . ',id,company_id,' . $this->user()->id, |
|
34 | + 'name' => 'required|max:255|unique:groups,name,'.$this->route('groups').',id,company_id,'.$this->user()->id, |
|
35 | 35 | 'description' => 'sometimes|required|max:255', |
36 | - 'planner_id' => 'required|exists:employees,id,company_id,' . $this->user()->id, |
|
36 | + 'planner_id' => 'required|exists:employees,id,company_id,'.$this->user()->id, |
|
37 | 37 | ]; |
38 | 38 | } |
39 | 39 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function handle(ErrorEvent $event) |
27 | 27 | { |
28 | 28 | // |
29 | - \Log::info('problems during caldav (calendar id = ' . $event->getCalendar()->calendar_id . ') sync: ' . $event->getError()); |
|
29 | + \Log::info('problems during caldav (calendar id = '.$event->getCalendar()->calendar_id.') sync: '.$event->getError()); |
|
30 | 30 | $calendar = $event->getCalendar(); |
31 | 31 | //$calendar = $event->getCalendar()->fresh(); |
32 | 32 | $calendar->sync_errors = $event->getError(); |
@@ -31,8 +31,9 @@ |
||
31 | 31 | self::sendCompanyEmail($company->email); |
32 | 32 | //send emails to employees |
33 | 33 | $employees = $company->employees()->with('meetings')->get(); |
34 | - foreach ($employees as $employee) |
|
35 | - self::sendEmployeeEmail($employee->email, $employee->meetings); |
|
34 | + foreach ($employees as $employee) { |
|
35 | + self::sendEmployeeEmail($employee->email, $employee->meetings); |
|
36 | + } |
|
36 | 37 | } |
37 | 38 | |
38 | 39 | /** |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | public function handle(OkEvent $event) |
26 | 26 | { |
27 | 27 | // |
28 | - \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')'); |
|
28 | + \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')'); |
|
29 | 29 | $company = $event->getCompany()->fresh(); |
30 | 30 | //send email to company |
31 | 31 | self::sendCompanyEmail($company->email); |
32 | 32 | //send emails to employees |
33 | - $employees = $company->employees()->with(['meetings'=>function($query){ |
|
33 | + $employees = $company->employees()->with([ 'meetings'=>function($query) { |
|
34 | 34 | $query->where('start_time', '>=', new \DateTime()); |
35 | - }])->get(); |
|
35 | + } ])->get(); |
|
36 | 36 | foreach ($employees as $employee) |
37 | 37 | self::sendEmployeeEmail($employee->email, $employee->meetings); |
38 | 38 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | static private function sendCompanyEmail($email) |
44 | 44 | { |
45 | - \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) { |
|
45 | + \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) { |
|
46 | 46 | $message->from(config('mail.from.address'), config('mail.from.name')); |
47 | 47 | $message->to($email)->subject('Meetings optimised'); |
48 | 48 | }); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | static private function sendEmployeeEmail($email, $meetings) |
56 | 56 | { |
57 | - \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) { |
|
57 | + \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) { |
|
58 | 58 | $message->from(config('mail.from.address'), config('mail.from.name')); |
59 | 59 | $message->to($email)->subject('Meetings of next week'); |
60 | 60 | }); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | */ |
57 | 57 | public function verifyEmployee(Employee $employee) |
58 | 58 | { |
59 | - $group = $this->groupsManaged()->whereHas('employees', function ($query) use ($employee) { |
|
59 | + $group = $this->groupsManaged()->whereHas('employees', function($query) use ($employee) { |
|
60 | 60 | $query->where('employees.id', $employee->id); |
61 | 61 | })->first(); |
62 | 62 |