disable double when comapare and in lis view all
This commit is contained in:
1 parent
d0eb6e13b5
commit
87871c09fa
2 files changed
+136
-123
No files matched your search
@@ -30,6 +30,8 @@ class ColumnOdds extends Column
|
|||||||
|
|
||||||
protected $filter_compare_bookmaker;
|
protected $filter_compare_bookmaker;
|
||||||
|
|
||||||
|
protected $compare_bookmaker_id;
|
||||||
|
|
||||||
protected $filter_compare_mode;
|
protected $filter_compare_mode;
|
||||||
|
|
||||||
protected $favorits = [];
|
protected $favorits = [];
|
||||||
@@ -176,6 +178,11 @@ class ColumnOdds extends Column
|
|||||||
return $this->favorits;
|
return $this->favorits;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getCompareBookmakerId()
|
||||||
|
{
|
||||||
|
return $this->compare_bookmaker_id;
|
||||||
|
}
|
||||||
|
|
||||||
public function getData($record)
|
public function getData($record)
|
||||||
{
|
{
|
||||||
$this->client = null;
|
$this->client = null;
|
||||||
@@ -428,6 +435,7 @@ class ColumnOdds extends Column
|
|||||||
public function setCompare($record)
|
public function setCompare($record)
|
||||||
{
|
{
|
||||||
$this->compare = null;
|
$this->compare = null;
|
||||||
|
$this->compare_bookmaker_id = 0;
|
||||||
|
|
||||||
$this->data->filter(function ($model) {
|
$this->data->filter(function ($model) {
|
||||||
|
|
||||||
@@ -439,12 +447,14 @@ class ColumnOdds extends Column
|
|||||||
if ($this->bettype == 'odds_dc') {
|
if ($this->bettype == 'odds_dc') {
|
||||||
if ($model->margin <= $filter['margin'] * 2) {
|
if ($model->margin <= $filter['margin'] * 2) {
|
||||||
$this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
|
$this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
|
||||||
|
$this->compare_bookmaker_id = $model->bookmaker_id;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ($model->margin <= $filter['margin']) {
|
if ($model->margin <= $filter['margin']) {
|
||||||
$this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
|
$this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
|
||||||
|
$this->compare_bookmaker_id = $model->bookmaker_id;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,139 +1,142 @@
|
|||||||
|
|
||||||
@foreach ($multilines as $multiline)
|
@foreach ($multilines as $multiline)
|
||||||
|
|
||||||
@if (in_array($multiline->bookmaker_id, $slots))
|
@if($getCompareBookmakerId() != $multiline->bookmaker_id)
|
||||||
|
|
||||||
@include('filament.tables.columns.multiline.bkm', [
|
@if (in_array($multiline->bookmaker_id, $slots))
|
||||||
'bookmaker_id' => $multiline->bookmaker_id,
|
|
||||||
'icon' => $multiline->bookmaker->icon ?? '',
|
|
||||||
])
|
|
||||||
|
|
||||||
@switch ($getBettype())
|
@include('filament.tables.columns.multiline.bkm', [
|
||||||
@case ('odds_tq')
|
'bookmaker_id' => $multiline->bookmaker_id,
|
||||||
|
'icon' => $multiline->bookmaker->icon ?? '',
|
||||||
|
])
|
||||||
|
|
||||||
@case ('odds_2ways')
|
@switch ($getBettype())
|
||||||
|
@case ('odds_tq')
|
||||||
|
|
||||||
@case ('odds_2ways_s1')
|
@case ('odds_2ways')
|
||||||
@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_3ways_ht')
|
@case ('odds_2ways_s1')
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
@include('filament.tables.columns.multiline.odd', [
|
||||||
'odd' => $multiline->h3w,
|
'odd' => $multiline->h2w,
|
||||||
'client' => $client?->h3w,
|
'client' => $client?->h2w,
|
||||||
'd' => 2,
|
'd' => 2,
|
||||||
])
|
])
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
@include('filament.tables.columns.multiline.odd', [
|
||||||
'odd' => $multiline->d3w,
|
'odd' => $multiline->a2w,
|
||||||
'client' => $client?->d3w,
|
'client' => $client?->a2w,
|
||||||
'd' => 2,
|
'd' => 2,
|
||||||
])
|
])
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
@break;
|
||||||
'odd' => $multiline->a3w,
|
@case ('odds_3ways')
|
||||||
'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_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')
|
@case ('odds_points_ht')
|
||||||
@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_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')
|
@case ('odds_totals_ht')
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
|
||||||
'odd' => $multiline->over,
|
@case ('odds_totals_q1')
|
||||||
'client' => $client?->over,
|
@include('filament.tables.columns.multiline.odd', [
|
||||||
'd' => 2,
|
'odd' => $multiline->over,
|
||||||
])
|
'client' => $client?->over,
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
'd' => 2,
|
||||||
'odd' => $multiline->under,
|
])
|
||||||
'client' => $client?->under,
|
@include('filament.tables.columns.multiline.odd', [
|
||||||
'd' => 2,
|
'odd' => $multiline->under,
|
||||||
])
|
'client' => $client?->under,
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
'd' => 2,
|
||||||
'odd' => $multiline->total,
|
])
|
||||||
'client' => false,
|
@include('filament.tables.columns.multiline.odd', [
|
||||||
'd' => 1,
|
'odd' => $multiline->total,
|
||||||
])
|
'client' => false,
|
||||||
@break;
|
'd' => 1,
|
||||||
@endswitch
|
])
|
||||||
|
@break;
|
||||||
|
@endswitch
|
||||||
|
|
||||||
|
|
||||||
@include('filament.tables.columns.multiline.odd', [
|
@include('filament.tables.columns.multiline.odd', [
|
||||||
'odd' => $multiline->margin,
|
'odd' => $multiline->margin,
|
||||||
'client' => false,
|
'client' => false,
|
||||||
'd' => 1,
|
'd' => 1,
|
||||||
])
|
])
|
||||||
|
@endif
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
Reference in new issue
Block a user