diff --git a/app/Console/Commands/Grapper/Helper/BookmakerOffer.php b/app/Console/Commands/Grapper/Helper/BookmakerOffer.php deleted file mode 100644 index 5b5fa3e1..00000000 --- a/app/Console/Commands/Grapper/Helper/BookmakerOffer.php +++ /dev/null @@ -1,64 +0,0 @@ - $bookmaker_ids) { - BookmakerSport::where('provider_id', Nuh::$options['provider_id']) - ->where('sport_id', (int) $sport_id) - ->update(['is_active' => 0]); - - foreach ($bookmaker_ids as $bookmaker_id) { - BookmakerSport::updateOrCreate([ - 'provider_id' => Nuh::$options['provider_id'], - 'bookmaker_id' => (int) $bookmaker_id, - 'sport_id' => (int) $sport_id, - ], [ - 'is_active' => 1, - ]); - } - } - $debug = Nuh::$options['d'] ?? 0; - - if ($debug) { - Notice::note(self::$collector, 'p', 1); - } - } - } -} diff --git a/app/Console/Commands/Grapper/TxOdds/Odds.php b/app/Console/Commands/Grapper/TxOdds/Odds.php index 0c591dd1..7541cf9f 100644 --- a/app/Console/Commands/Grapper/TxOdds/Odds.php +++ b/app/Console/Commands/Grapper/TxOdds/Odds.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Grapper\TxOdds; use App\Console\Commands\Grapper\Helper\ActiveSpread; -use App\Console\Commands\Grapper\Helper\BookmakerOffer; use App\Console\Commands\Grapper\TxOdds\Odds\_2Way; use App\Console\Commands\Grapper\TxOdds\Odds\_2WayS1; use App\Console\Commands\Grapper\TxOdds\Odds\_3Way; @@ -41,7 +40,6 @@ class Odds Notice::note('txodd odd sport: '.Nuh::$options['sport_id'], 'b'); } - BookmakerOffer::init(); /** * Delete */ @@ -269,8 +267,6 @@ class Odds $odds['provider_id'] = Nuh::$options['provider_id']; $odds['nuh_check'] = 0; - BookmakerOffer::collect($book['bid'], $event['sport_id']); - foreach ($book->offer as $offer) { $bettypeid = 0; @@ -350,8 +346,6 @@ class Odds } } - BookmakerOffer::finalize(); - if ($debug) { Notice::note('DONE - EVENTS: '.$counter, 'g'); } diff --git a/app/Livewire/MultilineBookmaker.php b/app/Livewire/MultilineBookmaker.php index 31e38c25..8d404e07 100644 --- a/app/Livewire/MultilineBookmaker.php +++ b/app/Livewire/MultilineBookmaker.php @@ -3,7 +3,7 @@ namespace App\Livewire; use App\Filament\Tables\Columns\BookmakerIcon; -use App\Models\BookmakerSport; +use App\Models\Bookmaker; use App\Models\MultilineClient; use App\Models\MultilineSetting; use Filament\Actions\Concerns\InteractsWithActions; @@ -21,6 +21,7 @@ use Filament\Tables\Filters\Filter; use Filament\Tables\Table; use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Support\Facades\DB; use Livewire\Component; class MultilineBookmaker extends Component implements HasActions, HasSchemas, HasTable @@ -56,14 +57,17 @@ class MultilineBookmaker extends Component implements HasActions, HasSchemas, Ha SelectColumn::make('bookmaker_id') ->label('Bookmaker') ->width('2rem') - ->options(function () { + ->options(function ($livewire, $record) { + $table = MultilineSetting::where('id', $livewire->tableFilters['multiline_setting_id'])->value('table'); - $res = BookmakerSport::with('bookmaker') + $bookies = DB::table($table) ->where('sport_id', auth()->user()->sport_id) - ->get(); + ->groupBy('bookmaker_id')->pluck('bookmaker_id'); + + $res = Bookmaker::whereIn('id', $bookies)->pluck('name', 'id'); $arr = []; - foreach ($res as $value) { - $arr[$value->bookmaker_id] = $value->bookmaker->name; + foreach ($res as $id => $name) { + $arr[$id] = $name; } asort($arr); diff --git a/app/Models/BookmakerSport.php b/app/Models/BookmakerSport.php deleted file mode 100644 index 6af9d349..00000000 --- a/app/Models/BookmakerSport.php +++ /dev/null @@ -1,25 +0,0 @@ -belongsTo(Sport::class); - } - - public function bookmaker() - { - return $this->belongsTo(Bookmaker::class); - } -} diff --git a/database/migrations/2026_01_11_042020_create_bookmaker_sports_table.php b/database/migrations/2026_01_11_042020_create_bookmaker_sports_table.php deleted file mode 100644 index 0a84fba7..00000000 --- a/database/migrations/2026_01_11_042020_create_bookmaker_sports_table.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->integer('sport_id')->index()->references('id')->on('sports'); - $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); - $table->integer('provider_id')->index()->references('id')->on('providers'); - $table->boolean('is_active')->default(0); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('bookmaker_sports'); - } -};