diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 272e52cc..79ee8b3f 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -68,7 +68,7 @@ class EventsTable ->alignRight(), TextColumn::make('away.name') ->searchable(), - Columns3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->label(fn () => view('filament.tables.columns.multiline.labels')), + Columns3way::make('odds3way')->label(fn () => view('filament.tables.columns.multiline.labels')), ]) ->poll('10s') ->defaultSort('starttime', 'ASC') diff --git a/composer.lock b/composer.lock index 16d241ad..dc8fabd2 100644 --- a/composer.lock +++ b/composer.lock @@ -2578,16 +2578,16 @@ }, { "name": "laravel/framework", - "version": "v12.43.1", + "version": "v12.44.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "195b893593a9298edee177c0844132ebaa02102f" + "reference": "592bbf1c036042958332eb98e3e8131b29102f33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/195b893593a9298edee177c0844132ebaa02102f", - "reference": "195b893593a9298edee177c0844132ebaa02102f", + "url": "https://api.github.com/repos/laravel/framework/zipball/592bbf1c036042958332eb98e3e8131b29102f33", + "reference": "592bbf1c036042958332eb98e3e8131b29102f33", "shasum": "" }, "require": { @@ -2796,7 +2796,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2025-12-16T18:53:08+00:00" + "time": "2025-12-23T15:29:43+00:00" }, { "name": "laravel/prompts", diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index 1fa643bb..c6593a3a 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -19,6 +19,7 @@ button[wire\:click="resetTableFiltersForm"] { justify-content: space-between; } +.fi-ta-header-cell-odds3way, .fi-ta-header-cell-id { padding: 0 !important; } \ No newline at end of file diff --git a/resources/views/filament/tables/columns/columns_3way.blade.php b/resources/views/filament/tables/columns/columns_3way.blade.php index b70ac883..3fa1fcfc 100644 --- a/resources/views/filament/tables/columns/columns_3way.blade.php +++ b/resources/views/filament/tables/columns/columns_3way.blade.php @@ -4,9 +4,7 @@ @include('filament.tables.columns.multiline.fumetto') -
- - {{-- @include('filament.tables.columns.multiline.labels') --}} +
@foreach ($getMultilines() as $item) @include('filament.tables.columns.multiline.bkm', [ diff --git a/resources/views/filament/tables/columns/multiline/bkm.blade.php b/resources/views/filament/tables/columns/multiline/bkm.blade.php index 487951fe..bc38f1dc 100644 --- a/resources/views/filament/tables/columns/multiline/bkm.blade.php +++ b/resources/views/filament/tables/columns/multiline/bkm.blade.php @@ -3,7 +3,7 @@ @endphp @if (isset($icon)) -
@endif diff --git a/resources/views/filament/tables/columns/multiline/label.blade.php b/resources/views/filament/tables/columns/multiline/label.blade.php deleted file mode 100644 index d8571cc7..00000000 --- a/resources/views/filament/tables/columns/multiline/label.blade.php +++ /dev/null @@ -1 +0,0 @@ -
{{ $label }}
diff --git a/resources/views/filament/tables/columns/multiline/labels.blade.php b/resources/views/filament/tables/columns/multiline/labels.blade.php index 2acb0697..74910b41 100644 --- a/resources/views/filament/tables/columns/multiline/labels.blade.php +++ b/resources/views/filament/tables/columns/multiline/labels.blade.php @@ -1,56 +1,81 @@ -
-
-
- @switch(auth()->user()->multiline_setting_id) - @case(1) - @case(13) - @include('filament.tables.columns.multiline.label', ['label' => '1']) - @include('filament.tables.columns.multiline.label', ['label' => 'X']) - @include('filament.tables.columns.multiline.label', ['label' => '2']) - @break +@switch(auth()->user()->multiline_setting_id) + @case(1) + @case(13) +
+
+
+
1
+
X
+
2
+
M
+
+ @break - @case(7) - @case(12) + @case(7) + @case(12) - @case(16) - @case(17) + @case(16) + @case(17) - @case(8) - @case(14) + @case(8) + @case(14) - @case(9) - @case(5) - @include('filament.tables.columns.multiline.label', ['label' => 'Home']) - @include('filament.tables.columns.multiline.label', ['label' => 'AWAY']) - @break + @case(9) + @case(5) +
+
+
+
Home
+
Away
+
M
+
+ @break - @case(2) - @include('filament.tables.columns.multiline.label', ['label' => '1X']) - @include('filament.tables.columns.multiline.label', ['label' => '12']) - @include('filament.tables.columns.multiline.label', ['label' => '2X']) - @break + @case(2) +
+
+
+
1X
+
12
+
2X
+
M
+
+ @break - @case(3) - @include('filament.tables.columns.multiline.label', ['label' => 'DNB 1']) - @include('filament.tables.columns.multiline.label', ['label' => 'DNB 2']) - @break + @case(3) +
+
+
+
DNB 1
+
DNB 2
+
M
+
+ @break - @case(4) - @include('filament.tables.columns.multiline.label', ['label' => 'GOAL']) - @include('filament.tables.columns.multiline.label', ['label' => 'NO GOAL']) - @break + @case(4) +
+
+
+
GG
+
NG
+
M
+
+ @break - @case(6) - @case(10) + @case(6) + @case(10) - @case(15) - @case(18) + @case(15) + @case(18) - @case(11) - @include('filament.tables.columns.multiline.label', ['label' => 'O']) - @include('filament.tables.columns.multiline.label', ['label' => 'U']) - @include('filament.tables.columns.multiline.label', ['label' => 'TOTAL']) - @break - @endswitch - @include('filament.tables.columns.multiline.label', ['label' => 'M']) -
+ @case(11) +
+
+
+
O
+
U
+
T
+
M
+
+ @break +@endswitch diff --git a/resources/views/filament/tables/columns/multiline/odds.blade.php b/resources/views/filament/tables/columns/multiline/odds.blade.php index 40ce82a1..e0903452 100644 --- a/resources/views/filament/tables/columns/multiline/odds.blade.php +++ b/resources/views/filament/tables/columns/multiline/odds.blade.php @@ -2,7 +2,7 @@ use App\Utilities\OddsFormatting; @endphp -
+
  @if (isset($odd)) {{ OddsFormatting::get($odd, $decimal) }}