Skip to content

demo related fixes #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arwaawan3 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

demo related fixes #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d54b54
demo related fixes
arwaawan May 20, 2021
faceccf
fix php-cs-fixer
arwaawan May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
ref: ${{ github.head_ref }}

- name: Run PHP CS Fixer
uses: docker://oskarstark/php-cs-fixer-ga
uses: docker://oskarstark/php-cs-fixer-ga:2.18.6
with:
args: --config=.php_cs.dist --allow-risky=yes

Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"require": {
"php": "^7.4|^8.0",
"laraning/nova-time-field": "^1.2",
"tipoff/authorization": "^2.8.6",
"tipoff/authorization": "^2.10.0",
"tipoff/bookings": "^3.0.0",
"tipoff/escape-room": "^2.3.4",
"tipoff/locations": "^2.12",
"tipoff/support": "^2.1.5"
"tipoff/escape-room": "^2.4.0",
"tipoff/locations": "^2.14.1",
"tipoff/support": "^2.2.0"
},
"require-dev": {
"tipoff/test-support": "^2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/Models/EscaperoomSlot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public function room()

public function rate()
{
return $this->belongsTo(app('rate'));
return $this->belongsTo(app('escaperoom_rate'), 'escaperoom_rate_id');
}

public function game()
Expand Down
6 changes: 3 additions & 3 deletions src/Services/EscaperoomSchedulingService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Services;
namespace Tipoff\Scheduler\Services;

use Carbon\Carbon;
use Illuminate\Support\Collection;
Expand Down Expand Up @@ -49,7 +49,7 @@ public function getLocationSlotsForDateRange($locationId, $initialDate, $finalDa
$finalDate = $initialDate;
}

$items = app('slot')->whereDate('date', '<=', $finalDate)
$items = app('escaperoom_slot')->whereDate('date', '<=', $finalDate)
->whereDate('date', '>=', $initialDate)
->whereHas('room', function ($query) use ($locationId) {
return $query->where('location_id', $locationId);
Expand All @@ -74,7 +74,7 @@ public function getRoomSlotsForDateRange($roomId, $initialDate, $finalDate = nul
$finalDate = $initialDate;
}

$items = app('slot')
$items = app('escaperoom_slot')
->whereDate('date', '<=', $finalDate)
->whereDate('date', '>=', $initialDate)
->where('room_id', $roomId)
Expand Down