@@ -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(); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | public function handle(ErrorEvent $event) |
| 26 | 26 | { |
| 27 | 27 | // |
| 28 | - \Log::info('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError()); |
|
| 28 | + \Log::info('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError()); |
|
| 29 | 29 | $company = $event->getCompany(); |
| 30 | 30 | //$company = $event->getCompany()->fresh(); |
| 31 | 31 | self::sendEmail($company->email, $event->getError()); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | static private function sendEmail($email, $error) |
| 39 | 39 | { |
| 40 | - \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) { |
|
| 40 | + \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) { |
|
| 41 | 41 | $message->from(config('mail.from.address'), config('mail.from.name')); |
| 42 | 42 | $message->to($email)->subject('Problems during optimisation'); |
| 43 | 43 | }); |
@@ -25,7 +25,7 @@ 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); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | static private function sendCompanyEmail($email) |
| 42 | 42 | { |
| 43 | - \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) { |
|
| 43 | + \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) { |
|
| 44 | 44 | $message->from(config('mail.from.address'), config('mail.from.name')); |
| 45 | 45 | $message->to($email)->subject('Meetings optimised'); |
| 46 | 46 | }); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | static private function sendEmployeeEmail($email, $meetings) |
| 54 | 54 | { |
| 55 | - \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) { |
|
| 55 | + \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) { |
|
| 56 | 56 | $message->from(config('mail.from.address'), config('mail.from.name')); |
| 57 | 57 | $message->to($email)->subject('Meetings of next week'); |
| 58 | 58 | }); |
@@ -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 | |
@@ -13,8 +13,8 @@ discard block |
||
| 13 | 13 | { |
| 14 | 14 | public function __construct() |
| 15 | 15 | { |
| 16 | - config(['auth.model' => \plunner\Planner::class]); |
|
| 17 | - config(['jwt.user' => \plunner\Planner::class]); |
|
| 16 | + config([ 'auth.model' => \plunner\Planner::class ]); |
|
| 17 | + config([ 'jwt.user' => \plunner\Planner::class ]); |
|
| 18 | 18 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | $this->authorize($group); |
| 33 | 33 | $meetings = $group->meetings(); |
| 34 | 34 | if ($request->query('current')) |
| 35 | - $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)... |
|
| 36 | - $query->where('start_time', '=', NULL);//to be planned |
|
| 35 | + $meetings->where(function($query) { //parenthesis for conditions ...(C1 OR C2)... |
|
| 36 | + $query->where('start_time', '=', NULL); //to be planned |
|
| 37 | 37 | //datetime to consider timezone, don't use mysql NOW() |
| 38 | - $query->orWhere('start_time', '>=', new \DateTime());//planned |
|
| 38 | + $query->orWhere('start_time', '>=', new \DateTime()); //planned |
|
| 39 | 39 | }); |
| 40 | 40 | |
| 41 | 41 | return $meetings->get(); |