@@ -48,14 +48,14 @@ discard block |
||
48 | 48 | * |
49 | 49 | * @var array |
50 | 50 | */ |
51 | - protected $fillable = ['name', 'email', 'password']; |
|
51 | + protected $fillable = [ 'name', 'email', 'password' ]; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * The attributes excluded from the model's JSON form. |
55 | 55 | * |
56 | 56 | * @var array |
57 | 57 | */ |
58 | - protected $hidden = ['password', 'remember_token']; |
|
58 | + protected $hidden = [ 'password', 'remember_token' ]; |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * @return \Illuminate\Database\Eloquent\Relations\HasMany |
@@ -120,8 +120,8 @@ discard block |
||
120 | 120 | ->where('calendars.enabled', '=', '1') |
121 | 121 | ->where('timeslots.time_start', '>=', $from) |
122 | 122 | ->where('timeslots.time_end', '<=', $to) |
123 | - ->where('employees.company_id','=', $this->id) |
|
124 | - ->select('employees.id','timeslots.time_start','timeslots.time_end') |
|
123 | + ->where('employees.company_id', '=', $this->id) |
|
124 | + ->select('employees.id', 'timeslots.time_start', 'timeslots.time_end') |
|
125 | 125 | ->get(); |
126 | 126 | } |
127 | 127 | |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | ->join('meeting_timeslots', 'meetings.id', '=', 'meeting_timeslots.meeting_id') |
138 | 138 | ->where('meeting_timeslots.time_start', '>=', $from) |
139 | 139 | ->where('meeting_timeslots.time_end', '<=', $to) |
140 | - ->where('groups.company_id','=', $this->id) |
|
141 | - ->where('meetings.start_time','=', NULL) |
|
142 | - ->select('meetings.id', 'meetings.duration','meeting_timeslots.time_start','meeting_timeslots.time_end') |
|
140 | + ->where('groups.company_id', '=', $this->id) |
|
141 | + ->where('meetings.start_time', '=', NULL) |
|
142 | + ->select('meetings.id', 'meetings.duration', 'meeting_timeslots.time_start', 'meeting_timeslots.time_end') |
|
143 | 143 | ->get(); |
144 | 144 | } |
145 | 145 | |
@@ -151,8 +151,8 @@ discard block |
||
151 | 151 | ->join('employees', 'employee_group.employee_id', '=', 'employees.id') |
152 | 152 | ->whereIn('employees.id', $users) |
153 | 153 | ->whereIn('meetings.id', $meetings) |
154 | - ->where('groups.company_id','=', $this->id) //this is not needed |
|
155 | - ->where('employees.company_id','=', $this->id) //this is not needed |
|
154 | + ->where('groups.company_id', '=', $this->id) //this is not needed |
|
155 | + ->where('employees.company_id', '=', $this->id) //this is not needed |
|
156 | 156 | ->select('employees.id as employee_id', 'meetings.id as meeting_id') |
157 | 157 | ->get(); |
158 | 158 | } |