diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index bac7177e..b1686ee6 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -57,6 +57,7 @@ class EventsTable public static function load_bettype_settings() { $res = BettypeUser::with('multiline_setting')->where('is_active', 1)->get(); + foreach ($res as $value) { self::$bettype_settings[] = $value->multiline_setting->table; } @@ -188,7 +189,7 @@ class EventsTable ->filters([ Filter::make('events') ->schema([ - Select::make('country_id') + Select::make(name: 'country_id') ->placeholder('Country') ->columnSpan(2) ->hiddenLabel() @@ -235,16 +236,16 @@ class EventsTable ->hiddenLabel() ->label('') ->live(), - Action::make('reset') + Action::make('resetAction') ->hiddenLabel() - ->color('gray') + ->color('primary') + ->outlined() ->keyBindings(['esc', 'escape']) ->icon('phosphor-x') ->action(function ($livewire) { $livewire->resetTableFiltersForm(); // Clears all filters $livewire->tableSearch = ''; // Clears the main search bar }), - ]) ->query(function (Builder $query, array $data): Builder { return $query @@ -278,7 +279,7 @@ class EventsTable } ); }) - ->columns(10)->columnSpan(10), + ->columns(12)->columnSpan(12), ], layout: FiltersLayout::AboveContent) ->filtersFormColumns(6) ->deferFilters(false) diff --git a/app/Livewire/BettypeToggle.php b/app/Livewire/BettypeToggle.php index 27191a9e..6f02a5ab 100644 --- a/app/Livewire/BettypeToggle.php +++ b/app/Livewire/BettypeToggle.php @@ -18,7 +18,7 @@ class BettypeToggle extends Component { $this->multilines = []; - $res = BettypeUser::with('multiline_setting')->orderBy('multiline_setting_id')->get(); + $res = BettypeUser::with('multiline_setting')->get(); foreach ($res as $set) { $this->multilines[] = [ diff --git a/app/Models/Event.php b/app/Models/Event.php index fd9ae49f..e67f8cea 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -40,7 +40,7 @@ class Event extends Model public function sport() { - return $this->belongsTo(Sport::class); + return $this->belongsTo(Sport::class)->where('is_active', 1); } public function country() diff --git a/resources/views/livewire/bettype-toggle.blade.php b/resources/views/livewire/bettype-toggle.blade.php index 841d46c5..d7974c08 100644 --- a/resources/views/livewire/bettype-toggle.blade.php +++ b/resources/views/livewire/bettype-toggle.blade.php @@ -1,4 +1,4 @@ -