@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | /** |
32 | 32 | * is profile of User. |
33 | 33 | * |
34 | - * @return Illuminate\Database\Query Relationship Contact belongs to User query |
|
34 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo Relationship Contact belongs to User query |
|
35 | 35 | */ |
36 | 36 | public function user() |
37 | 37 | { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** |
42 | 42 | * belongs to Business. |
43 | 43 | * |
44 | - * @return Illuminate\Database\Query Relationship Contact is part of Businesses addressbooks query |
|
44 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany Relationship Contact is part of Businesses addressbooks query |
|
45 | 45 | */ |
46 | 46 | public function businesses() |
47 | 47 | { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | /** |
52 | 52 | * has Appointments. |
53 | 53 | * |
54 | - * @return Illuminate\Database\Query Relationship Contact has booked Appointments query |
|
54 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany Relationship Contact has booked Appointments query |
|
55 | 55 | */ |
56 | 56 | public function appointments() |
57 | 57 | { |
@@ -36,7 +36,7 @@ |
||
36 | 36 | /** |
37 | 37 | * [getDefault description]. |
38 | 38 | * |
39 | - * @param [type] $model [description] |
|
39 | + * @param \Timegridio\Concierge\Traits\Preferenceable $model [description] |
|
40 | 40 | * @param [type] $key [description] |
41 | 41 | * |
42 | 42 | * @return [type] [description] |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | /** |
24 | 24 | * Belongs to service type. |
25 | 25 | * |
26 | - * @return Illuminate\Database\Query Relationship Service belongs to type query |
|
26 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo Relationship Service belongs to type query |
|
27 | 27 | */ |
28 | 28 | public function type() |
29 | 29 | { |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | /** |
48 | 48 | * belongs to Business. |
49 | 49 | * |
50 | - * @return Illuminate\Database\Query Relationship Service belongs to Business query |
|
50 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo Relationship Service belongs to Business query |
|
51 | 51 | */ |
52 | 52 | public function business() |
53 | 53 | { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | /** |
36 | 36 | * belongs to Business. |
37 | 37 | * |
38 | - * @return Illuminate\Database\Query Relationship Vacancy belongs to Business query |
|
38 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo Relationship Vacancy belongs to Business query |
|
39 | 39 | */ |
40 | 40 | public function business() |
41 | 41 | { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | /** |
46 | 46 | * for Service. |
47 | 47 | * |
48 | - * @return Illuminate\Database\Query Relationship Vacancy is for providing Service query |
|
48 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo Relationship Vacancy is for providing Service query |
|
49 | 49 | */ |
50 | 50 | public function service() |
51 | 51 | { |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * holds many Appointments. |
57 | 57 | * |
58 | - * @return Illuminate\Database\Query Relationship Vacancy belongs to Business query |
|
58 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany Relationship Vacancy belongs to Business query |
|
59 | 59 | */ |
60 | 60 | public function appointments() |
61 | 61 | { |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | public function scopeForDateTime($query, Carbon $datetime) |
91 | 91 | { |
92 | 92 | return $query->where('start_at', '<=', $datetime->toDateTimeString()) |
93 | - ->where('finish_at', '>=', $datetime->toDateTimeString()); |
|
93 | + ->where('finish_at', '>=', $datetime->toDateTimeString()); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -195,9 +195,9 @@ discard block |
||
195 | 195 | public function hasRoomBetween(Carbon $startAt, Carbon $finishAt) |
196 | 196 | { |
197 | 197 | return $this->capacity > $this->appointments() |
198 | - ->active() |
|
199 | - ->affectingInterval($startAt, $finishAt) |
|
200 | - ->count() && |
|
198 | + ->active() |
|
199 | + ->affectingInterval($startAt, $finishAt) |
|
200 | + ->count() && |
|
201 | 201 | ($this->start_at <= $startAt && $this->finish_at >= $finishAt); |
202 | 202 | } |
203 | 203 |
@@ -542,19 +542,19 @@ |
||
542 | 542 | |
543 | 543 | $query->where(function ($query) use ($startAt, $finishAt) { |
544 | 544 | $query->where('finish_at', '>=', $finishAt->timezone('UTC')) |
545 | - ->where('start_at', '<=', $startAt->timezone('UTC')); |
|
545 | + ->where('start_at', '<=', $startAt->timezone('UTC')); |
|
546 | 546 | }) |
547 | 547 | ->orWhere(function ($query) use ($startAt, $finishAt) { |
548 | 548 | $query->where('finish_at', '<', $finishAt->timezone('UTC')) |
549 | - ->where('finish_at', '>', $startAt->timezone('UTC')); |
|
549 | + ->where('finish_at', '>', $startAt->timezone('UTC')); |
|
550 | 550 | }) |
551 | 551 | ->orWhere(function ($query) use ($startAt, $finishAt) { |
552 | 552 | $query->where('start_at', '>', $startAt->timezone('UTC')) |
553 | - ->where('start_at', '<', $finishAt->timezone('UTC')); |
|
553 | + ->where('start_at', '<', $finishAt->timezone('UTC')); |
|
554 | 554 | }) |
555 | 555 | ->orWhere(function ($query) use ($startAt, $finishAt) { |
556 | 556 | $query->where('start_at', '>', $startAt->timezone('UTC')) |
557 | - ->where('finish_at', '<', $finishAt->timezone('UTC')); |
|
557 | + ->where('finish_at', '<', $finishAt->timezone('UTC')); |
|
558 | 558 | }); |
559 | 559 | |
560 | 560 | }); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | /** |
82 | 82 | * Get the issuer (the User that generated the Appointment). |
83 | 83 | * |
84 | - * @return Illuminate\Database\Eloquent\belongsTo |
|
84 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
85 | 85 | */ |
86 | 86 | public function issuer() |
87 | 87 | { |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | /** |
92 | 92 | * Get the target Contact (for whom is reserved the Appointment). |
93 | 93 | * |
94 | - * @return Illuminate\Database\Eloquent\belongsTo |
|
94 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
95 | 95 | */ |
96 | 96 | public function contact() |
97 | 97 | { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Get the holding Business (that has taken the reservation). |
103 | 103 | * |
104 | - * @return Illuminate\Database\Eloquent\belongsTo |
|
104 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
105 | 105 | */ |
106 | 106 | public function business() |
107 | 107 | { |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | /** |
112 | 112 | * Get the reserved Service. |
113 | 113 | * |
114 | - * @return Illuminate\Database\Eloquent\belongsTo |
|
114 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
115 | 115 | */ |
116 | 116 | public function service() |
117 | 117 | { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * Get the Vacancy (that justifies the availability of resources for the |
123 | 123 | * Appointment generation). |
124 | 124 | * |
125 | - * @return Illuminate\Database\Eloquent\belongsTo |
|
125 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo |
|
126 | 126 | */ |
127 | 127 | public function vacancy() |
128 | 128 | { |
@@ -42,16 +42,16 @@ |
||
42 | 42 | } |
43 | 43 | |
44 | 44 | $fromTime = $this->wrappedObject |
45 | - ->vacancy |
|
46 | - ->start_at |
|
47 | - ->timezone($this->wrappedObject->business->timezone) |
|
48 | - ->format(config('root.time.format')); |
|
45 | + ->vacancy |
|
46 | + ->start_at |
|
47 | + ->timezone($this->wrappedObject->business->timezone) |
|
48 | + ->format(config('root.time.format')); |
|
49 | 49 | |
50 | 50 | $toTime = $this->wrappedObject |
51 | - ->vacancy |
|
52 | - ->finish_at |
|
53 | - ->timezone($this->wrappedObject->business->timezone) |
|
54 | - ->format(config('root.time.format')); |
|
51 | + ->vacancy |
|
52 | + ->finish_at |
|
53 | + ->timezone($this->wrappedObject->business->timezone) |
|
54 | + ->format(config('root.time.format')); |
|
55 | 55 | |
56 | 56 | return ucwords(trans('appointments.text.from_to', ['from' => $fromTime, 'to' => $toTime])); |
57 | 57 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | if (isset($value)) { |
31 | 31 | $this->preferences()->updateOrCreate(['key' => $key], ['value' => $this->cast($value, $type), |
32 | - 'type' => $type, ]); |
|
32 | + 'type' => $type, ]); |
|
33 | 33 | |
34 | 34 | return $value; |
35 | 35 | } |
@@ -42,7 +42,7 @@ |
||
42 | 42 | * Cast value. |
43 | 43 | * |
44 | 44 | * @param mixed $value |
45 | - * @param mixed $type |
|
45 | + * @param string $type |
|
46 | 46 | * |
47 | 47 | * @return mixed Value. |
48 | 48 | */ |
@@ -121,7 +121,6 @@ discard block |
||
121 | 121 | /** |
122 | 122 | * Setter for interval. |
123 | 123 | * |
124 | - * @param int $minutes |
|
125 | 124 | * |
126 | 125 | * @return $this |
127 | 126 | */ |
@@ -280,8 +279,8 @@ discard block |
||
280 | 279 | * Helper method for Arr::set |
281 | 280 | * |
282 | 281 | * @param array &$array |
283 | - * @param mixed $key |
|
284 | - * @param mixed $value |
|
282 | + * @param string $key |
|
283 | + * @param integer $value |
|
285 | 284 | * |
286 | 285 | * @return mixed |
287 | 286 | */ |
@@ -294,7 +293,7 @@ discard block |
||
294 | 293 | * Helper method for Arr::get |
295 | 294 | * |
296 | 295 | * @param array &$array |
297 | - * @param mixed $key |
|
296 | + * @param string $key |
|
298 | 297 | * @param mixed $default |
299 | 298 | * |
300 | 299 | * @return mixed |
@@ -304,6 +303,9 @@ discard block |
||
304 | 303 | return Arr::get($array, $key, $default); |
305 | 304 | } |
306 | 305 | |
306 | + /** |
|
307 | + * @param string $array1 |
|
308 | + */ |
|
307 | 309 | private function array_substitute(&$array1, $array2) |
308 | 310 | { |
309 | 311 | foreach ($array1 as $key => $value) { |
@@ -95,11 +95,11 @@ |
||
95 | 95 | public function buildTimetable($vacancies, $starting = 'today', $days = 1) |
96 | 96 | { |
97 | 97 | $this->timetable |
98 | - ->interval($this->interval) |
|
99 | - ->format('date.service.time') |
|
100 | - ->from($starting) |
|
101 | - ->future($days) |
|
102 | - ->init(); |
|
98 | + ->interval($this->interval) |
|
99 | + ->format('date.service.time') |
|
100 | + ->from($starting) |
|
101 | + ->future($days) |
|
102 | + ->init(); |
|
103 | 103 | |
104 | 104 | foreach ($vacancies as $vacancy) { |
105 | 105 | $this->updateTimeslots($vacancy, $this->interval); |