@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('appointments', function (Blueprint $table) { |
|
| 15 | + Schema::create('appointments', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->integer('issuer_id')->unsigned()->nullable(); |
| 18 | 18 | $table->foreign('issuer_id')->references('id')->on('users')->onDelete('cascade'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('preferences', function (Blueprint $table) { |
|
| 15 | + Schema::create('preferences', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('key'); |
| 18 | 18 | $table->string('value'); |
@@ -412,10 +412,10 @@ discard block |
||
| 412 | 412 | public function scopeUnarchived($query) |
| 413 | 413 | { |
| 414 | 414 | return $query |
| 415 | - ->where(function ($query) { |
|
| 415 | + ->where(function($query) { |
|
| 416 | 416 | $query->whereIn('status', [Self::STATUS_RESERVED, Self::STATUS_CONFIRMED]) |
| 417 | 417 | ->where('start_at', '<=', Carbon::parse('today midnight')->timezone('UTC')) |
| 418 | - ->orWhere(function ($query) { |
|
| 418 | + ->orWhere(function($query) { |
|
| 419 | 419 | $query->where('start_at', '>=', Carbon::parse('today midnight')->timezone('UTC')); |
| 420 | 420 | }); |
| 421 | 421 | }); |
@@ -538,21 +538,21 @@ discard block |
||
| 538 | 538 | public function scopeAffectingInterval($query, Carbon $startAt, Carbon $finishAt) |
| 539 | 539 | { |
| 540 | 540 | return $query |
| 541 | - ->where(function ($query) use ($startAt, $finishAt) { |
|
| 541 | + ->where(function($query) use ($startAt, $finishAt) { |
|
| 542 | 542 | |
| 543 | - $query->where(function ($query) use ($startAt, $finishAt) { |
|
| 543 | + $query->where(function($query) use ($startAt, $finishAt) { |
|
| 544 | 544 | $query->where('finish_at', '>=', $finishAt->timezone('UTC')) |
| 545 | 545 | ->where('start_at', '<=', $startAt->timezone('UTC')); |
| 546 | 546 | }) |
| 547 | - ->orWhere(function ($query) use ($startAt, $finishAt) { |
|
| 547 | + ->orWhere(function($query) use ($startAt, $finishAt) { |
|
| 548 | 548 | $query->where('finish_at', '<', $finishAt->timezone('UTC')) |
| 549 | 549 | ->where('finish_at', '>', $startAt->timezone('UTC')); |
| 550 | 550 | }) |
| 551 | - ->orWhere(function ($query) use ($startAt, $finishAt) { |
|
| 551 | + ->orWhere(function($query) use ($startAt, $finishAt) { |
|
| 552 | 552 | $query->where('start_at', '>', $startAt->timezone('UTC')) |
| 553 | 553 | ->where('start_at', '<', $finishAt->timezone('UTC')); |
| 554 | 554 | }) |
| 555 | - ->orWhere(function ($query) use ($startAt, $finishAt) { |
|
| 555 | + ->orWhere(function($query) use ($startAt, $finishAt) { |
|
| 556 | 556 | $query->where('start_at', '>', $startAt->timezone('UTC')) |
| 557 | 557 | ->where('finish_at', '<', $finishAt->timezone('UTC')); |
| 558 | 558 | }); |
@@ -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 | } |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | /** |
| 20 | 20 | * Get or set preference value. |
| 21 | 21 | * |
| 22 | - * @param mixed $key |
|
| 22 | + * @param string $key |
|
| 23 | 23 | * @param mixed $value |
| 24 | 24 | * @param string $type |
| 25 | 25 | * |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | |
| 11 | 11 | $results = $this->vacancies->get(); |
| 12 | 12 | |
| 13 | - $results = $results->reject(function ($vacancy) { |
|
| 13 | + $results = $results->reject(function($vacancy) { |
|
| 14 | 14 | |
| 15 | 15 | return !$vacancy->hasRoom(); |
| 16 | 16 | }); |
@@ -16,6 +16,10 @@ |
||
| 16 | 16 | $this->timetable = $timetable; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | + /** |
|
| 20 | + * @param string $starting |
|
| 21 | + * @param integer $days |
|
| 22 | + */ |
|
| 19 | 23 | protected function initTimetable($starting, $days) |
| 20 | 24 | { |
| 21 | 25 | $this->timetable |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Timegridio\Concierge\Timetable\Strategies; |
| 4 | 4 | |
| 5 | -use Timegridio\Concierge\Models\Business; |
|
| 6 | -use Timegridio\Concierge\Models\Service; |
|
| 7 | 5 | use Timegridio\Concierge\Models\Vacancy; |
| 8 | 6 | use Timegridio\Concierge\Timetable\Timetable; |
| 9 | 7 | |
@@ -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); |
@@ -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) { |
@@ -17,10 +17,10 @@ |
||
| 17 | 17 | protected function initTimetable($starting, $days) |
| 18 | 18 | { |
| 19 | 19 | $this->timetable |
| 20 | - ->format('date.service.time') |
|
| 21 | - ->from($starting) |
|
| 22 | - ->future($days) |
|
| 23 | - ->init(); |
|
| 20 | + ->format('date.service.time') |
|
| 21 | + ->from($starting) |
|
| 22 | + ->future($days) |
|
| 23 | + ->init(); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -16,6 +16,10 @@ |
||
| 16 | 16 | $this->timetable = $timetable; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | + /** |
|
| 20 | + * @param string $starting |
|
| 21 | + * @param integer $days |
|
| 22 | + */ |
|
| 19 | 23 | protected function initTimetable($starting, $days) |
| 20 | 24 | { |
| 21 | 25 | $this->timetable |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Timegridio\Concierge; |
| 4 | 4 | |
| 5 | -use Illuminate\Routing\Router; |
|
| 6 | 5 | use Illuminate\Support\ServiceProvider; |
| 7 | 6 | |
| 8 | 7 | class TimegridioConciergeServiceProvider extends ServiceProvider |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | private function registerConcierge() |
| 48 | 48 | { |
| 49 | - $this->app->bind('concierge', function ($app) { |
|
| 49 | + $this->app->bind('concierge', function($app) { |
|
| 50 | 50 | return new Concierge($app); |
| 51 | 51 | }); |
| 52 | 52 | } |