grapper betsapi

app/Console/Commands/Curl.php

@@ -6,7 +6,7 @@ use App\Utilities\Notice;
 
 class Curl
 {
-    public static $file;
+    public static $testfiles = '/Console/Commands/TestFiles/';
 
     public static function load($url)
     {
@@ -21,9 +21,9 @@ class Curl
 
         if ($read) {
             if ($debug) {
-                Notice::note('READ LOCAL', 'r');
+                Notice::note('data read localy', 'g');
             }
-            $filename = app_path().'/Console/TestFiles/'.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.json';
+            $filename = app_path().self::$testfiles.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.json';
 
             $file = file_get_contents($filename);
 
@@ -64,9 +64,11 @@ class Curl
         }
 
         if ($save) {
-            Notice::note('SAVED LOCAL', 'b');
-            self::$file = app_path().'/Console/TestFiles/'.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.json';
-            file_put_contents(self::$file, $data);
+            $filename = app_path().self::$testfiles.strtolower(str_replace(' ', '_', Nuh::$options['name'])).'.json';
+
+            file_put_contents($filename, $data);
+
+            Notice::note('file saved localy', 'g');
         }
 
         return json_decode($data, true);

app/Console/Commands/Grapper/Betsapi.php

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands\Grapper;
 
+use App\Console\Commands\Grapper\Betsapi\Bwin;
 use App\Console\Commands\Grapper\Betsapi\Fixtures;
-use App\Console\Commands\Grapper\Betsapi\IdMapper;
 use App\Console\Commands\Grapper\Betsapi\Odds;
 use App\Console\Commands\Nuh;
 use App\Utilities\Notice;
@@ -20,8 +20,14 @@ class Betsapi
             case 'Odds':
                 Odds::grap();
                 break;
-            case 'IdMapper':
-                IdMapper::grap();
+            case 'Willhill':
+                Willhill::grap();
+                break;
+            case 'Bwin':
+                Bwin::grap();
+                break;
+            case 'Bwin':
+                Bet365::grap();
                 break;
             default:
                 Notice::note('prosses name does not exist', 'r', 1);

app/Console/Commands/Grapper/Betsapi/Bet365.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Console\Commands\Grapper\Betsapi;
+
+use App\Console\Commands\Curl;
+use App\Console\Commands\Nuh;
+use App\Models\Event;
+use App\Utilities\Notice;
+
+class Bet365
+{
+    public static function grap()
+    {
+        $debug = Nuh::$options['d'] ?? 0;
+
+        /**
+         * Bet365
+         */
+        $bookmaker_id = 126;
+
+        $res = Event::where('bet365_id', '>', 0)->pluck('id', 'bet365_id');
+
+        foreach ($res as $bet365_id => $txodds_id) {
+
+            /**
+             * BET365 ODDS (per event)
+             */
+            $url = 'https://api.b365api.com/v4/bet365/prematch?token='.config('env.betsapi_token').'&FI='.$bet365_id;
+
+            $data = Curl::load($url);
+
+            dd($data);
+
+            $betsapi_id = $data['results'][0]['id'] ?? 0;
+            $bet365_id = $data['results'][0]['bet365_id'] ?? 0;
+
+            if ($debug) {
+                Notice::note(["TXdds ID : $txodds_id", "Betsapi ID : $betsapi_id", "Bet365 ID : $bet365_id", "Willhill ID : $willhill_id"], 'b');
+            }
+
+            if ($betsapi_id) {
+                Event::where('id', (int) $txodds_id)->update(['betsapi_id' => $betsapi_id, 'bet365_id' => $bet365_id]);
+            }
+        }
+    }
+}

app/Console/Commands/Grapper/Betsapi/Betfair.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands\Grapper\Betsapi;
+
+use App\Console\Commands\Curl;
+use App\Console\Commands\Nuh;
+use App\Models\Event;
+use App\Utilities\Notice;
+
+class Betfair
+{
+    public static function grap()
+    {
+        $debug = Nuh::$options['d'] ?? 0;
+
+        /**
+         * Bet365
+         */
+        $bookmaker_id = 126;
+
+        $res = Event::where('bet365_id', '>', 0)->pluck('id', 'bet365_id');
+
+        foreach ($res as $bet365_id => $txodds_id) {
+
+            /**
+             * BETFAIR SP (per page)
+             * https://api.b365api.com/v1/bwin/prematch?token=36152-aeTRNnZxSPUwGe
+             */
+            $url = 'https://api.b365api.com/v4/bet365/prematch?token='.config('env.betsapi_token').'&FI='.$bet365_id;
+
+            $data = Curl::load($url);
+
+            dd($data);
+
+            $betsapi_id = $data['results'][0]['id'] ?? 0;
+            $bet365_id = $data['results'][0]['bet365_id'] ?? 0;
+
+            if ($debug) {
+                Notice::note(["TXdds ID : $txodds_id", "Betsapi ID : $betsapi_id", "Bet365 ID : $bet365_id", "Willhill ID : $willhill_id"], 'b');
+            }
+
+            if ($betsapi_id) {
+                Event::where('id', (int) $txodds_id)->update(['betsapi_id' => $betsapi_id, 'bet365_id' => $bet365_id]);
+            }
+        }
+    }
+}

app/Console/Commands/Grapper/Betsapi/Bwin.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Console\Commands\Grapper\Betsapi;
+
+use App\Console\Commands\Curl;
+use App\Console\Commands\Nuh;
+use App\Models\Event;
+use App\Models\Mapper;
+use App\Models\Sport;
+use App\Utilities\Notice;
+
+class Bwin
+{
+    public static function grap()
+    {
+        $debug = Nuh::$options['d'] ?? 0;
+
+        $sportmap = Sport::map('bwin');
+
+        $total = 1;
+        foreach ($sportmap as $sport_id => $bwin_sport_id) {
+
+            $page = 1;
+
+            /**
+             * BWIN ODDS & BETRADAR ID (per page)
+             */
+            $url = 'https://api.b365api.com/v1/bwin/prematch?token='.config('env.betsapi_token').'&page=###page###&sport_id='.$bwin_sport_id;
+
+            while ($page <= $total) {
+
+                $url = str_replace('###page###', $page, $url);
+
+                $data = Curl::load($url);
+
+                $page++;
+
+                $total = round($data['pager']['total'] / $data['pager']['per_page']);
+
+                if ($debug) {
+                    Notice::note("Page: $page \nTotal: $total");
+                }
+
+                if (isset($data['results'])) {
+                    foreach ($data['results'] as $event) {
+
+                        $bwin_id = $event['Id'];
+                        $betradar_id = $event['BetRadarId'] ?? 0;
+                        $betsapi_id = $event['our_event_id'];
+
+                        if ($betradar_id) {
+                            Event::where('betsapi_id', (int) $betsapi_id)->update(['betradar_id' => $betradar_id, 'bwin_id' => $bwin_id]);
+
+                            Mapper::where('event_id', $betsapi_id)->delete();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

app/Console/Commands/Grapper/Betsapi/Fixtures.php

@@ -14,12 +14,10 @@ class Fixtures
     public static function grap()
     {
         $debug = Nuh::$options['d'] ?? 0;
-        $test = Nuh::$options['t'] ?? 0;
-        $echo = Nuh::$options['e'] ?? 0;
 
         $sportmap = Sport::map('bapi');
 
-        $total = 10;
+        $total = 1;
         foreach ($sportmap as $sport_id => $betsapi_sport_id) {
             $page = 1;
             while ($page <= $total) {
@@ -41,7 +39,7 @@ class Fixtures
                     foreach ($data['results'] as $row) {
 
                         $event = [
-                            'sport_id' => (int) $row['sport_id'],
+                            'sport_id' => (int) $sport_id,
                             'provider_id' => (int) Nuh::$options['provider_id'],
                             'starttime' => Carbon::createFromTimestamp((string) $row['time'])->toDateTimeString(),
                             'home' => $row['home']['name'] ?? '',
@@ -55,7 +53,7 @@ class Fixtures
                             'group_cc' => $row['league']['cc'] ?? '',
                         ];
 
-                        Mapper::updateOrCreate(['betsapi_id' => (int) $row['id']], $event);
+                        Mapper::updateOrCreate(['event_id' => (int) $row['id']], $event);
                     }
                 }
             }

app/Console/Commands/Grapper/Betsapi/IdMapper.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Grapper\Betsapi;
-
-use App\Console\Commands\Curl;
-use App\Console\Commands\Nuh;
-use App\Models\Mapper;
-use App\Utilities\Notice;
-
-class IdMapper
-{
-    public static function grap()
-    {
-        $debug = Nuh::$options['d'] ?? 0;
-        $test = Nuh::$options['t'] ?? 0;
-        $echo = Nuh::$options['e'] ?? 0;
-
-        $total = 10;
-
-        $bookmakers = [[
-            'name' => 'betfair',
-            'url' => 'https://api.b365api.com/v1/betfair/sb/upcoming?sport_id=###sport_id###&page=###page###',
-        ], [
-            'name' => '1xbet',
-            'url' => 'https://api.b365api.com/v1/1xbet/upcoming?sport_id=###sport_id###&page=###page###',
-        ]];
-
-        foreach ($bookmakers as $bookmaker) {
-
-            if ($bookmaker['name'] == '1xbet') {
-                // same like txodds
-                $sportmap = [1, 2, 3];
-            } elseif ($bookmaker['name'] == 'betfair') {
-                // 1 soccer
-                // 7522 basketball
-                $sportmap = [1, 7522];
-            }
-
-            foreach ($sportmap as $sport_id) {
-
-                $page = 1;
-
-                $url = str_replace('###sport_id###', $sport_id, $bookmaker['url']).'&token='.config('env.betsapi_token');
-
-                while ($page <= $total) {
-
-                    $url = str_replace('###page###', $page, $url);
-
-                    $data = Curl::load($url);
-
-                    $page++;
-
-                    $total = round($data['pager']['total'] / $data['pager']['per_page']);
-
-                    if ($debug) {
-                        Notice::note("Page: $page \nTotal: $total");
-                    }
-
-                    if (isset($data['results'])) {
-
-                        foreach ($data['results'] as $row) {
-                            if ($bookmaker['name'] == '1xbet') {
-                                Mapper::where('betsapi_id', (int) $row['our_event_id'])->update(['_1xbet_id' => (int) $row['id']]);
-                            } elseif ($bookmaker['name'] == 'betfair') {
-                                Mapper::where('betsapi_id', (int) $row['our_event_id'])->update(['betfairsb_id' => (int) $row['id']]);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

app/Console/Commands/Grapper/Betsapi/Willhill.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Console\Commands\Grapper\Betsapi;
+
+use App\Console\Commands\Curl;
+use App\Console\Commands\Nuh;
+use App\Models\Event;
+use App\Models\Mapper;
+use App\Models\Odds3way;
+use App\Utilities\Notice;
+
+class Willhill
+{
+    public static function grap()
+    {
+        $debug = Nuh::$options['d'] ?? 0;
+
+        /**
+         * williamhill
+         */
+        $bookmaker_id = 42;
+
+        $res = Odds3way::join('events', 'odds_3ways.event_id', 'events.id')
+            ->where('odds_3ways.bookmaker_id', $bookmaker_id)
+            ->where('events.betsapi_id', 0)
+            ->where('odds_3ways.bmoid', '>', 0)->pluck('odds_3ways.event_id', 'odds_3ways.bmoid');
+
+        foreach ($res as $willhill_id => $txodds_id) {
+
+            $url = 'https://api.b365api.com/v1/williamhill/result?token='.config('env.betsapi_token').'&event_id='.$willhill_id;
+
+            $data = Curl::load($url);
+
+            $betsapi_id = $data['results'][0]['id'] ?? 0;
+
+            $bet365_id = $data['results'][0]['bet365_id'] ?? 0;
+
+            if ($debug) {
+                Notice::note(["TXdds ID : $txodds_id", "Betsapi ID : $betsapi_id", "Bet365 ID : $bet365_id", "Willhill ID : $willhill_id"], 'b');
+            }
+
+            if ($betsapi_id) {
+                Event::where('id', (int) $txodds_id)->update(['betsapi_id' => $betsapi_id, 'bet365_id' => $bet365_id]);
+
+                Mapper::where('event_id', $betsapi_id)->delete();
+            }
+        }
+    }
+}

app/Console/Commands/Grapper/TxOdds/Fixtures.php

@@ -49,61 +49,46 @@ class Fixtures
             }
 
             foreach ($data as $row) {
-                // <match id="14563695" xsid="0" gsmid="0"  last_updated="2025-12-02T08:31:11+00:00">
-                // <time>2025-12-03T22:30:00+00:00</time>
-                // <group id="173093" cgid="1255"  spid="1" cnid="467" mgid="1002" cname="Reserve League">FBARG Reserve League-25</group>
-                // <hteam id="187003"  >Boca Juniors II</hteam>
-                // <ateam id="185803"  >Gimnasia LP II</ateam>
-                // <results>
-                // <status last_updated="2025-12-02T08:31:10+00:00" minute="-1">Sched</status>
-                // <result id="1" name="CURRENT" value="" />
-                // </results>
-                // </match>
-                $event = [];
-                $event['tx_id'] = (int) $row['id'];
-                $event['provider_id'] = (int) Nuh::$options['provider_id'];
-                $event['starttime'] = Carbon::createFromDate((string) $row->time)->toDateTimeString();
-                $group_name = (string) $row->group;
-                $event['group_id'] = (int) $row->group['id'];
-                $event['sport_id'] = (int) $row->group['spid'];
-                $event['country_id'] = (int) $row->group['cnid'];
-                $event['competition_group_id'] = (int) $row->group['cgid'];
-                $competition_group_name = (string) $row->group['cname'];
-                $home = (string) $row->hteam;
-                $event['home_id'] = (int) $row->hteam['id'];
-                $away = (string) $row->ateam;
-                $event['away_id'] = (int) $row->ateam['id'];
+                $event = [
+                    'provider_id' => (int) Nuh::$options['provider_id'],
+                    'starttime' => Carbon::createFromDate((string) $row->time)->toDateTimeString(),
+                    'sport_id' => (int) $row->group['spid'],
+                    'home_id' => (int) $row->hteam['id'],
+                    'away_id' => (int) $row->ateam['id'],
+                    'country_id' => (int) $row->group['cnid'],
+                    'group_id' => (int) $row->group['id'],
+                    'competition_group_id' => (int) $row->group['cgid'],
+                ];
 
-                Group::updateOrCreate([
-                    'tx_id' => $event['group_id'],
-                    'competition_group_id' => $event['competition_group_id'],
+                Event::updateOrCreate(['id' => (int) $row['id']], $event);
+
+                $group = [
+                    'competition_group_id' => (string) $row->group['cgid'],
+                    'sport_id' => (int) $row->group['spid'],
+                    'country_id' => (int) $row->group['cnid'],
+                    'name' => (string) $row->group,
+                ];
+                Group::updateOrCreate(['id' => (int) $row->group['id']], $group);
+
+                $compgroup = [
                     'sport_id' => $event['sport_id'],
                     'country_id' => $event['country_id'],
-                ], [
-                    'name' => $group_name,
-                ]);
+                    'name' => (string) $row->group['cname'],
+                ];
 
-                CompetitionGroup::updateOrCreate([
-                    'tx_id' => $event['competition_group_id'],
-                    'sport_id' => $event['sport_id'],
-                    'country_id' => $event['country_id'],
-                ], [
-                    'name' => $competition_group_name,
-                ]);
+                CompetitionGroup::updateOrCreate(['id' => (int) $row->group['cgid']], $compgroup);
 
-                Element::firstOrCreate([
-                    'tx_id' => $event['home_id'],
-                    'name' => $home,
-                    'sport_id' => $event['sport_id'],
-                ]);
+                $element = [
+                    'name' => (string) $row->hteam,
+                    'sport_id' => (int) $row->group['spid'],
+                ];
+                Element::updateOrCreate(['id' => (int) $row->hteam['id']], $element);
 
-                Element::firstOrCreate([
-                    'tx_id' => $event['away_id'],
-                    'name' => $away,
-                    'sport_id' => $event['sport_id'],
-                ]);
-
-                Event::updateOrCreate($event, ['starttime' => $event['starttime']]);
+                $element = [
+                    'name' => (string) $row->ateam,
+                    'sport_id' => (int) $row->group['spid'],
+                ];
+                Element::updateOrCreate(['id' => (int) $row->ateam['id']], $element);
 
                 $count++;
             }

app/Console/Commands/Grapper/TxOdds/Odds.php

@@ -13,7 +13,6 @@ use App\Console\Commands\Xml;
 use App\Models\CompetitionGroup;
 use App\Models\Element;
 use App\Models\Event;
-use App\Models\EventBookmaker;
 use App\Models\Group;
 use App\Utilities\Notice;
 use Carbon\Carbon;
@@ -113,17 +112,17 @@ class Odds
         if (Nuh::$options['event_id']) {
             $_calls[] = $url."&ot=$markets&peid=".Nuh::$options['event_id'];
         } elseif (Nuh::$options['a']) {
-            $res = Event::where('starttime', '>', Carbon::now()->toDateTimeString())->pluck('tx_id');
+            $res = Event::where('starttime', '>', Carbon::now()->toDateTimeString())->pluck('id');
             foreach ($res as $id) {
                 $_calls[] = $url."&ot=$markets&peid=".$id;
             }
         } elseif (Nuh::$options['w']) {
-            $res = Event::where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDays(7)->toDateTimeString())->pluck('tx_id');
+            $res = Event::where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDays(7)->toDateTimeString())->pluck('id');
             foreach ($res as $id) {
                 $_calls[] = $url."&ot=$markets&peid=".$id;
             }
         } else {
-            $_calls[] = $url.'&last='.Nuh::$options['lastcall'];
+            $_calls[] = $url."&ot=$markets&last=".Nuh::$options['lastcall'];
         }
 
         /*************************************************
@@ -140,63 +139,61 @@ class Odds
 
             foreach ($data as $row) {
 
-                $event = [];
-                $event['tx_id'] = (int) $row['id'];
-                $event['starttime'] = Carbon::createFromDate((string) $row->time)->toDateTimeString();
-                $group_name = (string) $row->group;
-                $event['group_id'] = (int) $row->group['id'];
-                $event['sport_id'] = (int) $row->group['spid'];
-                $event['country_id'] = (int) $row->group['cnid'];
-                $event['competition_group_id'] = (int) $row->group['cgid'];
-                $competition_group_name = (string) $row->group['cname'];
-                $home = (string) $row->hteam;
-                $event['home_id'] = (int) $row->hteam['id'];
-                $away = (string) $row->ateam;
-                $event['away_id'] = (int) $row->ateam['id'];
+                $event = [
+                    'provider_id' => (int) Nuh::$options['provider_id'],
+                    'starttime' => Carbon::createFromDate((string) $row->time)->toDateTimeString(),
+                    'sport_id' => (int) $row->group['spid'],
+                    'home_id' => (int) $row->hteam['id'],
+                    'away_id' => (int) $row->ateam['id'],
+                    'country_id' => (int) $row->group['cnid'],
+                    'group_id' => (int) $row->group['id'],
+                    'competition_group_id' => (int) $row->group['cgid'],
+                ];
 
-                Group::updateOrCreate([
-                    'tx_id' => $event['group_id'],
-                    'competition_group_id' => $event['competition_group_id'],
+                Event::firstOrCreate(['id' => (int) $row['id']], $event);
+
+                $group = [
+                    'competition_group_id' => (string) $row->group['cgid'],
+                    'sport_id' => (int) $row->group['spid'],
+                    'country_id' => (int) $row->group['cnid'],
+                    'name' => (string) $row->group,
+                ];
+                Group::updateOrCreate(['id' => (int) $row->group['id']], $group);
+
+                $compgroup = [
                     'sport_id' => $event['sport_id'],
                     'country_id' => $event['country_id'],
-                ], [
-                    'name' => $group_name,
-                ]);
+                    'name' => (string) $row->group['cname'],
+                ];
 
-                CompetitionGroup::updateOrCreate([
-                    'tx_id' => $event['competition_group_id'],
-                    'sport_id' => $event['sport_id'],
-                    'country_id' => $event['country_id'],
-                ], [
-                    'name' => $competition_group_name,
-                ]);
+                CompetitionGroup::updateOrCreate(['id' => (int) $row->group['cgid']], $compgroup);
 
-                Element::firstOrCreate([
-                    'tx_id' => $event['home_id'],
-                    'name' => $home,
-                    'sport_id' => $event['sport_id'],
-                ]);
+                $element = [
+                    'name' => (string) $row->hteam,
+                    'sport_id' => (int) $row->group['spid'],
+                ];
+                Element::updateOrCreate(['id' => (int) $row->hteam['id']], $element);
 
-                Element::firstOrCreate([
-                    'tx_id' => $event['away_id'],
-                    'name' => $away,
-                    'sport_id' => $event['sport_id'],
-                ]);
-
-                Nuh::$_event = Event::firstOrCreate($event, ['starttime' => $event['starttime']]);
+                $element = [
+                    'name' => (string) $row->ateam,
+                    'sport_id' => (int) $row->group['spid'],
+                ];
+                Element::updateOrCreate(['id' => (int) $row->ateam['id']], $element);
 
                 $counter++;
 
                 foreach ($row->bookmaker as $book) {
 
-                    Nuh::$bookmaker_id = (int) $book['bid'];
+                    Nuh::$id = (int) $row['id'];
 
                     Nuh::$bookmaker_id = (int) $book['bid'];
 
                     $odds = [];
                     $odds['sport_id'] = (int) $event['sport_id'];
-
-                    Nuh::$_event_bookmaker = [];
+                    $odds['flag'] = 1;
+                    $odds['provider_id'] = Nuh::$options['provider_id'];
+                    $odds['nuh_check'] = 0;
+                    $odds['last_check_at'] = Carbon::now()->toDateTimeString();
 
                     foreach ($book->offer as $offer) {
 
@@ -244,20 +241,6 @@ class Odds
                                 break;
                         }
                     }
-
-                    foreach (Nuh::$_event_bookmaker as $value) {
-
-                        EventBookmaker::updateOrCreate([
-                            'event_id' => Nuh::$_event->id,
-                            'bookmaker_id' => Nuh::$bookmaker_id,
-                            'bookmaker_id' => Nuh::$bookmaker_id,
-                        ], [
-                            'bmoid' => $value['bmoid'],
-                            'provider_id' => Nuh::$options['provider_id'],
-                            'bkm_starttime' => Carbon::createFromDate($value['starttime'])->toDateTimeString(),
-                            'last_check_at' => Carbon::now()->toDateTimeString(),
-                        ]);
-                    }
                 }
             }
         }

app/Console/Commands/Grapper/TxOdds/Odds/_3Way.php

@@ -6,7 +6,6 @@ use App\Console\Commands\Nuh;
 use App\Models\Odds3way;
 use App\Utilities\Margin;
 use App\Utilities\Notice;
-use Illuminate\Support\Carbon;
 
 class _3Way
 {
@@ -18,33 +17,17 @@ class _3Way
             Notice::note('1X2 '.Nuh::$bookmaker_id, 'b');
         }
 
-        $update_array = [];
         foreach ($offer as $value) {
-            $update_array['h3w'] = (float) $value->o1;
-            $update_array['d3w'] = (float) $value->o2;
-            $update_array['a3w'] = (float) $value->o3;
-            $update_array['margin'] = (float) Margin::calculate($update_array, 1);
-            $bkm_starttime = (string) $value['starting_time'];
+            $odds['h3w'] = (float) $value->o1;
+            $odds['d3w'] = (float) $value->o2;
+            $odds['a3w'] = (float) $value->o3;
+            $odds['starting_time'] = (string) $value['starting_time'];
         }
-
-        Nuh::$_event_bookmaker[] =
-        [
-            'bmoid' => $odds['bmoid'],
-            'starttime' => $bkm_starttime,
-        ];
-
-        $update_array['bmoid'] = $odds['bmoid'];
-        $update_array['sport_id'] = $odds['sport_id'];
-        $update_array['offer_id'] = $odds['offer_id'];
-        $update_array['flag'] = 1;
-        $update_array['provider_id'] = Nuh::$options['provider_id'];
-        $update_array['nuh_check'] = 0;
-        $update_array['last_check_at'] = Carbon::now()->toDateTimeString();
-        $update_array['source_updated_at'] = $odds['source_updated_at'];
+        $odds['margin'] = (float) Margin::calculate([$odds['h3w'], $odds['d3w'], $odds['a3w']], 1);
 
         Odds3way::updateOrCreate([
-            'event_id' => Nuh::$_event->id,
+            'event_id' => Nuh::$id,
             'bookmaker_id' => Nuh::$bookmaker_id,
-        ], $update_array);
+        ], $odds);
     }
 }

app/Console/Commands/Grapper/TxOdds/Odds/_Dc.php

@@ -6,7 +6,6 @@ use App\Console\Commands\Nuh;
 use App\Models\OddsDc;
 use App\Utilities\Margin;
 use App\Utilities\Notice;
-use Illuminate\Support\Carbon;
 
 class _Dc
 {
@@ -18,26 +17,16 @@ class _Dc
             Notice::note('Double Chance '.Nuh::$bookmaker_id, 'b');
         }
 
-        $update_array = [];
         foreach ($offer as $value) {
-            $update_array['dc1x'] = (float) $value->o1;
-            $update_array['dc12'] = (float) $value->o2;
-            $update_array['dc2x'] = (float) $value->o3;
+            $odds['dc1x'] = (float) $value->o1;
+            $odds['dc12'] = (float) $value->o2;
+            $odds['dc2x'] = (float) $value->o3;
         }
-        $update_array['margin'] = (float) Margin::calculate($update_array, 1);
-
-        $update_array['bmoid'] = $odds['bmoid'];
-        $update_array['sport_id'] = $odds['sport_id'];
-        $update_array['offer_id'] = $odds['offer_id'];
-        $update_array['flag'] = 1;
-        $update_array['provider_id'] = Nuh::$options['provider_id'];
-        $update_array['nuh_check'] = 0;
-        $update_array['last_check_at'] = Carbon::now()->toDateTimeString();
-        $update_array['source_updated_at'] = $odds['source_updated_at'];
+        $odds['margin'] = (float) Margin::calculate([$odds['dc1x'], $odds['dc12'], $odds['dc2x']], 1);
 
         OddsDc::updateOrCreate([
-            'event_id' => Nuh::$_event->id,
+            'event_id' => Nuh::$id,
             'bookmaker_id' => Nuh::$bookmaker_id,
-        ], $update_array);
+        ], $odds);
     }
 }

app/Console/Commands/Grapper/TxOdds/Odds/_Dnb.php

@@ -6,7 +6,6 @@ use App\Console\Commands\Nuh;
 use App\Models\OddsDnb;
 use App\Utilities\Margin;
 use App\Utilities\Notice;
-use Illuminate\Support\Carbon;
 
 class _Dnb
 {
@@ -18,25 +17,15 @@ class _Dnb
             Notice::note('Draw No Bet '.Nuh::$bookmaker_id, 'b');
         }
 
-        $update_array = [];
         foreach ($offer as $value) {
-            $update_array['dnb1'] = (float) $value->o1;
-            $update_array['dnb2'] = (float) $value->o3;
+            $odds['dnb1'] = (float) $value->o1;
+            $odds['dnb2'] = (float) $value->o3;
         }
-        $update_array['margin'] = (float) Margin::calculate($update_array, 1);
-
-        $update_array['bmoid'] = $odds['bmoid'];
-        $update_array['sport_id'] = $odds['sport_id'];
-        $update_array['offer_id'] = $odds['offer_id'];
-        $update_array['flag'] = 1;
-        $update_array['provider_id'] = Nuh::$options['provider_id'];
-        $update_array['nuh_check'] = 0;
-        $update_array['last_check_at'] = Carbon::now()->toDateTimeString();
-        $update_array['source_updated_at'] = $odds['source_updated_at'];
+        $odds['margin'] = (float) Margin::calculate([$odds['dnb1'], $odds['dnb2']], 1);
 
         OddsDnb::updateOrCreate([
-            'event_id' => Nuh::$_event->id,
+            'event_id' => Nuh::$id,
             'bookmaker_id' => Nuh::$bookmaker_id,
-        ], $update_array);
+        ], $odds);
     }
 }

app/Console/Commands/Grapper/TxOdds/Odds/_Ggng.php

@@ -6,7 +6,6 @@ use App\Console\Commands\Nuh;
 use App\Models\OddsGgng;
 use App\Utilities\Margin;
 use App\Utilities\Notice;
-use Illuminate\Support\Carbon;
 
 class _Ggng
 {
@@ -18,25 +17,15 @@ class _Ggng
             Notice::note('Goal No Goal '.Nuh::$bookmaker_id, 'b');
         }
 
-        $update_array = [];
         foreach ($offer as $value) {
-            $update_array['gg'] = (float) $value->o1;
-            $update_array['ng'] = (float) $value->o3;
+            $odds['gg'] = (float) $value->o1;
+            $odds['ng'] = (float) $value->o3;
         }
-        $update_array['margin'] = (float) Margin::calculate($update_array, 1);
-
-        $update_array['bmoid'] = $odds['bmoid'];
-        $update_array['sport_id'] = $odds['sport_id'];
-        $update_array['offer_id'] = $odds['offer_id'];
-        $update_array['flag'] = 1;
-        $update_array['provider_id'] = Nuh::$options['provider_id'];
-        $update_array['nuh_check'] = 0;
-        $update_array['last_check_at'] = Carbon::now()->toDateTimeString();
-        $update_array['source_updated_at'] = $odds['source_updated_at'];
+        $odds['margin'] = (float) Margin::calculate([$odds['gg'], $odds['ng']], 1);
 
         OddsGgng::updateOrCreate([
-            'event_id' => Nuh::$_event->id,
+            'event_id' => Nuh::$id,
             'bookmaker_id' => Nuh::$bookmaker_id,
-        ], $update_array);
+        ], $odds);
     }
 }

app/Console/Commands/Grapper/TxOdds/Odds/_Totals.php

@@ -6,7 +6,6 @@ use App\Console\Commands\Nuh;
 use App\Models\OddsTotal;
 use App\Utilities\Margin;
 use App\Utilities\Notice;
-use Illuminate\Support\Carbon;
 
 class _Totals
 {
@@ -18,34 +17,23 @@ class _Totals
             Notice::note('Totals '.Nuh::$bookmaker_id, 'b');
         }
 
-        $update_array = [];
-
         foreach ($offer as $value) {
-            $update_array['over'] = (float) $value->o1;
-            $update_array['under'] = (float) $value->o2;
-            $update_array['total'] = (float) $value->o3;
+            $odds['over'] = (float) $value->o1;
+            $odds['under'] = (float) $value->o2;
+            $odds['total'] = (float) $value->o3;
         }
 
         if ($odds['sport_id'] == 1) {
-            if ((float) $update_array['total'] != 2.5) {
+            if ((float) $odds['total'] != 2.5) {
                 return;
             }
         }
 
-        $update_array['margin'] = (float) Margin::calculate([$update_array['over'], $update_array['under']], 1);
-
-        $update_array['bmoid'] = $odds['bmoid'];
-        $update_array['sport_id'] = $odds['sport_id'];
-        $update_array['offer_id'] = $odds['offer_id'];
-        $update_array['flag'] = 1;
-        $update_array['provider_id'] = Nuh::$options['provider_id'];
-        $update_array['nuh_check'] = 0;
-        $update_array['last_check_at'] = Carbon::now()->toDateTimeString();
-        $update_array['source_updated_at'] = $odds['source_updated_at'];
+        $odds['margin'] = (float) Margin::calculate([$odds['over'], $odds['under']], 1);
 
         OddsTotal::updateOrCreate([
-            'event_id' => Nuh::$_event->id,
+            'event_id' => Nuh::$id,
             'bookmaker_id' => Nuh::$bookmaker_id,
-        ], $update_array);
+        ], $odds);
     }
 }

app/Console/Commands/Grapper/TxOdds/Odds/_Tq.php

@@ -6,7 +6,6 @@ use App\Console\Commands\Nuh;
 use App\Models\OddsQualify;
 use App\Utilities\Margin;
 use App\Utilities\Notice;
-use Illuminate\Support\Carbon;
 
 class _Tq
 {
@@ -18,25 +17,15 @@ class _Tq
             Notice::note('To Qualify '.Nuh::$bookmaker_id, 'b');
         }
 
-        $update_array = [];
         foreach ($offer as $value) {
-            $update_array['hta'] = (float) $value->o1;
-            $update_array['atq'] = (float) $value->o3;
+            $odds['htq'] = (float) $value->o1;
+            $odds['atq'] = (float) $value->o3;
         }
-        $update_array['margin'] = (float) Margin::calculate($update_array, 1);
-
-        $update_array['bmoid'] = $odds['bmoid'];
-        $update_array['sport_id'] = $odds['sport_id'];
-        $update_array['offer_id'] = $odds['offer_id'];
-        $update_array['flag'] = 1;
-        $update_array['provider_id'] = Nuh::$options['provider_id'];
-        $update_array['nuh_check'] = 0;
-        $update_array['last_check_at'] = Carbon::now()->toDateTimeString();
-        $update_array['source_updated_at'] = $odds['source_updated_at'];
+        $odds['margin'] = (float) Margin::calculate([$odds['htq'], $odds['atq']], 1);
 
         OddsQualify::updateOrCreate([
-            'event_id' => Nuh::$_event->id,
+            'event_id' => Nuh::$id,
             'bookmaker_id' => Nuh::$bookmaker_id,
-        ], $update_array);
+        ], $odds);
     }
 }

app/Console/Commands/Nuh.php

@@ -15,9 +15,7 @@ class Nuh extends Command
 {
     public static $options = [];
 
-    public static $_event;
-
-    public static $_event_bookmaker;
+    public static $id = 0;
 
     public static $bookmaker_id;
 

app/Filament/Resources/Events/EventResource.php

@@ -10,9 +10,7 @@ use Carbon\Carbon;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
 use Filament\Tables\Table;
-use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 
 class EventResource extends Resource
 {
@@ -28,27 +26,6 @@ class EventResource extends Resource
 
     protected static ?string $pluralModelLabel = '';
 
-    // protected static ?string $recordTitleAttribute = 'tx_id';
-    // public static function getGlobalSearchResultTitle(Model $record): string|Htmlable
-    // {
-    //     return $record->home->name.' - '.$record->away->name;
-    // }
-    // public static function getGlobalSearchResultDetails(Model $record): array
-    // {
-    //     return [
-    //         'League' => $record->competition_group->name,
-    //         'Country' => $record->country->name,
-    //     ];
-    // }
-    // public static function getGloballySearchableAttributes(): array
-    // {
-    //     return ['tx_id', 'betradar_id', 'competition_group.name', 'country.name', 'away.name', 'home.name'];
-    // }
-    // public static function getGlobalSearchResultUrl(Symbol|Model $record): string
-    // {
-    //     return EventResource::getUrl('edit', ['record' => $record]); // Links to the edit page
-    // }
-
     public static function form(Schema $schema): Schema
     {
         return EventForm::configure($schema);

app/Filament/Resources/Events/Tables/EventsTable.php

@@ -34,17 +34,18 @@ class EventsTable
                     ->size(IconSize::ExtraLarge)
                     ->icon(fn ($record) => $record->sport->icon)
                     ->tooltip(fn ($record) => $record->id),
-                TextColumn::make('tx_id')
+                TextColumn::make('txodds_id')
+                    ->state(fn ($record) => $record->id)
+                    ->description(fn ($record) => $record->betsapi_id)
+                    ->copyable()
                     ->label('Id')
-                    ->badge()
-                    ->searchable()
-                    ->copyable(),
+                    ->alignCenter(),
                 TextColumn::make('starttime')
                     ->label('Start')
                     ->alignCenter()
-                    ->dateTime('d.m')
+                    ->dateTime('H:i')
                     ->weight(FontWeight::Bold)
-                    ->description(fn ($state): string => Carbon::createFromDate($state)->format('H:i')),
+                    ->description(fn ($state): string => Carbon::createFromDate($state)->format('d. M')),
                 TextColumn::make('country.name')
                     ->searchable()
                     ->color('gray')
@@ -56,7 +57,9 @@ class EventsTable
                     ->alignRight(),
                 TextColumn::make('away.name')
                     ->searchable(),
-                MultilineColumn::make('id')->label(fn () => view('filament.tables.columns.multiline.label')),
+                MultilineColumn::make('id')
+                    ->searchable()
+                    ->label(fn () => view('filament.tables.columns.multiline.label')),
             ])
             ->poll('10s')
             ->defaultSort('starttime', 'ASC')
@@ -105,7 +108,7 @@ class EventsTable
                                 fn (Builder $query, $sport_id) => $query->where('country_id', $sport_id)
                             )->when(
                                 $data['competition_group_id'],
-                                fn (Builder $query, $competition_group_id) => $query->where('competition_group_id', $competition_group_id)
+                                fn (Builder $query, $competition_group_id) => $query->whereIn('competition_group_id', $competition_group_id)
                             );
                     })
                     ->columns(6)->columnSpan(6),
@@ -121,7 +124,7 @@ class EventsTable
                         ->label('TxOdds')
                         ->disabled(fn () => ! auth()->user()->super_admin)
                         ->icon('heroicon-o-arrow-top-right-on-square')
-                        ->url(fn ($record): string => route('txodds_odds', ['sportid' => $record->sport_id, 'txoddsid' => $record->tx_id]))
+                        ->url(fn ($record): string => route('txodds_odds', ['sportid' => $record->sport_id, 'txoddsid' => $record->id]))
                         ->openUrlInNewTab(),
                 ])->iconButton()
                     ->icon('heroicon-m-ellipsis-vertical')

app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php

@@ -22,7 +22,10 @@ class SupervisorsTable
                     ->options([
                         'Fixtures' => 'Fixtures',
                         'Odds' => 'Odds',
-                        'IdMapper' => 'IdMapper',
+                        'Willhill' => 'Willhill',
+                        'Bwin' => 'Bwin',
+                        'Bet365' => 'Bet365',
+                        'Betfair' => 'Betfair',
                     ]),
                 TextColumn::make('provider.name')->badge(),
                 TextColumn::make('sport.name')->label('Sport'),

app/Filament/Tables/Columns/MultilineColumn.php

@@ -16,7 +16,6 @@ class MultilineColumn extends Column
 
     public function loadSlots($event_id, $bookmakers)
     {
-
         $systemSettings = app('systemSettings');
         $this->settings = $systemSettings[auth()->user()->multiline_setting_id];
 
@@ -99,8 +98,8 @@ class MultilineColumn extends Column
             }
             if ($open) {
                 $item = new stdClass;
-                $item->bookmaker_id = $bookmaker->bookmaker_id;
                 $item->icon = $bookmaker->bookmaker->icon;
+                $item->bookmaker_id = $bookmaker->bookmaker_id;
                 $item->a = 0;
                 $item->b = 0;
                 $item->c = 0;

app/Models/CompetitionGroup.php

@@ -7,8 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 class CompetitionGroup extends Model
 {
     protected $fillable = [
+        'id',
         'name',
-        'tx_id',
         'sport_id',
         'country_id',
     ];

app/Models/Element.php

@@ -7,8 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 class Element extends Model
 {
     protected $fillable = [
+        'id',
         'name',
-        'tx_id',
         'sport_id',
     ];
 

app/Models/Event.php

@@ -7,6 +7,13 @@ use Illuminate\Database\Eloquent\Model;
 class Event extends Model
 {
     protected $fillable = [
+        'id',
+        'provider_id',
+        'betsapi_id',
+        'betradar_id',
+        'bet365_id',
+        '_1xbet_id',
+        'bwin_id',
         'starttime',
         'sport_id',
         'country_id',
@@ -14,10 +21,6 @@ class Event extends Model
         'competition_group_id',
         'home_id',
         'away_id',
-        'tx_id',
-        'provider_id',
-        'betaid_id',
-        'betradar_id',
     ];
 
     public function sport()
@@ -32,22 +35,22 @@ class Event extends Model
 
     public function group()
     {
-        return $this->hasOne(Group::class, 'tx_id', 'group_id');
+        return $this->hasOne(Group::class, 'id', 'group_id');
     }
 
     public function competition_group()
     {
-        return $this->hasOne(CompetitionGroup::class, 'tx_id', 'competition_group_id');
+        return $this->hasOne(CompetitionGroup::class, 'id', 'competition_group_id');
     }
 
     public function home()
     {
-        return $this->hasOne(Element::class, 'tx_id', 'home_id');
+        return $this->hasOne(Element::class, 'id', 'home_id');
     }
 
     public function away()
     {
-        return $this->hasOne(Element::class, 'tx_id', 'away_id');
+        return $this->hasOne(Element::class, 'id', 'away_id');
     }
 
     public function multiline_client()

app/Models/Group.php

@@ -7,8 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 class Group extends Model
 {
     protected $fillable = [
+        'id',
         'name',
-        'tx_id',
         'competition_group_id',
         'sport_id',
         'country_id',

app/Models/Mapper.php

@@ -7,15 +7,10 @@ use Illuminate\Database\Eloquent\Model;
 class Mapper extends Model
 {
     protected $fillable = [
-        'sport_id',
+        'event_id',
         'provider_id',
+        'sport_id',
         'tx_id',
-        'betradar_id',
-        'betradar_id',
-        'betsapi_id',
-        'bet365_id',
-        '_1xbet_id',
-        'betfairsb_id',
         'starttime',
         'group',
         'group_id',

composer.lock

@@ -10505,31 +10505,32 @@
         },
         {
             "name": "php-debugbar/php-debugbar",
-            "version": "v2.2.4",
+            "version": "v2.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35"
+                "reference": "c5dce08e98dd101c771e55949fd89124b216271d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
-                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/c5dce08e98dd101c771e55949fd89124b216271d",
+                "reference": "c5dce08e98dd101c771e55949fd89124b216271d",
                 "shasum": ""
             },
             "require": {
-                "php": "^8",
+                "php": "^8.1",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^4|^5|^6|^7"
+                "symfony/var-dumper": "^5.4|^6.4|^7.3|^8.0"
             },
             "replace": {
                 "maximebf/debugbar": "self.version"
             },
             "require-dev": {
                 "dbrekelmans/bdi": "^1",
-                "phpunit/phpunit": "^8|^9",
+                "phpunit/phpunit": "^10",
+                "symfony/browser-kit": "^6.0|7.0",
                 "symfony/panther": "^1|^2.1",
-                "twig/twig": "^1.38|^2.7|^3.0"
+                "twig/twig": "^3.11.2"
             },
             "suggest": {
                 "kriswallsmith/assetic": "The best way to manage assets",
@@ -10539,7 +10540,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -10572,9 +10573,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.4"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.5"
             },
-            "time": "2025-07-22T14:01:30+00:00"
+            "time": "2025-12-21T08:50:08+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",

config/blade-icons.php

@@ -28,8 +28,8 @@ return [
             ],
 
         ],
-        'bicon' => [
-            'path' => 'resources/bkm_icon_svg',
+        'bkm' => [
+            'path' => 'resources/bkm',
             'disk' => '',
             'prefix' => 'bkm',
             'fallback' => 'missing',

database/migrations/2023_05_25_112700_create_events_table.php

@@ -13,7 +13,6 @@ return new class extends Migration
     {
         Schema::create('events', function (Blueprint $table) {
             $table->id();
-            $table->integer('tx_id')->default(0)->nullable()->index();
             $table->integer('provider_id')->default(0)->nullable()->index();
             $table->integer('betsapi_id')->default(0)->nullable()->index();
             $table->integer('betradar_id')->default(0)->nullable()->index();

database/migrations/2023_05_25_112749_create_element_table.php

@@ -13,7 +13,6 @@ return new class extends Migration
     {
         Schema::create('elements', function (Blueprint $table) {
             $table->id();
-            $table->integer('tx_id')->index();
             $table->string('name');
             $table->integer('sport_id')->index();
             $table->timestamps();

database/migrations/2023_05_25_112751_create_group_table.php

@@ -14,7 +14,6 @@ return new class extends Migration
         Schema::create('groups', function (Blueprint $table) {
             $table->id();
             $table->string('name');
-            $table->integer('tx_id')->index();
             $table->integer('sport_id')->index();
             $table->integer('competition_group_id')->index();
             $table->integer('country_id')->default(0)->nullable()->index();

database/migrations/2023_05_25_112801_create_competition_groups_table.php

@@ -14,7 +14,6 @@ return new class extends Migration
         Schema::create('competition_groups', function (Blueprint $table) {
             $table->id();
             $table->string('name');
-            $table->integer('tx_id')->index();
             $table->integer('sport_id')->index();
             $table->integer('country_id')->default(0)->nullable()->index();
             $table->timestamps();

database/migrations/2024_11_08_053426_create_odds_3ways_table.php

@@ -25,6 +25,7 @@ return new class extends Migration
             $table->decimal('margin', 5, 1)->default(0);
             $table->boolean('flag')->default(0);
             $table->boolean('nuh_check')->default(0);
+            $table->timestamp('starting_time')->nullable();
             $table->timestamp('last_check_at')->nullable();
             $table->timestamp('source_updated_at')->nullable();
             $table->timestamps();

database/migrations/2024_11_08_053430_create_odds_2ways_table_s1.php

@@ -24,6 +24,7 @@ return new class extends Migration
             $table->decimal('margin', 5, 1)->default(0);
             $table->boolean('flag')->default(0);
             $table->boolean('nuh_check')->default(0);
+            $table->timestamp('starting_time')->nullable();
             $table->timestamp('last_check_at')->nullable();
             $table->timestamp('source_updated_at')->nullable();
             $table->timestamps();

database/migrations/2024_11_08_053439_create_odds_handicaps_table.php

@@ -25,6 +25,7 @@ return new class extends Migration
             $table->decimal('margin', 5, 1)->default(0);
             $table->boolean('flag')->default(0);
             $table->boolean('nuh_check')->default(0);
+            $table->timestamp('starting_time')->nullable();
             $table->timestamp('last_check_at')->nullable();
             $table->timestamp('source_updated_at')->nullable();
             $table->timestamps();

database/migrations/2025_05_17_074540_create_bookmakers_table.php

@@ -15,7 +15,7 @@ return new class extends Migration
             $table->id();
             $table->string('name');
             $table->string('icon')->nullable();
-            $table->string('image')->nullable();
+            $table->string('svg')->nullable();
             $table->integer('baid')->default(0);
             $table->integer('txid')->default(0);
             $table->boolean('txso')->default(0);

database/migrations/2025_12_19_111819_create_mappers_table.php

@@ -13,14 +13,10 @@ return new class extends Migration
     {
         Schema::create('mappers', function (Blueprint $table) {
             $table->id();
+            $table->integer('event_id')->index();
             $table->integer('sport_id')->index();
+            $table->integer('bookmaker_id')->index();
             $table->integer('provider_id')->default(0)->nullable()->index();
-            $table->integer('tx_id')->default(0)->nullable()->index();
-            $table->integer('betradar_id')->default(0)->nullable()->index();
-            $table->integer('betsapi_id')->default(0)->nullable()->index();
-            $table->integer('bet365_id')->default(0)->nullable()->index();
-            $table->integer('_1xbet_id')->default(0)->nullable()->index();
-            $table->integer('betfairsb_id')->default(0)->nullable()->index();
             $table->dateTime('starttime')->nullable();
             $table->string('group')->nullable();
             $table->integer('group_id')->default(0)->nullable()->index();

database/seeders/SupervisorSeeder.php

@@ -14,11 +14,12 @@ class SupervisorSeeder extends Seeder
          */
         $sql = "INSERT INTO `supervisors` (`id`, `name`, `provider_id`, `sport_id`, `sleep`, `limit`, `runtime`, `maxsconds`, `lastcall`, `is_cron`, `is_active`, `created_at`, `updated_at`)
                 VALUES
-                    (1, 'Fixtures', 1, 1, 10, 0, '0.033', 1800, 0, 1, 1, '2025-08-27 07:39:55', '2025-12-18 18:00:40'),
-                    (2, 'Odds', 1, 1, 10, 0, '0.121', 30, 0, 0, 1, '2025-12-01 05:41:02', '2025-12-19 11:39:07'),
-                    (3, 'Fixtures', 4, 1, 10, 0, '0', 30, 0, 0, 1, '2025-12-18 17:44:33', '2025-12-18 18:41:36'),
-                    (4, 'Fixtures', 2, 0, 15, 0, NULL, 1800, 0, 0, 1, '2025-12-19 11:42:35', '2025-12-19 11:42:42'),
-                    (5, 'IdMapper', 2, 0, 15, 0, '0.032', 1800, 0, 0, 1, '2025-12-19 11:48:05', '2025-12-19 12:36:57');
+                    (1, 'Fixtures', 1, 1, 10, 0, '0.042', 1800, 0, 1, 1, '2025-08-27 07:39:55', '2025-12-22 05:20:19'),
+                    (2, 'Odds', 1, 1, 10, 0, '0.251', 30, 0, 0, 1, '2025-12-01 05:41:02', '2025-12-22 05:20:40'),
+                    (3, 'Fixtures', 4, 1, 10, 0, '0', 30, 0, 1, 1, '2025-12-18 17:44:33', '2025-12-22 06:41:48'),
+                    (4, 'Fixtures', 2, 0, 15, 0, NULL, 1800, 0, 1, 1, '2025-12-19 11:42:35', '2025-12-22 06:41:47'),
+                    (5, 'Willhill', 2, 0, 15, 0, '0.235', 1800, 0, 1, 1, '2025-12-19 11:48:05', '2025-12-22 06:41:51'),
+                    (6, 'Bwin', 2, 0, 15, 0, NULL, 1800, 0, 1, 1, '2025-12-22 06:41:18', '2025-12-22 06:41:52');
                 ";
         DB::unprepared($sql);
 

package-lock.json

@@ -507,9 +507,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.5.tgz",
-            "integrity": "sha512-iDGS/h7D8t7tvZ1t6+WPK04KD0MwzLZrG0se1hzBjSi5fyxlsiggoJHwh18PCFNn7tG43OWb6pdZ6Y+rMlmyNQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.54.0.tgz",
+            "integrity": "sha512-OywsdRHrFvCdvsewAInDKCNyR3laPA2mc9bRYJ6LBp5IyvF3fvXbbNR0bSzHlZVFtn6E0xw2oZlyjg4rKCVcng==",
             "cpu": [
                 "arm"
             ],
@@ -521,9 +521,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.5.tgz",
-            "integrity": "sha512-wrSAViWvZHBMMlWk6EJhvg8/rjxzyEhEdgfMMjREHEq11EtJ6IP6yfcCH57YAEca2Oe3FNCE9DSTgU70EIGmVw==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.54.0.tgz",
+            "integrity": "sha512-Skx39Uv+u7H224Af+bDgNinitlmHyQX1K/atIA32JP3JQw6hVODX5tkbi2zof/E69M1qH2UoN3Xdxgs90mmNYw==",
             "cpu": [
                 "arm64"
             ],
@@ -535,9 +535,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.5.tgz",
-            "integrity": "sha512-S87zZPBmRO6u1YXQLwpveZm4JfPpAa6oHBX7/ghSiGH3rz/KDgAu1rKdGutV+WUI6tKDMbaBJomhnT30Y2t4VQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.54.0.tgz",
+            "integrity": "sha512-k43D4qta/+6Fq+nCDhhv9yP2HdeKeP56QrUUTW7E6PhZP1US6NDqpJj4MY0jBHlJivVJD5P8NxrjuobZBJTCRw==",
             "cpu": [
                 "arm64"
             ],
@@ -549,9 +549,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.5.tgz",
-            "integrity": "sha512-YTbnsAaHo6VrAczISxgpTva8EkfQus0VPEVJCEaboHtZRIb6h6j0BNxRBOwnDciFTZLDPW5r+ZBmhL/+YpTZgA==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.54.0.tgz",
+            "integrity": "sha512-cOo7biqwkpawslEfox5Vs8/qj83M/aZCSSNIWpVzfU2CYHa2G3P1UN5WF01RdTHSgCkri7XOlTdtk17BezlV3A==",
             "cpu": [
                 "x64"
             ],
@@ -563,9 +563,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.5.tgz",
-            "integrity": "sha512-1T8eY2J8rKJWzaznV7zedfdhD1BqVs1iqILhmHDq/bqCUZsrMt+j8VCTHhP0vdfbHK3e1IQ7VYx3jlKqwlf+vw==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.54.0.tgz",
+            "integrity": "sha512-miSvuFkmvFbgJ1BevMa4CPCFt5MPGw094knM64W9I0giUIMMmRYcGW/JWZDriaw/k1kOBtsWh1z6nIFV1vPNtA==",
             "cpu": [
                 "arm64"
             ],
@@ -577,9 +577,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.5.tgz",
-            "integrity": "sha512-sHTiuXyBJApxRn+VFMaw1U+Qsz4kcNlxQ742snICYPrY+DDL8/ZbaC4DVIB7vgZmp3jiDaKA0WpBdP0aqPJoBQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.54.0.tgz",
+            "integrity": "sha512-KGXIs55+b/ZfZsq9aR026tmr/+7tq6VG6MsnrvF4H8VhwflTIuYh+LFUlIsRdQSgrgmtM3fVATzEAj4hBQlaqQ==",
             "cpu": [
                 "x64"
             ],
@@ -591,9 +591,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.5.tgz",
-            "integrity": "sha512-dV3T9MyAf0w8zPVLVBptVlzaXxka6xg1f16VAQmjg+4KMSTWDvhimI/Y6mp8oHwNrmnmVl9XxJ/w/mO4uIQONA==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.54.0.tgz",
+            "integrity": "sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==",
             "cpu": [
                 "arm"
             ],
@@ -605,9 +605,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.5.tgz",
-            "integrity": "sha512-wIGYC1x/hyjP+KAu9+ewDI+fi5XSNiUi9Bvg6KGAh2TsNMA3tSEs+Sh6jJ/r4BV/bx/CyWu2ue9kDnIdRyafcQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.54.0.tgz",
+            "integrity": "sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==",
             "cpu": [
                 "arm"
             ],
@@ -619,9 +619,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.5.tgz",
-            "integrity": "sha512-Y+qVA0D9d0y2FRNiG9oM3Hut/DgODZbU9I8pLLPwAsU0tUKZ49cyV1tzmB/qRbSzGvY8lpgGkJuMyuhH7Ma+Vg==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.54.0.tgz",
+            "integrity": "sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==",
             "cpu": [
                 "arm64"
             ],
@@ -633,9 +633,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.5.tgz",
-            "integrity": "sha512-juaC4bEgJsyFVfqhtGLz8mbopaWD+WeSOYr5E16y+1of6KQjc0BpwZLuxkClqY1i8sco+MdyoXPNiCkQou09+g==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.54.0.tgz",
+            "integrity": "sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==",
             "cpu": [
                 "arm64"
             ],
@@ -647,9 +647,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loong64-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.5.tgz",
-            "integrity": "sha512-rIEC0hZ17A42iXtHX+EPJVL/CakHo+tT7W0pbzdAGuWOt2jxDFh7A/lRhsNHBcqL4T36+UiAgwO8pbmn3dE8wA==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.54.0.tgz",
+            "integrity": "sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==",
             "cpu": [
                 "loong64"
             ],
@@ -661,9 +661,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.5.tgz",
-            "integrity": "sha512-T7l409NhUE552RcAOcmJHj3xyZ2h7vMWzcwQI0hvn5tqHh3oSoclf9WgTl+0QqffWFG8MEVZZP1/OBglKZx52Q==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.54.0.tgz",
+            "integrity": "sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==",
             "cpu": [
                 "ppc64"
             ],
@@ -675,9 +675,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.5.tgz",
-            "integrity": "sha512-7OK5/GhxbnrMcxIFoYfhV/TkknarkYC1hqUw1wU2xUN3TVRLNT5FmBv4KkheSG2xZ6IEbRAhTooTV2+R5Tk0lQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.54.0.tgz",
+            "integrity": "sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -689,9 +689,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.5.tgz",
-            "integrity": "sha512-GwuDBE/PsXaTa76lO5eLJTyr2k8QkPipAyOrs4V/KJufHCZBJ495VCGJol35grx9xryk4V+2zd3Ri+3v7NPh+w==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.54.0.tgz",
+            "integrity": "sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==",
             "cpu": [
                 "riscv64"
             ],
@@ -703,9 +703,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.5.tgz",
-            "integrity": "sha512-IAE1Ziyr1qNfnmiQLHBURAD+eh/zH1pIeJjeShleII7Vj8kyEm2PF77o+lf3WTHDpNJcu4IXJxNO0Zluro8bOw==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.54.0.tgz",
+            "integrity": "sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==",
             "cpu": [
                 "s390x"
             ],
@@ -717,9 +717,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.5.tgz",
-            "integrity": "sha512-Pg6E+oP7GvZ4XwgRJBuSXZjcqpIW3yCBhK4BcsANvb47qMvAbCjR6E+1a/U2WXz1JJxp9/4Dno3/iSJLcm5auw==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.54.0.tgz",
+            "integrity": "sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==",
             "cpu": [
                 "x64"
             ],
@@ -731,9 +731,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.5.tgz",
-            "integrity": "sha512-txGtluxDKTxaMDzUduGP0wdfng24y1rygUMnmlUJ88fzCCULCLn7oE5kb2+tRB+MWq1QDZT6ObT5RrR8HFRKqg==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.54.0.tgz",
+            "integrity": "sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==",
             "cpu": [
                 "x64"
             ],
@@ -745,9 +745,9 @@
             ]
         },
         "node_modules/@rollup/rollup-openharmony-arm64": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.5.tgz",
-            "integrity": "sha512-3DFiLPnTxiOQV993fMc+KO8zXHTcIjgaInrqlG8zDp1TlhYl6WgrOHuJkJQ6M8zHEcntSJsUp1XFZSY8C1DYbg==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.54.0.tgz",
+            "integrity": "sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==",
             "cpu": [
                 "arm64"
             ],
@@ -759,9 +759,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.5.tgz",
-            "integrity": "sha512-nggc/wPpNTgjGg75hu+Q/3i32R00Lq1B6N1DO7MCU340MRKL3WZJMjA9U4K4gzy3dkZPXm9E1Nc81FItBVGRlA==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.54.0.tgz",
+            "integrity": "sha512-c2V0W1bsKIKfbLMBu/WGBz6Yci8nJ/ZJdheE0EwB73N3MvHYKiKGs3mVilX4Gs70eGeDaMqEob25Tw2Gb9Nqyw==",
             "cpu": [
                 "arm64"
             ],
@@ -773,9 +773,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.5.tgz",
-            "integrity": "sha512-U/54pTbdQpPLBdEzCT6NBCFAfSZMvmjr0twhnD9f4EIvlm9wy3jjQ38yQj1AGznrNO65EWQMgm/QUjuIVrYF9w==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.54.0.tgz",
+            "integrity": "sha512-woEHgqQqDCkAzrDhvDipnSirm5vxUXtSKDYTVpZG3nUdW/VVB5VdCYA2iReSj/u3yCZzXID4kuKG7OynPnB3WQ==",
             "cpu": [
                 "ia32"
             ],
@@ -787,9 +787,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-gnu": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.5.tgz",
-            "integrity": "sha512-2NqKgZSuLH9SXBBV2dWNRCZmocgSOx8OJSdpRaEcRlIfX8YrKxUT6z0F1NpvDVhOsl190UFTRh2F2WDWWCYp3A==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.54.0.tgz",
+            "integrity": "sha512-dzAc53LOuFvHwbCEOS0rPbXp6SIhAf2txMP5p6mGyOXXw5mWY8NGGbPMPrs4P1WItkfApDathBj/NzMLUZ9rtQ==",
             "cpu": [
                 "x64"
             ],
@@ -801,9 +801,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.5.tgz",
-            "integrity": "sha512-JRpZUhCfhZ4keB5v0fe02gQJy05GqboPOaxvjugW04RLSYYoB/9t2lx2u/tMs/Na/1NXfY8QYjgRljRpN+MjTQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.54.0.tgz",
+            "integrity": "sha512-hYT5d3YNdSh3mbCU1gwQyPgQd3T2ne0A3KG8KSBdav5TiBg6eInVmV+TeR5uHufiIgSFg0XsOWGW5/RhNcSvPg==",
             "cpu": [
                 "x64"
             ],
@@ -2044,9 +2044,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.53.5",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.5.tgz",
-            "integrity": "sha512-iTNAbFSlRpcHeeWu73ywU/8KuU/LZmNCSxp6fjQkJBD3ivUb8tpDrXhIxEzA05HlYMEwmtaUnb3RP+YNv162OQ==",
+            "version": "4.54.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.54.0.tgz",
+            "integrity": "sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2060,28 +2060,28 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.53.5",
-                "@rollup/rollup-android-arm64": "4.53.5",
-                "@rollup/rollup-darwin-arm64": "4.53.5",
-                "@rollup/rollup-darwin-x64": "4.53.5",
-                "@rollup/rollup-freebsd-arm64": "4.53.5",
-                "@rollup/rollup-freebsd-x64": "4.53.5",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.53.5",
-                "@rollup/rollup-linux-arm-musleabihf": "4.53.5",
-                "@rollup/rollup-linux-arm64-gnu": "4.53.5",
-                "@rollup/rollup-linux-arm64-musl": "4.53.5",
-                "@rollup/rollup-linux-loong64-gnu": "4.53.5",
-                "@rollup/rollup-linux-ppc64-gnu": "4.53.5",
-                "@rollup/rollup-linux-riscv64-gnu": "4.53.5",
-                "@rollup/rollup-linux-riscv64-musl": "4.53.5",
-                "@rollup/rollup-linux-s390x-gnu": "4.53.5",
-                "@rollup/rollup-linux-x64-gnu": "4.53.5",
-                "@rollup/rollup-linux-x64-musl": "4.53.5",
-                "@rollup/rollup-openharmony-arm64": "4.53.5",
-                "@rollup/rollup-win32-arm64-msvc": "4.53.5",
-                "@rollup/rollup-win32-ia32-msvc": "4.53.5",
-                "@rollup/rollup-win32-x64-gnu": "4.53.5",
-                "@rollup/rollup-win32-x64-msvc": "4.53.5",
+                "@rollup/rollup-android-arm-eabi": "4.54.0",
+                "@rollup/rollup-android-arm64": "4.54.0",
+                "@rollup/rollup-darwin-arm64": "4.54.0",
+                "@rollup/rollup-darwin-x64": "4.54.0",
+                "@rollup/rollup-freebsd-arm64": "4.54.0",
+                "@rollup/rollup-freebsd-x64": "4.54.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.54.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.54.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.54.0",
+                "@rollup/rollup-linux-arm64-musl": "4.54.0",
+                "@rollup/rollup-linux-loong64-gnu": "4.54.0",
+                "@rollup/rollup-linux-ppc64-gnu": "4.54.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.54.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.54.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.54.0",
+                "@rollup/rollup-linux-x64-gnu": "4.54.0",
+                "@rollup/rollup-linux-x64-musl": "4.54.0",
+                "@rollup/rollup-openharmony-arm64": "4.54.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.54.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.54.0",
+                "@rollup/rollup-win32-x64-gnu": "4.54.0",
+                "@rollup/rollup-win32-x64-msvc": "4.54.0",
                 "fsevents": "~2.3.2"
             }
         },

resources/bkm/1xbet.svg

@@ -2,7 +2,6 @@
     <defs>
         <style>.cls-1{fill:#007acc;}.cls-2{fill:#002f5e;}</style>
     </defs>
-    <title>logoo</title>
     <g id="Layer_1" data-name="Layer 1">
         <path class="cls-1" d="M73.8,8.37C74.94,3.79,72.16,0,65.35,0L50.59,0,45.06,22.4l3.21,5.51h10.5c6.88,0,12.21-3.21,13.58-8.79.69-2.86-.11-4.86-1.91-5.86v-.07A7.78,7.78,0,0,0,73.8,8.37Zm-9,10.57c-.28,1.17-1.07,2.37-4.34,2.37h-6.7l1.17-4.8h6.67C64.83,16.5,65.07,17.73,64.76,18.94ZM66.14,8.52c-.24.9-.93,2-3.75,2h-6l1-3.9h6C66.24,6.6,66.38,7.52,66.14,8.52Z"/>
         <polygon class="cls-1" points="83.09 17.1 96.53 17.1 98.06 10.5 84.71 10.5 85.75 6.6 98.97 6.6 100.5 0 78.8 0 71.92 27.9 96.5 27.9 98.11 21.3 82.1 21.3 83.09 17.1"/>

resources/bkm/bet365.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 13892 2971" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M18.75,27.083l941.667,0c-0.696,375.004 -0,750.005 2.083,1125c124.271,-166.329 290.938,-255.216 500,-266.666c448.55,-18.034 737.438,187.525 866.667,616.666c67.512,269.542 73.071,540.375 16.666,812.5c-113.637,465.75 -409.471,689.375 -887.5,670.834c-138.187,-9 -263.879,-52.75 -377.083,-131.25c-75.821,-61.917 -136.237,-136.209 -181.25,-222.917c-2.083,109.708 -2.779,219.417 -2.083,329.167l-879.167,-0l0,-2933.33Zm1116.67,1462.5c111.616,-9.166 187.312,38.042 227.083,141.667c16.963,50.083 28.075,101.5 33.333,154.167c10.159,115.625 7.379,230.875 -8.333,345.833c-9.521,62.083 -31.742,119 -66.667,170.833c-64.762,66.292 -141.846,85.042 -231.25,56.25c-68.629,-34 -110.987,-88.833 -127.083,-164.583c-13.3,-55.75 -22.329,-112 -27.083,-168.75c-1.371,-80.5 0.712,-161.75 6.25,-243.75c5.108,-72.25 24.554,-140.333 58.333,-204.167c32.654,-48.666 77.792,-77.833 135.417,-87.5Z" style="fill:#14805d;"/></g><g><path d="M6202.08,156.25c8.334,245.796 11.084,493.017 8.334,741.667l437.5,-0l-0,591.666l-437.5,0c-0.709,193.042 -0,386.125 2.083,579.167c1,64.833 16.292,125.917 45.833,183.333c30.667,44.167 73,68.459 127.084,72.917c83.458,6.083 166.791,-1.542 250,-22.917l-0,579.167c-280.125,80.333 -562.084,100.458 -845.834,60.417c-287.625,-65.417 -454.958,-243.875 -502.083,-535.417c-12.625,-93.583 -20.25,-187.333 -22.917,-281.25c0.042,-210.958 0.042,-422.75 0,-635.417l-333.333,0l0,-591.666l333.333,-0c-1.375,-148.638 0,-297.25 4.167,-445.834c311.958,-97.408 623.083,-196.021 933.333,-295.833Z" style="fill:#14805d;"/></g><g><path d="M7656.25,164.583c191.292,-9.696 382.958,3.496 575,39.584c172.375,33.454 327.958,102.896 466.667,208.333c194.708,168.708 277.333,381.9 247.916,639.583c-36.541,210.167 -152.541,358.084 -347.916,443.75c-54,23.334 -109.542,42.084 -166.667,56.25c445.708,99.75 622.792,373.375 531.25,820.834c-53.667,169.208 -155.75,300.458 -306.25,393.75c-193.042,106.958 -400,168.083 -620.833,183.333c-295.959,27.292 -597.334,10.625 -904.167,-50c-62.625,-12.958 -125.125,-26.125 -187.5,-39.583l0,-625c84.708,21.041 169.417,42.583 254.167,64.583c131.208,31.042 263.833,51.167 397.916,60.417c51.084,0.416 101.75,-1.667 152.084,-6.25c76.875,-5.25 146.333,-30.25 208.333,-75c68.458,-71.334 90,-155.375 64.583,-252.084c-32.708,-89.625 -95.916,-145.875 -189.583,-168.75c-66.542,-16.75 -133.917,-25.75 -202.083,-27.083c-113.167,2.458 -227.042,12.208 -341.667,29.167c-4.875,-2.125 -8.333,-5.584 -10.417,-10.417l0,-566.667c6.75,-4.5 14.375,-6.583 22.917,-6.25c45,5.084 90.167,8.584 135.417,10.417c80.708,1.958 160.583,2.667 239.583,2.083c73.667,-5.375 143.792,-24.125 210.417,-56.25c74.291,-47.166 111.791,-115.212 112.5,-204.166c-3.209,-128.671 -67.125,-209.225 -191.667,-241.667c-109.125,-24.333 -220.25,-28.5 -333.333,-12.5c-44.709,5.142 -89.167,12.083 -133.334,20.833c-124.875,26.709 -248.5,57.959 -370.833,93.75c-1.375,-202.796 -0,-405.575 4.167,-608.333c149.125,-49.408 301.916,-82.05 458.333,-97.917c76.708,-7.546 151.708,-13.796 225,-18.75Z" style="fill:#fee417;"/></g><g><path d="M10585.4,164.583c260.666,-7.046 520.375,17.263 779.166,72.917c4.167,203.171 5.542,406.646 4.167,610.417c-226.333,-66.142 -452,-98.088 -677.083,-95.834c-125.875,1.421 -246,28.505 -360.417,81.25c-138.542,83.275 -217,206.192 -235.417,368.75c-6.916,40.042 -9.708,80.334 -8.333,120.834c101.417,-74.667 214.625,-122.584 339.583,-143.75c188.834,-32.742 377.709,-23.017 566.667,29.166c375.417,124.25 576.792,384 604.167,779.167c-7.5,466.167 -233.875,770.333 -679.167,912.5c-331.167,89.583 -658.958,78.458 -983.333,-33.333c-357,-141.709 -591.042,-396.584 -702.084,-764.584c-87.541,-336.708 -84.75,-672.833 8.334,-1008.33c144.75,-454.45 448.208,-742.646 910.416,-864.583c142.959,-35.4 287.417,-56.929 433.334,-64.584Zm-175,1475c185.75,9.959 290.625,109.959 314.583,300c13.125,101.25 -3.542,197.084 -50,287.5c-58.625,90.792 -142.625,136.625 -252.083,137.5c-151.25,-7.5 -247.792,-83.916 -289.584,-229.166c-23.791,-105.834 -18.25,-210 16.667,-312.5c49.833,-114.125 136.667,-175.209 260.417,-183.334Z" style="fill:#fee417;"/></g><g><path d="M11877.1,231.25c618.042,-0.696 1236.12,0 1854.17,2.083c4.167,212.896 5.542,426.092 4.167,639.584l-987.5,-0c-1.375,133.362 -0,266.696 4.166,400c209.542,-24.167 413.709,-1.25 612.5,68.75c260.667,106.541 415.542,298.916 464.584,577.083c33.708,189.833 12.875,373.167 -62.5,550c-69.292,135.958 -169.959,242.208 -302.084,318.75c-182.25,96.958 -376.708,152.5 -583.333,166.667c-353.167,26.875 -703.875,-7.167 -1052.08,-102.084c-2.084,-201.375 -2.792,-402.791 -2.084,-604.166c138.334,36.125 278.584,61.833 420.834,77.083c143.25,17 284.916,4.5 425,-3Line truncated

resources/bkm/bwin.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 2500 821" version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+    xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="bwin-txt">
+        <path d="M1654.58,270l-131.666,536.25l213.75,0l137.5,-558.333l-219.584,22.083Z" style="fill:#fff;fill-rule:nonzero;"/>
+        <path d="M2360,246.667c-63.75,-6.25 -163.333,13.333 -212.5,50.833c-1.25,-20.417 -5,-36.667 -9.167,-52.917l-189.166,23.334c7.5,52.916 -0,111.666 -18.334,190.416l-85,347.917l213.75,0l87.5,-355c21.25,-30.833 55.417,-51.25 84.167,-51.25c35.833,0 44.167,26.25 33.333,68.75l-82.083,337.5l213.75,0l91.667,-366.667c22.083,-99.583 -10,-181.25 -127.917,-192.916Z" style="fill:#fff;fill-rule:nonzero;"/>
+        <path d="M1395.83,253.333l-67.5,156.25c-25,58.75 -47.083,114.167 -66.25,168.334l-2.5,-324.584l-192.916,0l-160,327.5l17.5,-335l-212.5,26.667l42.5,533.75l187.916,0c0,0 142.5,-287.917 155.417,-321.25l2.083,321.25l192.917,0l318.333,-552.5l-215,0l0,-0.417Z" style="fill:#fff;"/>
+        <path d="M480.833,239.583c-55.416,0 -97.083,14.584 -121.666,28.334c35,-108.334 42.916,-208.75 42.916,-208.75c1.667,-16.25 1.667,-35.417 1.25,-48.334l-224.166,27.084c2.5,35.833 -2.917,92.916 -31.667,214.166l-107.917,447.917c-5,21.25 -17.083,62.083 -27.083,77.083c67.5,22.5 145,42.917 272.917,42.917c70,0 125.416,-12.917 182.083,-46.25c97.083,-56.667 157.083,-159.167 182.083,-257.917c45.834,-185.416 -30,-276.25 -168.75,-276.25Zm-56.666,285.834c-24.584,102.916 -56.667,148.75 -110.834,148.75c-22.083,-0 -40.416,-5.417 -50.416,-12.917l59.166,-245.417c11.25,-9.583 30.834,-26.666 62.917,-26.666c47.917,0.416 65,27.083 39.167,136.25Z" style="fill:#fff;"/>
+    </g>
+    <ellipse cx="1794.17" cy="95.833" rx="120.833" ry="104.167" style="fill:#ffd300;"/>
+</svg>

resources/bkm/eurobet.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 4650 1021" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M4649.79,511.483c0,281.305 -228.041,509.35 -509.37,509.35l-3631.07,0c-281.312,0 -509.354,-228.045 -509.354,-509.35c-0,-281.304 228.042,-509.35 509.354,-509.35l3631.07,0c281.329,0 509.37,228.046 509.37,509.35Z" style="fill:#2e3e99;fill-rule:nonzero;"/><path d="M757.788,328.15l-297.917,-0c-0,-0 -28.125,-0 -31.25,21.875c-3.125,21.875 -15.629,117.708 -15.629,117.708l314.587,0l-7.291,80.209l-316.671,-0l-13.542,118.75c-0,-0 -5.208,32.291 25,32.291l297.921,0l-10.417,82.292l-354.171,0c0,0 -70.833,3.125 -66.666,-55.208c4.166,-58.334 45.833,-409.375 45.833,-409.375c-0,-0 7.292,-73.959 91.671,-73.959l350,0l-11.458,85.417Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M3348.41,328.15l-302.084,-0c0,-0 -28.125,-0 -31.25,21.875c-3.125,21.875 -15.625,117.708 -15.625,117.708l314.584,0l-7.292,80.209l-316.667,-0l-13.541,118.75c-0,-0 -5.209,32.291 25,32.291l297.916,0l-10.416,82.292l-354.167,0c-0,0 -70.833,3.125 -66.667,-55.208c4.167,-58.334 45.834,-409.375 45.834,-409.375c-0,-0 7.291,-73.959 91.666,-73.959l350,0l-7.291,85.417Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M797.371,242.733l103.125,0l-42.708,353.125c-0,0 -26.042,107.292 120.833,107.292c146.875,-0 143.75,-104.167 148.958,-151.042c5.208,-46.875 35.417,-309.375 35.417,-309.375l98.958,0c0,0 -37.5,335.417 -40.625,366.667c-3.125,31.25 -22.917,177.083 -252.083,177.083c-229.167,0 -227.083,-119.791 -208.333,-252.083c18.75,-132.292 36.458,-291.667 36.458,-291.667Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M1353.62,783.358l-102.084,0c0,0 47.917,-382.291 53.125,-425c5.209,-42.708 18.75,-115.625 85.417,-115.625l289.583,0c0,0 105.209,4.167 103.125,97.917c-2.083,93.75 -22.916,246.875 -119.791,246.875l-96.875,-0l182.291,191.667l-129.166,-0l-158.334,-173.959c0,0 -36.683,-34.237 -9.375,-72.916c25,-35.417 107.292,-21.875 139.584,-22.917c20.821,-0.671 60.416,3.125 73.958,-43.75c13.542,-46.875 25,-140.625 -29.167,-140.625l-185.416,-0c-20.834,-0 -41.667,9.375 -45.834,36.458c-4.166,27.084 -51.041,421.875 -51.041,421.875Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M2083.83,319.817c-162.5,-0 -177.279,101.804 -190.625,220.833c-12.5,111.458 10.417,168.75 186.458,161.458c173.834,-7.204 161.459,-279.166 161.459,-279.166c1.042,-22.917 5.208,-103.125 -157.292,-103.125Zm265.625,107.291c0,0 1.042,127.084 -44.791,234.375c-45.834,107.292 -155.209,128.125 -244.792,128.125c-35.417,0 6.25,0 -45.834,0c-66.666,0 -234.375,-26.041 -230.208,-189.583c4.167,-163.542 23.958,-366.667 288.542,-366.667c181.25,0 277.083,56.25 277.083,193.75Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M2465.08,666.692c-2.083,26.041 13.542,29.166 29.167,29.166l175,0c75,0 68.75,-76.041 68.75,-104.166c-0,-28.125 -33.333,-41.667 -52.083,-41.667l-210.417,-0c-0,-0 -8.333,90.625 -10.417,116.667Zm239.584,-196.875c52.083,-0 50,-70.834 52.083,-103.125c2.083,-32.292 -23.958,-41.667 -36.458,-41.667l-188.542,-0c-26.042,-0 -30.208,33.333 -30.208,33.333l-14.584,110.417c0,-0 165.625,1.042 217.709,1.042Zm73.958,37.5c-0,-0 63.542,21.875 63.542,63.541c-0,41.667 11.458,211.459 -135.417,211.459l-292.708,-0c-22.917,-0 -66.667,-5.209 -56.25,-91.667c10.416,-86.458 43.75,-365.625 43.75,-365.625c-0,-0 7.291,-83.854 83.854,-83.854l293.229,-0c16.667,-0 91.667,17.187 87.5,86.979c-4.167,69.792 8.333,157.292 -87.5,179.167Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M3373.41,241.692l519.791,-0l-12.5,83.333l-209.375,-0l-55.208,455.208l-104.167,0l57.292,-452.083l-203.125,-0l7.292,-86.458Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M4252.58,533.358c0,0 -53.125,17.709 -133.337,-13.541c-80.208,-31.25 -192.708,-1.042 -215.625,35.416c25,-135.416 27.083,-139.583 27.083,-139.583c0,-0 51.042,-32.292 136.459,-47.917c85.416,-15.625 195.837,53.125 195.837,53.125c-0,0 -90.625,20.834 -114.587,35.417c21.879,38.542 104.17,77.083 104.17,77.083Z" style="fill:url(#_Linear1);"/><path d="M4014.04,443.775l28.125,-128.125c-0,-0 173.962,-3.125 195.837,9.375c21.875,12.5 72.917,52.083 130.208,-8.333c-13.541,78.125 -28.125,129.166 -28.125,129.166c0,0 -47.916,46.875 -143.75,-5.208c-95.837,-52.083 -182.295,3.125 -182.295,3.125Z" style="fill:url(#_Linear2);"/><path d="M3938,375.025l25,-120.833c-0,-0 82.292,-40.625 183.333,-0c101.046,40.625 186.463,3.125 186.463,3.125c-0,-0 -40.625,98.958 -178.129,75c-137.5,-23.959 -216.667,42.708 -216.667,42.708Z" style="fill:url(#_Linear3);"/></g><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(334.697,59.0163,-59.0163,334.697,3922.98,445.446)"><stop offset="0" style="stop-color:#c4151c;stop-opacity:1"/><stoLine truncated

resources/bkm_icon_svg/bet365.svg

@@ -1,5 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1"
-    xmlns="http://www.w3.org/2000/svg" viewBox="0 0 59 52">
-    <path fill="#ffe418" d="M6.08,46.72c2.16,0,3.29-.71,3.29-2.2S8.21,42.25,6,42.25A20.73,20.73,0,0,0,3,42.48V37.56a23,23,0,0,0,2.58.13c2.32,0,3.48-.68,3.48-2.23S8,33.23,5.83,33.23A19.77,19.77,0,0,0,.39,34.3V29.17a22.06,22.06,0,0,1,7.15-1c6.09,0,9.6,2.62,9.6,6.73,0,2.53-1.64,4.37-4.51,5,3.19.65,4.83,2.43,4.83,5.15,0,4.27-3.57,6.76-10.4,6.76A29.51,29.51,0,0,1,.2,50.93V45.65a21.33,21.33,0,0,0,5.9,1.07ZM31.5,36.59c4.8,0,8,2.94,8,7.28,0,4.67-3.64,7.9-9.37,7.9C23.35,51.77,19,47.53,19,40.57c0-7.93,4.61-12.4,12.92-12.4a27,27,0,0,1,5.64.62v5.15a18,18,0,0,0-5.38-.81c-3.67,0-5.38,1.49-5.47,4.86a7.4,7.4,0,0,1,4.8-1.39Zm.67,7.12c0-1.88-1.06-3.08-2.61-3.08S27,41.8,27,43.71s1,3,2.57,3S32.17,45.59,32.17,43.71Zm9.7-15H57.55v5.38H49.2v3.4l1.28-.07c5.18,0,8,2.63,8,7.06s-3.42,7.29-10.08,7.29a28.46,28.46,0,0,1-6.93-.93V45.76a17.66,17.66,0,0,0,4.64.72c2.7,0,4.12-.91,4.12-2.59,0-1.87-1.48-2.81-4.51-2.81a16.27,16.27,0,0,0-3.86.55V28.75Z" transform="translate(-0.2)"/>
-    <path fill="#387D62" d="M1.33,0h8V9.54a5.48,5.48,0,0,1,4.78-2.27c4.63,0,7.24,3.23,7.24,9,0,5.48-2.65,8.75-7,8.75-2.68,0-4.49-1-5.53-3.1v2.87H1.33ZM9.06,16.08c0,2.51.55,3.73,2,3.73s2-1.22,2-3.73-.58-3.73-2-3.73-2,1.23-2,3.73Zm32.57,1.59h-11c.19,1.85,1.62,2.73,4.3,2.73a16.09,16.09,0,0,0,5.68-1.07v4.32a20.12,20.12,0,0,1-7.3,1.17c-6.78,0-10.43-3.25-10.43-9s3.59-8.93,9.57-8.93c6.63,0,9.21,3.08,9.21,9.65v1.1Zm-6.92-3.28v-.52c0-1.92-.71-3-2.07-3s-2.1,1.1-2.1,3.05v.49Zm22.62-7v5h-3.7V16.4c0,2.08.32,3.06,1.92,3.06a7.68,7.68,0,0,0,1.69-.23V24.1a17.86,17.86,0,0,1-5.26.71,6.21,6.21,0,0,1-5-1.95c-1.3-1.63-1.33-3.67-1.33-6.4V12.34H42.83v-5h2.84V3.61l8-2.51V7.37Z" transform="translate(-0.2)"/>
-</svg>

resources/bkm_icon_svg/bwin.svg

@@ -1,75 +0,0 @@
-<svg viewBox="0 0 500 500">
-	<g fill="currentColor">
-		<path d="M251.582,274.657c0.505-1.378,1.027-2.75,1.513-4.135c1.7-4.847,3.591-9.618,5.556-14.364
-		c2.419-5.843,4.927-11.646,7.408-17.462c1.523-3.572,3.072-7.133,4.583-10.71c0.25-0.592,0.594-0.809,1.24-0.801
-		c2.794,0.032,5.589,0.013,8.384,0.013c7.035,0,14.07,0,21.105,0c1.389,0,1.4,0.025,0.732,1.191
-		c-4.451,7.771-8.896,15.545-13.349,23.315c-3.177,5.542-6.369,11.075-9.545,16.616c-3.113,5.43-6.21,10.869-9.322,16.3
-		c-2.665,4.651-5.345,9.293-8.012,13.943c-1.884,3.285-3.771,6.569-5.621,9.873c-0.343,0.613-0.742,0.83-1.441,0.828
-		c-8.802-0.023-17.604-0.015-26.406-0.015c-0.161,0-0.321-0.01-0.482-0.007c-0.384,0.008-0.607-0.155-0.623-0.559
-		c-0.007-0.16-0.041-0.319-0.048-0.479c-0.01-0.225-0.01-0.45-0.008-0.674c0.09-10.792-0.17-21.582-0.15-32.374
-		c0.008-4.111-0.024-8.223-0.046-12.335c-0.001-0.252,0.05-0.512-0.067-0.764c-0.323-0.024-0.336,0.267-0.417,0.445
-		c-2.795,6.099-5.653,12.168-8.589,18.2c-2.936,6.032-5.869,12.066-8.809,18.097c-1.547,3.174-3.125,6.334-4.642,9.523
-		c-0.341,0.717-0.773,0.946-1.551,0.944c-8.513-0.026-17.026-0.016-25.539-0.016c-0.096,0-0.193,0.001-0.289-0.001
-		c-0.847-0.025-0.863-0.026-0.937-0.853c-0.141-1.564-0.268-3.13-0.395-4.696c-0.261-3.227-0.523-6.454-0.777-9.682
-		c-0.337-4.283-0.663-8.566-0.998-12.849c-0.253-3.228-0.516-6.455-0.772-9.682c-0.259-3.26-0.515-6.519-0.774-9.779
-		c-0.319-4.026-0.64-8.053-0.961-12.079c-0.321-4.026-0.639-8.053-0.966-12.079c-0.174-2.14-0.373-4.279-0.544-6.42
-		c-0.084-1.057-0.009-1.121,1.054-1.255c6.012-0.757,12.023-1.519,18.034-2.275c3.658-0.46,7.316-0.916,10.976-1.365
-		c1.205-0.148,1.243-0.134,1.188,1.114c-0.095,2.178-0.25,4.352-0.361,6.529c-0.103,2.018-0.169,4.038-0.275,6.056
-		c-0.156,2.977-0.34,5.953-0.497,8.93c-0.103,1.954-0.171,3.91-0.274,5.863c-0.158,3.009-0.335,6.017-0.497,9.025
-		c-0.096,1.794-0.176,3.588-0.269,5.382c-0.101,1.952-0.21,3.903-0.312,5.855c-0.003,0.059,0.037,0.119,0.073,0.229
-		c0.339-0.143,0.401-0.477,0.531-0.742c1.529-3.111,3.056-6.224,4.574-9.341c1.448-2.972,2.884-5.95,4.326-8.924
-		c2.507-5.171,5.011-10.343,7.523-15.512c2.034-4.186,4.091-8.361,6.108-12.555c0.333-0.692,0.736-0.974,1.538-0.971
-		c8.706,0.031,17.411,0.019,26.117,0.019c0.128,0,0.257-0.002,0.385,0.003c0.787,0.03,0.845,0.059,0.846,0.814
-		c0.003,1.606,0.095,3.21,0.122,4.815c0.067,4.079,0.042,8.159,0.084,12.239c0.089,8.768,0.207,17.536,0.199,26.305
-		c-0.001,1.086,0.112,2.171,0.172,3.257C251.453,274.639,251.517,274.648,251.582,274.657z"/>
-		<path d="M162.75,248.825c-0.247-3.355-0.835-6.624-2.142-9.727c-1.659-3.94-4.223-7.162-7.803-9.551
-		c-4.185-2.793-8.892-3.879-13.815-4.275c-2.217-0.178-4.427-0.035-6.628,0.211c-1.873,0.208-3.764,0.227-5.611,0.739
-		c-2.442,0.677-4.923,1.208-7.179,2.432c-0.433,0.234-0.885,0.482-1.507,0.544c0.13-0.511,0.215-0.943,0.353-1.359
-		c0.88-2.65,1.643-5.337,2.253-8.059c1.383-6.164,2.679-12.347,3.386-18.634c0.33-2.934,0.545-5.877,0.507-8.832
-		c-0.013-0.999-0.097-1.072-1.047-0.958c-3.755,0.45-7.51,0.9-11.264,1.361c-4.549,0.558-9.096,1.129-13.644,1.691
-		c-2.164,0.267-4.328,0.521-6.491,0.789c-0.611,0.076-0.746,0.21-0.673,0.794c0.06,0.479,0.089,0.955,0.105,1.436
-		c0.059,1.738-0.189,3.454-0.309,5.181c-0.297,4.267-1.084,8.461-1.912,12.639c-1.16,5.85-2.447,11.675-3.888,17.466
-		c-1.27,5.105-2.449,10.233-3.677,15.348c-1.145,4.771-2.304,9.54-3.45,14.311c-1.206,5.022-2.402,10.046-3.604,15.069
-		c-1.203,5.021-2.396,10.044-3.616,15.061c-0.979,4.024-2.094,8.007-3.899,11.76c-0.102,0.214-0.273,0.438-0.158,0.738
-		c1.117,0.468,2.282,0.818,3.441,1.186c5.639,1.791,11.403,3.028,17.25,3.886c4.094,0.6,8.21,0.987,12.345,1.144
-		c1.892,0.072,3.79,0.205,5.677,0.124c2.435-0.105,4.873-0.1,7.307-0.287c2.179-0.168,4.342-0.384,6.44-1.033
-		c0.459-0.143,0.935-0.227,1.398-0.356c1.854-0.513,3.764-0.832,5.564-1.52c7.295-2.787,13.504-7.167,18.852-12.831
-		c3.886-4.115,7.092-8.699,9.701-13.706c2.983-5.724,5.153-11.748,6.439-18.078C162.439,258.68,163.116,253.804,162.75,248.825z
-		 M127.949,266.274c-0.819,3.933-1.911,7.789-3.386,11.53c-1.018,2.577-2.216,5.059-3.972,7.228
-		c-1.608,1.983-3.518,3.552-6.032,4.268c-1.501,0.428-3.011,0.576-4.558,0.291c-0.851-0.157-1.717-0.23-2.565-0.396
-		c-1.145-0.223-2.155-0.81-3.206-1.28c-0.42-0.188-0.268-0.516-0.195-0.825c0.372-1.56,0.737-3.121,1.113-4.681
-		c1.489-6.175,2.984-12.349,4.47-18.524c0.923-3.836,1.844-7.672,2.746-11.512c0.153-0.651,0.445-1.139,0.97-1.581
-		c1.861-1.567,3.964-2.557,6.356-3.004c1.491-0.278,2.951-0.503,4.475-0.199c2.661,0.531,4.365,2.117,4.918,4.768
-		c0.216,1.036,0.304,2.094,0.294,3.155C129.266,259.148,128.688,262.724,127.949,266.274z"/>
-		<path d="M381.968,233.524c0.653-0.167,1.219-0.549,1.778-0.901c2.601-1.637,5.441-2.705,8.319-3.735
-		c2.924-1.047,5.975-1.468,8.979-2.123c1.069-0.233,2.15-0.319,3.244-0.365c1.728-0.073,3.453-0.314,5.18-0.321
-		c4.631-0.019,9.165,0.56,13.358,2.709c2.959,1.516,5.511,3.523,7.301,6.386c1.457,2.329,2.253,4.9,2.6,7.594
-		c0.598,4.638,0.195,9.212-1.023,13.731c-0.801,2.972-1.484,5.975-2.231,8.961c-0.957,3.826-1.932,7.648-2.889,11.474
-		c-0.778,3.111-1.536,6.227-2.314,9.338c-0.771,3.08-1.559,6.156-2.333,9.235c-1.071,4.261-2.133,8.525-3.206,12.786
-		c-0.239,0.949-0.252,0.955-1.218,0.956c-9.798,0.003-19.596,0.002-29.394,0.002c-0.064,0-0.129,0.001-0.193-0.001
-		c-0.871-0.025-0.894-0.046-0.696-0.871c1.055-4.398,2.113-8.796,3.172-13.193c1.232-5.116,2.462-10.232,3.701-15.346
-		c1.404-5.799,2.832-11.592,4.219-17.396c0.506-2.12,1.138-4.215,1.371-6.394c0.12-1.123,0.125-2.246-0.103-3.353
-		c-0.408-1.981-1.701-3.107-3.612-3.566c-1.498-0.36-2.998-0.261-4.479,0.122c-2.481,0.642-4.584,1.964-6.49,3.638
-		c-1.04,0.913-1.976,1.921-2.82,3.018c-0.277,0.361-0.483,0.74-0.593,1.193c-1.264,5.207-2.54,10.411-3.818,15.614
-		c-0.742,3.022-1.502,6.04-2.239,9.064c-1.451,5.953-2.888,11.91-4.339,17.863c-0.699,2.868-1.411,5.732-2.124,8.597
-		c-0.25,1.006-0.258,1.011-1.266,1.012c-9.766,0.002-19.532,0.001-29.298,0.001c-0.161,0-0.322,0.006-0.482-0.006
-		c-0.608-0.045-0.662-0.105-0.518-0.705c0.849-3.557,1.704-7.112,2.56-10.667c1.209-5.022,2.42-10.043,3.631-15.065
-		c0.925-3.836,1.856-7.671,2.777-11.508c1.415-5.897,2.828-11.794,4.232-17.693c1.02-4.286,1.524-8.645,1.899-13.028
-		c0.181-2.112,0.35-4.218,0.31-6.339c-0.025-1.348-0.138-2.689-0.269-4.029c-0.08-0.821-0.091-0.872,0.733-0.983
-		c2.319-0.311,4.642-0.59,6.964-0.879c2.959-0.368,5.917-0.739,8.877-1.098c2.896-0.351,5.794-0.689,8.691-1.035
-		c0.573-0.068,1.143-0.167,1.718-0.215c0.702-0.059,0.727-0.019,0.943,0.648c0.618,1.901,0.996,3.848,1.111,5.844
-		C381.711,232.847,381.708,233.201,381.968,233.524z"/>
-		<path d="M341.235,226.507c0.094,0.354-0.035,0.66-0.109,0.964c-1.694,6.916-3.402,13.829-5.095,20.745
-		c-1.639,6.699-3.256,13.403-4.898,20.101c-1.572,6.417-3.171,12.828-4.744,19.244c-1.634,6.667-3.23,13.343-4.888,20.004
-		c-0.455,1.828-0.169,1.549-1.917,1.552c-9.506,0.011-19.012,0.003-28.518,0.008c-1.713,0.001-1.42-0.101-1.1-1.423
-		c1.42-5.86,2.869-11.712,4.297-17.57c1.208-4.955,2.392-9.915,3.602-14.869c1.377-5.639,2.776-11.273,4.154-16.912
-		c1.629-6.668,3.245-13.339,4.868-20.009c0.644-2.649,1.303-5.294,1.928-7.948c0.122-0.516,0.346-0.738,0.892-0.784
-		c1.468-0.126,2.928-0.329,4.394-0.482c4.303-0.449,8.606-0.894,12.91-1.33c2.774-0.281,5.55-0.539,8.325-0.818
-		c1.594-0.16,3.186-0.346,4.779-0.514C340.489,226.426,340.87,226.352,341.235,226.507z"/>
-		<path style="fill:#F9CB0F;" d="M329.603,188.658c4.234-0.022,8.12,1.054,11.44,3.79c3.12,2.57,4.92,5.876,5.372,9.891
-		c0.523,4.644-0.998,8.591-4.22,11.906c-2.942,3.027-6.593,4.571-10.748,5.058c-3.778,0.443-7.382-0.156-10.72-1.943
-		c-4.891-2.618-8.006-6.608-8.564-12.237c-0.385-3.891,0.876-7.39,3.444-10.31c3.211-3.65,7.356-5.599,12.167-6.145
-		C328.376,188.599,328.993,188.658,329.603,188.658z"/>
-	</g>
-
-</svg>

resources/css/filament/admin/theme.css

@@ -19,56 +19,6 @@ button[wire\:click="resetTableFiltersForm"] {
     justify-content: space-between;
 }
 
-.oddsbox .bl {
-    border-left: 1px solid #e4e4e7;
-}
-
-.oddsbox .br {
-    border-right: 1px solid #e4e4e7;
-}
-
-.oddsbox .bb {
-    border-bottom: 1px solid #e4e4e7;
-}
-
-.oddsbox .bt {
-    border-top: 1px solid #e4e4e7;
-}
-
 .fi-ta-header-cell-id {
     padding: 0 !important;
-}
-
-.oddsbox div {
-    font-size: 0.7rem;
-    padding: 0 1mm;
-    width: 50px;
-    color: #020618;
-}
-
-.dark {
-
-    .oddsbox .bl {
-        border-left: 1px solid #454547;
-    }
-
-    .oddsbox .br {
-        border-right: 1px solid #454547;
-    }
-
-    .oddsbox .bb {
-        border-bottom: 1px solid #454547;
-    }
-
-    .oddsbox .bt {
-        border-top: 1px solid #454547;
-    }
-
-
-    .oddsbox div {
-        font-size: 0.7rem;
-        padding: 0 1mm;
-        width: 50px;
-        color: #90a1b9;
-    }
 }

resources/views/filament/tables/columns/multiline/bkm.blade.php

@@ -0,0 +1,6 @@
+@php
+    use App\Utilities\BkmIconMap;
+@endphp
+<div class="w-12 bg-contain bg-center bg-no-repeat dark:opacity-90" title="{{ $bookmaker_id }}"
+    style="background-image: url('{{ BkmIconMap::get($icon) }}')">
+</div>

resources/views/filament/tables/columns/multiline/label.blade.php

@@ -1,11 +1,11 @@
-<div class="flex justify-start gap-0 oddsbox">
-    <div class="text-center"></div>
+<div class="flex justify-start gap-0  text-xs">
+    <div class="w-12 text-center"></div>
     @switch(auth()->user()->multiline_setting_id)
         @case(1)
         @case(13)
-            <div class="text-center">1</div>
-            <div class="text-center">X</div>
-            <div class="text-center">2</div>
+            <div class="w-12 text-center">1</div>
+            <div class="w-12 text-center">X</div>
+            <div class="w-12 text-center">2</div>
         @break
 
         @case(7)
@@ -19,24 +19,24 @@
 
         @case(9)
         @case(5)
-            <div class="text-center">Home</div>
-            <div class="text-center">Away</div>
+            <div class="w-12 text-center">Home</div>
+            <div class="w-12 text-center">Away</div>
         @break
 
         @case(2)
-            <div class="text-center">1X</div>
-            <div class="text-center">12</div>
-            <div class="text-center">2X</div>
+            <div class="w-12 text-center">1X</div>
+            <div class="w-12 text-center">12</div>
+            <div class="w-12 text-center">2X</div>
         @break
 
         @case(3)
-            <div class="text-center">DNB 1</div>
-            <div class="text-center">DNB 2</div>
+            <div class="w-12 text-center">DNB 1</div>
+            <div class="w-12 text-center">DNB 2</div>
         @break
 
         @case(4)
-            <div class="text-center">Goal</div>
-            <div class="text-center">No Goal</div>
+            <div class="w-12 text-center">Goal</div>
+            <div class="w-12 text-center">No Goal</div>
         @break
 
         @case(6)
@@ -46,10 +46,10 @@
         @case(18)
 
         @case(11)
-            <div class="text-center">O</div>
-            <div class="text-center">U</div>
-            <div class="text-center">Total</div>
+            <div class="w-12 text-center">O</div>
+            <div class="w-12 text-center">U</div>
+            <div class="w-12 text-center">Total</div>
         @break
     @endswitch
-    <div class="text-center">M</div>
+    <div class="w-12 text-center">M</div>
 </div>

resources/views/filament/tables/columns/multiline/main.blade.php

@@ -1,27 +1,27 @@
 @php
-    use App\Utilities\BkmIconMap;
     $loadSlots($getState(), $record->multiline_client);
 @endphp
 
 @if ($has3Columns())
-    <div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 grid-rows-5 oddsbox">
+    <div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 grid-rows-5 text-xs ">
     @else
-        <div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 grid-rows-5 oddsbox">
+        <div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 grid-rows-5 text-xs">
 @endif
 
+@foreach ($getSlots() as $item)
+    @include('filament.tables.columns.multiline.bkm', [
+        'icon' => $item->icon,
+        'bookmaker_id' => $item->bookmaker_id,
+    ])
 
-@foreach ($getSlots() as $row)
-    <div class="bg-contain bg-center bg-no-repeat dark:opacity-90" title="{{ $row->bookmaker_id }}"
-        style="background-image: url('{{ BkmIconMap::get($row->icon) }}')">
-    </div>
-    @include('filament.tables.columns.multiline.odds', ['odd' => $row->a, 'decimal' => 2])
+    @include('filament.tables.columns.multiline.odds', ['odd' => $item->a, 'decimal' => 2])
 
     @if ($has3Columns())
-        @include('filament.tables.columns.multiline.odds', ['odd' => $row->b, 'decimal' => 2])
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->b, 'decimal' => 2])
     @endif
 
-    @include('filament.tables.columns.multiline.odds', ['odd' => $row->c, 'decimal' => 2])
+    @include('filament.tables.columns.multiline.odds', ['odd' => $item->c, 'decimal' => 2])
 
-    @include('filament.tables.columns.multiline.odds', ['odd' => $row->margin, 'decimal' => 1])
+    @include('filament.tables.columns.multiline.odds', ['odd' => $item->margin, 'decimal' => 1])
 @endforeach
 </div>

resources/views/filament/tables/columns/multiline/odds.blade.php

@@ -2,7 +2,7 @@
     use App\Utilities\OddsFormatting;
 @endphp
 
-<div class="br bb text-right">
+<div class="w-12 text-center">
     &nbsp;
     @if (isset($odd))
         {{ OddsFormatting::get($odd, $decimal) }}