fix package

src/Models/RecurringSchedule.php

@@ -28,6 +28,16 @@ class RecurringSchedule extends BaseModel
         'expires_at' => 'date',
     ];
 
+    public $days = [
+        1 => 'Monday',
+        2 => 'Tuesday',
+        3 => 'Wednesday',
+        4 => 'Thursday',
+        5 => 'Friday',
+        6 => 'Saturday',
+        7 => 'Sunday',
+    ];
+
     public static function boot()
     {
         parent::boot();
@@ -88,9 +98,9 @@ public function room()
         return $this->belongsTo(app('room'));
     }
 
-    public function rate()
+    public function escaperoom_rate()
     {
-        return $this->belongsTo(app('escaperoom_rate'));
+        return $this->belongsTo(app('escaperoom_rate'), 'escaperoom_rate_id');
     }
 
     /**

src/Nova/Block.php

@@ -56,7 +56,7 @@ public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([
             ID::make()->sortable(),
-            nova('escaperoom_slot') ? BelongsTo::make('EscaperoomSlot', 'slot', nova('slot'))->sortable() : null,
+            nova('escaperoom_slot') ? BelongsTo::make('EscaperoomSlot', 'slot', nova('escaperoom_slot'))->sortable() : null,
             Number::make('Participants')->sortable(),
             Date::make('Created', 'created_at')->sortable(),
             // May include type here was a custom badge like on Feedback
@@ -67,7 +67,7 @@ public function fields(Request $request)
     {
         return array_filter([
 
-            nova('escaperoom_slot') ? BelongsTo::make('EscaperoomSlot', 'slot', nova('slot'))->hideWhenUpdating()->searchable() : null,
+            nova('escaperoom_slot') ? BelongsTo::make('EscaperoomSlot', 'slot', nova('escaperoom_slot'))->hideWhenUpdating()->searchable() : null,
             Number::make('Participants')->hideWhenCreating()->min(0)->max(20)->step(1),
             Select::make('Type')->options([
                 'staffing' => 'Staffing Availability or Issue',

src/Nova/EscaperoomSlot.php

@@ -10,6 +10,7 @@
 use Laravel\Nova\Fields\HasOne;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\MorphMany;
+use Laravel\Nova\Fields\MorphTo;
 use Laravel\Nova\Fields\Number;
 use Laravel\Nova\Fields\Text;
 use Laravel\Nova\Http\Requests\NovaRequest;
@@ -58,6 +59,7 @@ public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([
             ID::make()->sortable(),
+            Text::make('Slot Number')->sortable(),
             Text::make('Room', 'room.id', function () {
                 return $this->resource->room->name;
             })->sortable(),
@@ -79,10 +81,18 @@ public function fields(Request $request)
                 return $this->resource->formatted_start;
             })->exceptOnForms(),
             DateTime::make('Start At')->required(),
-            nova('rate') ? BelongsTo::make('Rate', 'rate', nova('rate'))->hideWhenCreating()->nullable() : null,
+            MorphTo::make('schedule')->types(array_filter([
+                nova('user'),
+                nova('contact'),
+                nova('customer'),
+                nova('order'),
+                nova('booking'),
+                nova('game'),
+                nova('block'),
+                nova('slot'),
+            ]))->nullable(),
             nova('supervision') ? BelongsTo::make('Supervision', 'supervision', nova('supervision'))->hideWhenCreating()->nullable() : null,
             new Panel('Participant Details', $this->participantFields()),
-            nova('booking') ? HasMany::make('Bookings', 'bookings', nova('booking')) : null,
             nova('block') ? HasMany::make('Blocks', 'blocks', nova('block')) : null,
             nova('note') ? MorphMany::make('Notes', 'notes', nova('note')) : null,
             nova('game') ? HasOne::make('Game', 'game', nova('game'))->nullable()->exceptOnForms() : null,

src/Nova/RecurringSchedule.php

@@ -27,18 +27,28 @@ class RecurringSchedule extends BaseResource
 
     /** @psalm-suppress UndefinedClass */
     protected array $filterClassList = [
-        \Tipoff\EscapeRoom\Nova\Filters\Room::class,
-        \Tipoff\EscapeRoom\Nova\Filters\RoomLocation::class,
+        \Tipoff\EscapeRoom\Filters\Room::class,
+        \Tipoff\EscapeRoom\Filters\RoomLocation::class,
     ];
 
     public static function indexQuery(NovaRequest $request, $query)
     {
-        if ($request->user()->hasPermissionTo('all locations')) {
+        if ($request->user()->hasRole([
+            'Admin',
+            'Owner',
+            'Accountant',
+            'Executive',
+            'Reservation Manager',
+            'Reservationist',
+        ])) {
             return $query;
         }
 
-        return $query->select('recurring_schedules.*')
-            ->join('rooms', 'rooms.id', '=', 'recurring_schedules.room_id');
+        /** @psalm-suppress UndefinedMagicMethod */
+        return $request->withOrdering($request->withFilters(
+            $query->select('recurring_schedules.*')
+                ->join('rooms', 'rooms.id', '=', 'recurring_schedules.room_id')
+        ));
     }
 
     public static $group = 'Operations Scheduler';
@@ -50,39 +60,26 @@ public function fieldsForIndex(NovaRequest $request)
         return array_filter([
             ID::make()->sortable(),
             Text::make('Room', 'rooms.id', function () {
-                return $this->resource->room->name;
+                return $this->room->name;
             })->sortable(),
-            Select::make('Day')->options([
-                1 => 'Monday',
-                2 => 'Tuesday',
-                3 => 'Wednesday',
-                4 => 'Thursday',
-                5 => 'Friday',
-                6 => 'Saturday',
-                7 => 'Sunday',
-            ])->displayUsingLabels()->sortable(),
-            TimeField::make('Time')->withTwelveHourTime()->sortable(),
-            Text::make('Rate', 'rate.id', function () {
-                return $this->resource->rate->name ?? null;
+            Text::make('Escaperoom Rate', 'rate', function () {
+                return $this->escaperoom_rate->name;
             })->sortable(),
+            Select::make('Day')->options($this->days)->displayUsingLabels()->sortable(),
+            TimeField::make('Time')->withTwelveHourTime()->sortable(),
         ]);
     }
 
     public function fields(Request $request)
     {
         return array_filter([
             nova('room') ? BelongsTo::make('Room', 'room', nova('room'))->required() : null,
-            Select::make('Day of the Week', 'day')->options([
-                1 => 'Monday',
-                2 => 'Tuesday',
-                3 => 'Wednesday',
-                4 => 'Thursday',
-                5 => 'Friday',
-                6 => 'Saturday',
-                7 => 'Sunday',
-            ])->required(),
+            Select::make('Day of the Week', 'day')->options($this->days)->required(),
+            Text::make('Day of the Week', 'day.week', function () {
+                return $this->days[$this->day];
+            })->sortable()->onlyOnDetail(),
             TimeField::make('Time')->withTwelveHourTime()->required(),
-            nova('rate') ? BelongsTo::make('Rate', 'rate', nova('rate'))->hideWhenCreating()->nullable() : null,
+            nova('escaperoom_rate') ? BelongsTo::make('Escaperoom Rate', 'escaperoom_rate', nova('escaperoom_rate'))->hideWhenCreating()->nullable() : null,
 
             new Panel('Optional Date Fields', $this->dateFields()),