diff --git a/app/Console/Commands/Grapper/Betsapi/Bet365.php b/app/Console/Commands/Grapper/Betsapi/Bet365.php index fc0398af..35e1ebbe 100644 --- a/app/Console/Commands/Grapper/Betsapi/Bet365.php +++ b/app/Console/Commands/Grapper/Betsapi/Bet365.php @@ -19,14 +19,24 @@ class Bet365 public static function grap() { $debug = Nuh::$options['d'] ?? 0; + $break = Nuh::$options['b'] ?? 0; + $week = Nuh::$options['w'] ?? 0; + /** * Bet365 */ $bookmaker_id = 126; - $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDays(1)->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get(); + if ($break) { + $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDay()->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get(); + } elseif ($week) { + $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDays(7)->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get(); + } else { + // all + $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get(); + } foreach ($events as $key => $event) { diff --git a/app/Console/Commands/Grapper/Betsapi/Fixtures.php b/app/Console/Commands/Grapper/Betsapi/Fixtures.php index 0533847a..b086de99 100644 --- a/app/Console/Commands/Grapper/Betsapi/Fixtures.php +++ b/app/Console/Commands/Grapper/Betsapi/Fixtures.php @@ -7,6 +7,7 @@ use App\Console\Commands\Nuh; use App\Mapper\FindFixture; use App\Mapper\LoadElements; use App\Mapper\LoadGroups; +use App\Models\Country; use App\Models\Mapper; use App\Models\Sport; use App\Utilities\Notice; @@ -37,7 +38,9 @@ class Fixtures self::$groups = LoadGroups::load(Nuh::$options['provider_id']); - $sportmap = Sport::map('bapi'); + $country_map = Country::pluck('id', 'iso2'); + + $sportmap = Sport::map('bapi', 0, [1]); $now = Carbon::now(); @@ -78,12 +81,14 @@ class Fixtures if (isset($row['home']['id']) && isset($row['away']['id']) && strpos($row['league']['name'], 'Esoccer') === false) { + $cc = strtoupper($row['league']['cc']); $event = [ 'event_id' => (int) $row['id'], 'bet365_id' => isset($row['bet365_id']) ? $row['bet365_id'] : 0, 'sport_id' => (int) $sport_id, 'provider_id' => (int) Nuh::$options['provider_id'], 'starttime' => Carbon::createFromTimestamp((string) $row['time'])->toDateTimeString(), + 'country_id' => $cc != null ? $country_map[$cc] : 0, 'home' => $row['home']['name'] ?? '', 'home_id' => (int) $row['home']['id'], 'home_cc' => strtoupper($row['home']['cc']) ?? '', diff --git a/app/Models/Sport.php b/app/Models/Sport.php index 42c0e850..75ff0b1e 100644 --- a/app/Models/Sport.php +++ b/app/Models/Sport.php @@ -21,7 +21,7 @@ class Sport extends Model } } else { if ($limit) { - return Sport::where('is_active', 1)->whereIn($limit, 'id')->pluck('id', $field)->toArray(); + return Sport::where('is_active', 1)->whereIn('id', $limit)->pluck($field, 'id')->toArray(); } else { return Sport::where('is_active', 1)->pluck($field, 'id')->toArray(); } diff --git a/database/migrations/2024_11_08_053430_create_odds_qualify_table.php b/database/migrations/2024_11_08_053430_create_odds_tq_table.php similarity index 100% rename from database/migrations/2024_11_08_053430_create_odds_qualify_table.php rename to database/migrations/2024_11_08_053430_create_odds_tq_table.php diff --git a/resources/views/filament/tables/columns/column-dc.blade.php b/resources/views/filament/tables/columns/column-dc.blade.php index 91b9ed6b..57fd47e8 100644 --- a/resources/views/filament/tables/columns/column-dc.blade.php +++ b/resources/views/filament/tables/columns/column-dc.blade.php @@ -10,6 +10,47 @@ @include('filament.tables.columns.multiline.label', ['labels' => ['1X', '12', 'X2']]) + @foreach ($record->odds_dc as $item) + @if ($item->bookmaker_id == auth()->user()->bookmaker_id) + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $item->bookmaker_id, + 'icon' => $item->bookmaker->icon ?? '', + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->dc1x, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->dc12, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->dcx2, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->margin, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + @endif + @endforeach + @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_dc as $item) @if ($item->bookmaker_id == $bookmaker_id) diff --git a/resources/views/filament/tables/columns/column-dnb.blade.php b/resources/views/filament/tables/columns/column-dnb.blade.php index cf46f7c5..50310bd8 100644 --- a/resources/views/filament/tables/columns/column-dnb.blade.php +++ b/resources/views/filament/tables/columns/column-dnb.blade.php @@ -10,6 +10,39 @@ @include('filament.tables.columns.multiline.label', ['labels' => ['DNB1', 'DNB2']]) + @foreach ($record->odds_dnb as $item) + @if ($item->bookmaker_id == auth()->user()->bookmaker_id) + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $item->bookmaker_id, + 'icon' => $item->bookmaker->icon ?? '', + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->dnb1, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->dnb2, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->margin, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + @endif + @endforeach + @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_dnb as $item) @if ($item->bookmaker_id == $bookmaker_id) diff --git a/resources/views/filament/tables/columns/column-ggng.blade.php b/resources/views/filament/tables/columns/column-ggng.blade.php index 739a0581..4aaa9e6c 100644 --- a/resources/views/filament/tables/columns/column-ggng.blade.php +++ b/resources/views/filament/tables/columns/column-ggng.blade.php @@ -10,6 +10,39 @@ @include('filament.tables.columns.multiline.label', ['labels' => ['GG', 'NG']]) + @foreach ($record->odds_ggng as $item) + @if ($item->bookmaker_id == auth()->user()->bookmaker_id) + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $item->bookmaker_id, + 'icon' => $item->bookmaker->icon ?? '', + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->gg, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->ng, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->margin, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + @endif + @endforeach + @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_ggng as $item) @if ($item->bookmaker_id == $bookmaker_id) diff --git a/resources/views/filament/tables/columns/column-total.blade.php b/resources/views/filament/tables/columns/column-total.blade.php index 446560a5..d931ca25 100644 --- a/resources/views/filament/tables/columns/column-total.blade.php +++ b/resources/views/filament/tables/columns/column-total.blade.php @@ -10,6 +10,47 @@ @include('filament.tables.columns.multiline.label', ['labels' => ['O', 'U', 'T']]) + @foreach ($record->odds_total as $item) + @if ($item->bookmaker_id == auth()->user()->bookmaker_id) + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $item->bookmaker_id, + 'icon' => $item->bookmaker->icon ?? '', + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->over, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->under, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->total, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->margin, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + @endif + @endforeach + @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_total as $item) @if ($item->bookmaker_id == $bookmaker_id) diff --git a/resources/views/filament/tables/columns/column-tq.blade.php b/resources/views/filament/tables/columns/column-tq.blade.php index fb04330a..61d1f050 100644 --- a/resources/views/filament/tables/columns/column-tq.blade.php +++ b/resources/views/filament/tables/columns/column-tq.blade.php @@ -10,6 +10,39 @@ @include('filament.tables.columns.multiline.label', ['labels' => ['H', 'A']]) + @foreach ($record->odds_tq as $item) + @if ($item->bookmaker_id == auth()->user()->bookmaker_id) + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $item->bookmaker_id, + 'icon' => $item->bookmaker->icon ?? '', + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->htq, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->atq, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->margin, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + @endif + @endforeach + @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_tq as $item) @if ($item->bookmaker_id == $bookmaker_id) diff --git a/resources/views/filament/tables/columns/column_3way.blade.php b/resources/views/filament/tables/columns/column_3way.blade.php index 1d1333f0..f991a6e6 100644 --- a/resources/views/filament/tables/columns/column_3way.blade.php +++ b/resources/views/filament/tables/columns/column_3way.blade.php @@ -10,6 +10,47 @@ @include('filament.tables.columns.multiline.label', ['labels' => ['1', 'X', '2']]) + @foreach ($record->odds_3way as $item) + @if ($item->bookmaker_id == auth()->user()->bookmaker_id) + @include('filament.tables.columns.multiline.bkm', [ + 'bookmaker_id' => $item->bookmaker_id, + 'icon' => $item->bookmaker->icon ?? '', + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->h3w, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->d3w, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->a3w, + 'decimal' => 2, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + + @include('filament.tables.columns.multiline.odds', [ + 'odd' => $item->margin, + 'decimal' => 1, + 'max' => false, + 'min' => false, + 'main' => true, + ]) + @endif + @endforeach + @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_3way as $item) @if ($item->bookmaker_id == $bookmaker_id) diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php index be0b91d4..9dbbe96f 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php @@ -1,6 +1,6 @@ @if ($hasData())