From 87871c09fac509c9a89e05d72a59ca1ead6a6474 Mon Sep 17 00:00:00 2001 From: salam Date: Tue, 3 Feb 2026 20:16:04 +0100 Subject: [PATCH] disable double when comapare and in lis view all --- app/Filament/Tables/Columns/ColumnOdds.php | 10 + .../multiline/multilines-all.blade.php | 249 +++++++++--------- 2 files changed, 136 insertions(+), 123 deletions(-) diff --git a/app/Filament/Tables/Columns/ColumnOdds.php b/app/Filament/Tables/Columns/ColumnOdds.php index bed7adbd..8b20456c 100644 --- a/app/Filament/Tables/Columns/ColumnOdds.php +++ b/app/Filament/Tables/Columns/ColumnOdds.php @@ -30,6 +30,8 @@ class ColumnOdds extends Column protected $filter_compare_bookmaker; + protected $compare_bookmaker_id; + protected $filter_compare_mode; protected $favorits = []; @@ -176,6 +178,11 @@ class ColumnOdds extends Column return $this->favorits; } + public function getCompareBookmakerId() + { + return $this->compare_bookmaker_id; + } + public function getData($record) { $this->client = null; @@ -428,6 +435,7 @@ class ColumnOdds extends Column public function setCompare($record) { $this->compare = null; + $this->compare_bookmaker_id = 0; $this->data->filter(function ($model) { @@ -439,12 +447,14 @@ class ColumnOdds extends Column if ($this->bettype == 'odds_dc') { if ($model->margin <= $filter['margin'] * 2) { $this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first(); + $this->compare_bookmaker_id = $model->bookmaker_id; return; } } else { if ($model->margin <= $filter['margin']) { $this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first(); + $this->compare_bookmaker_id = $model->bookmaker_id; return; } diff --git a/resources/views/filament/tables/columns/multiline/multilines-all.blade.php b/resources/views/filament/tables/columns/multiline/multilines-all.blade.php index 11e2de07..1d0ad896 100644 --- a/resources/views/filament/tables/columns/multiline/multilines-all.blade.php +++ b/resources/views/filament/tables/columns/multiline/multilines-all.blade.php @@ -1,139 +1,142 @@ @foreach ($multilines as $multiline) - @if (in_array($multiline->bookmaker_id, $slots)) + @if($getCompareBookmakerId() != $multiline->bookmaker_id) - @include('filament.tables.columns.multiline.bkm', [ - 'bookmaker_id' => $multiline->bookmaker_id, - 'icon' => $multiline->bookmaker->icon ?? '', - ]) + @if (in_array($multiline->bookmaker_id, $slots)) - @switch ($getBettype()) - @case ('odds_tq') + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $multiline->bookmaker_id, + 'icon' => $multiline->bookmaker->icon ?? '', + ]) - @case ('odds_2ways') + @switch ($getBettype()) + @case ('odds_tq') - @case ('odds_2ways_s1') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->h2w, - 'client' => $client?->h2w, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->a2w, - 'client' => $client?->a2w, - 'd' => 2, - ]) - @break; - @case ('odds_3ways') + @case ('odds_2ways') - @case ('odds_3ways_ht') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->h3w, - 'client' => $client?->h3w, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->d3w, - 'client' => $client?->d3w, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->a3w, - 'client' => $client?->a3w, - 'd' => 2, - ]) - @break; - @case ('odds_dc') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->dc1x, - 'client' => $client?->dc1x, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->dc12, - 'client' => $client?->dc12, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->dcx2, - 'client' => $client?->dcx2, - 'd' => 2, - ]) - @break; - @case ('odds_dnb') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->dnb1, - 'client' => $client?->dnb1, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->dnb2, - 'client' => $client?->dnb2, - 'd' => 2, - ]) - @break; - @case ('odds_ggng') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->gg, - 'client' => $client?->gg, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->ng, - 'client' => $client?->ng, - 'd' => 2, - ]) - @break; - @case ('odds_points') + @case ('odds_2ways_s1') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->h2w, + 'client' => $client?->h2w, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->a2w, + 'client' => $client?->a2w, + 'd' => 2, + ]) + @break; + @case ('odds_3ways') - @case ('odds_points_ht') + @case ('odds_3ways_ht') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->h3w, + 'client' => $client?->h3w, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->d3w, + 'client' => $client?->d3w, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->a3w, + 'client' => $client?->a3w, + 'd' => 2, + ]) + @break; + @case ('odds_dc') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->dc1x, + 'client' => $client?->dc1x, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->dc12, + 'client' => $client?->dc12, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->dcx2, + 'client' => $client?->dcx2, + 'd' => 2, + ]) + @break; + @case ('odds_dnb') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->dnb1, + 'client' => $client?->dnb1, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->dnb2, + 'client' => $client?->dnb2, + 'd' => 2, + ]) + @break; + @case ('odds_ggng') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->gg, + 'client' => $client?->gg, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->ng, + 'client' => $client?->ng, + 'd' => 2, + ]) + @break; + @case ('odds_points') - @case ('odds_points_q1') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->home, - 'd' => 2, - 'client' => $client?->home, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->away, - 'client' => $client?->away, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->handicap, - 'client' => false, - 'd' => 1, - ]) - @break; - @case ('odds_totals') + @case ('odds_points_ht') - @case ('odds_totals_ht') + @case ('odds_points_q1') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->home, + 'd' => 2, + 'client' => $client?->home, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->away, + 'client' => $client?->away, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->handicap, + 'client' => false, + 'd' => 1, + ]) + @break; + @case ('odds_totals') - @case ('odds_totals_q1') - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->over, - 'client' => $client?->over, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->under, - 'client' => $client?->under, - 'd' => 2, - ]) - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->total, - 'client' => false, - 'd' => 1, - ]) - @break; - @endswitch + @case ('odds_totals_ht') + + @case ('odds_totals_q1') + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->over, + 'client' => $client?->over, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->under, + 'client' => $client?->under, + 'd' => 2, + ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->total, + 'client' => false, + 'd' => 1, + ]) + @break; + @endswitch - @include('filament.tables.columns.multiline.odd', [ - 'odd' => $multiline->margin, - 'client' => false, - 'd' => 1, - ]) + @include('filament.tables.columns.multiline.odd', [ + 'odd' => $multiline->margin, + 'client' => false, + 'd' => 1, + ]) + @endif @endif @endforeach \ No newline at end of file