main book on top in comp wip

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

@@ -19,14 +19,24 @@ class Bet365
     public static function grap()
     {
         $debug = Nuh::$options['d'] ?? 0;
+
         $break = Nuh::$options['b'] ?? 0;
+
         $week = Nuh::$options['w'] ?? 0;
+
         /**
          * Bet365
          */
         $bookmaker_id = 126;
 
-        $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDays(1)->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get();
+        if ($break) {
+            $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDay()->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get();
+        } elseif ($week) {
+            $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->where('starttime', '<', Carbon::now()->addDays(7)->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get();
+        } else {
+            // all
+            $events = Event::where('bet365_id', '>', 0)->where('starttime', '>', Carbon::now()->toDateTimeString())->select('id', 'sport_id', 'bet365_id', 'starttime')->get();
+        }
 
         foreach ($events as $key => $event) {
 

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

@@ -7,6 +7,7 @@ use App\Console\Commands\Nuh;
 use App\Mapper\FindFixture;
 use App\Mapper\LoadElements;
 use App\Mapper\LoadGroups;
+use App\Models\Country;
 use App\Models\Mapper;
 use App\Models\Sport;
 use App\Utilities\Notice;
@@ -37,7 +38,9 @@ class Fixtures
 
         self::$groups = LoadGroups::load(Nuh::$options['provider_id']);
 
-        $sportmap = Sport::map('bapi');
+        $country_map = Country::pluck('id', 'iso2');
+
+        $sportmap = Sport::map('bapi', 0, [1]);
 
         $now = Carbon::now();
 
@@ -78,12 +81,14 @@ class Fixtures
 
                                 if (isset($row['home']['id']) && isset($row['away']['id']) && strpos($row['league']['name'], 'Esoccer') === false) {
 
+                                    $cc = strtoupper($row['league']['cc']);
                                     $event = [
                                         'event_id' => (int) $row['id'],
                                         'bet365_id' => isset($row['bet365_id']) ? $row['bet365_id'] : 0,
                                         'sport_id' => (int) $sport_id,
                                         'provider_id' => (int) Nuh::$options['provider_id'],
                                         'starttime' => Carbon::createFromTimestamp((string) $row['time'])->toDateTimeString(),
+                                        'country_id' => $cc != null ? $country_map[$cc] : 0,
                                         'home' => $row['home']['name'] ?? '',
                                         'home_id' => (int) $row['home']['id'],
                                         'home_cc' => strtoupper($row['home']['cc']) ?? '',

app/Models/Sport.php

@@ -21,7 +21,7 @@ class Sport extends Model
             }
         } else {
             if ($limit) {
-                return Sport::where('is_active', 1)->whereIn($limit, 'id')->pluck('id', $field)->toArray();
+                return Sport::where('is_active', 1)->whereIn('id', $limit)->pluck($field, 'id')->toArray();
             } else {
                 return Sport::where('is_active', 1)->pluck($field, 'id')->toArray();
             }

resources/views/filament/tables/columns/column-dc.blade.php

@@ -10,6 +10,47 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['1X', '12', 'X2']])
 
+        @foreach ($record->odds_dc as $item)
+            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
+                @include('filament.tables.columns.multiline.bkm', [
+                    'bookmaker_id' => $item->bookmaker_id,
+                    'icon' => $item->bookmaker->icon ?? '',
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->dc1x,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->dc12,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->dcx2,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->margin,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+            @endif
+        @endforeach
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_dc as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)

resources/views/filament/tables/columns/column-dnb.blade.php

@@ -10,6 +10,39 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['DNB1', 'DNB2']])
 
+        @foreach ($record->odds_dnb as $item)
+            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
+                @include('filament.tables.columns.multiline.bkm', [
+                    'bookmaker_id' => $item->bookmaker_id,
+                    'icon' => $item->bookmaker->icon ?? '',
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->dnb1,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->dnb2,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->margin,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+            @endif
+        @endforeach
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_dnb as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)

resources/views/filament/tables/columns/column-ggng.blade.php

@@ -10,6 +10,39 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['GG', 'NG']])
 
+        @foreach ($record->odds_ggng as $item)
+            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
+                @include('filament.tables.columns.multiline.bkm', [
+                    'bookmaker_id' => $item->bookmaker_id,
+                    'icon' => $item->bookmaker->icon ?? '',
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->gg,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->ng,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->margin,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+            @endif
+        @endforeach
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_ggng as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)

resources/views/filament/tables/columns/column-total.blade.php

@@ -10,6 +10,47 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['O', 'U', 'T']])
 
+        @foreach ($record->odds_total as $item)
+            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
+                @include('filament.tables.columns.multiline.bkm', [
+                    'bookmaker_id' => $item->bookmaker_id,
+                    'icon' => $item->bookmaker->icon ?? '',
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->over,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->under,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->total,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->margin,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+            @endif
+        @endforeach
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_total as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)

resources/views/filament/tables/columns/column-tq.blade.php

@@ -10,6 +10,39 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['H', 'A']])
 
+        @foreach ($record->odds_tq as $item)
+            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
+                @include('filament.tables.columns.multiline.bkm', [
+                    'bookmaker_id' => $item->bookmaker_id,
+                    'icon' => $item->bookmaker->icon ?? '',
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->htq,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->atq,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->margin,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+            @endif
+        @endforeach
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_tq as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)

resources/views/filament/tables/columns/column_3way.blade.php

@@ -10,6 +10,47 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['1', 'X', '2']])
 
+        @foreach ($record->odds_3way as $item)
+            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
+                @include('filament.tables.columns.multiline.bkm', [
+                    'bookmaker_id' => $item->bookmaker_id,
+                    'icon' => $item->bookmaker->icon ?? '',
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->h3w,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->d3w,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->a3w,
+                    'decimal' => 2,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+
+                @include('filament.tables.columns.multiline.odds', [
+                    'odd' => $item->margin,
+                    'decimal' => 1,
+                    'max' => false,
+                    'min' => false,
+                    'main' => true,
+                ])
+            @endif
+        @endforeach
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_3way as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)

resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php

@@ -1,6 +1,6 @@
 @if ($hasData())
     <div class="mx-3 my-auto">
-        <template x-ref="template_1x2">
+        <template x-ref="template_1x2_{{ $record->id }}">
             <div class="grid grid-cols-5 grid-rows-5 gap-1 m-5 z-10">
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['1', 'X', '2']])
@@ -49,7 +49,7 @@
 
         <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
             x-tooltip.html="{
-        content: () => $refs.template_1x2.innerHTML,
+        content: () => $refs.template_1x2_{{ $record->id }}.innerHTML,
         allowHTML: true,
         theme: $store.theme,
         appendTo: $root,

resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php

@@ -1,6 +1,6 @@
 @if ($hasData())
     <div class="mx-3 my-auto">
-        <template x-ref="template_dc">
+        <template x-ref="template_dc_{{ $record->id }}">
             <div class="grid grid-cols-5 grid-rows-5 gap-1 m-5 z-10">
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['1X', '12', 'X2']])
@@ -49,7 +49,7 @@
 
         <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
             x-tooltip.html="{
-        content: () => $refs.template_dc.innerHTML,
+        content: () => $refs.template_dc_{{ $record->id }}.innerHTML,
         allowHTML: true,
         theme: $store.theme,
         appendTo: $root

resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php

@@ -1,6 +1,6 @@
 @if ($hasData())
     <div class="mx-3 my-auto">
-        <template x-ref="template_dnb">
+        <template x-ref="template_dnb_{{ $record->id }}">
             <div class="grid grid-cols-4 grid-rows-5 gap-1 m-5 z-10">
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['DNB1', 'DNB2']])
@@ -42,7 +42,7 @@
 
         <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
             x-tooltip.html="{
-        content: () => $refs.template_dnb.innerHTML,
+        content: () => $refs.template_dnb_{{ $record->id }}.innerHTML,
         allowHTML: true,
         theme: $store.theme,
         appendTo: $root

resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php

@@ -1,6 +1,6 @@
 @if ($hasData())
     <div class="mx-3 my-auto">
-        <template x-ref="template_gg">
+        <template x-ref="template_gg_{{ $record->id }}">
             <div class="grid grid-cols-4 grid-rows-5 gap-1 m-5 z-10">
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['GG', 'NG']])
@@ -42,7 +42,7 @@
 
         <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
             x-tooltip.html="{
-        content: () => $refs.template_gg.innerHTML,
+        content: () => $refs.template_gg_{{ $record->id }}.innerHTML,
         allowHTML: true,
         theme: $store.theme,
         appendTo: $root

resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php

@@ -1,6 +1,6 @@
 @if ($hasData())
     <div class="mx-3 my-auto">
-        <template x-ref="template_total">
+        <template x-ref="template_total_{{ $record->id }}">
             <div class="grid grid-cols-5 grid-rows-5 gap-1 m-5 z-10">
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['O', 'U', 'T']])
@@ -49,7 +49,7 @@
 
         <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
             x-tooltip.html="{
-        content: () => $refs.template_total.innerHTML,
+        content: () => $refs.template_total_{{ $record->id }}.innerHTML,
         allowHTML: true,
         theme: $store.theme,
         appendTo: $root

resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php

@@ -1,6 +1,6 @@
 @if ($hasData())
     <div class="mx-3 my-auto">
-        <template x-ref="template_tq">
+        <template x-ref="template_tq_{{ $record->id }}">
             <div class="grid grid-cols-4 grid-rows-5 gap-1 m-5 z-10">
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['H', 'A']])
@@ -42,7 +42,7 @@
 
         <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
             x-tooltip.html="{
-        content: () => $refs.template_tq.innerHTML,
+        content: () => $refs.template_tq_{{ $record->id }}.innerHTML,
         allowHTML: true,
         theme: $store.theme,
         appendTo: $root

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

@@ -1,7 +1,7 @@
-<div class="mb-0.5 ml-0.5 border border-transparent 
+<div class="mb-0.5 ml-0.5
     @if (isset($max) && $max == true) bg-green-600/25 rounded 
     @elseif (isset($min) && $min == true) bg-blue-600/25 rounded @endif
-    "
+    @if (isset($main) && $main == true) border border-gray-300 bg-gray-100 @endif"
     style="font-size: 10.5px; text-align:center;">
     &nbsp;
     @if (isset($odd))

resources/views/livewire/top-menu-items.blade.php

@@ -9,19 +9,19 @@
                 <x-filament::button outlined color="gray">
 
                     @switch(auth()->user()->bookmaker_id)
-                        @case(26)
+                        @case(35)
                             <x-bkm-logifuture-nigeria class="h-5" />
                         @break
 
-                        @case(27)
+                        @case(36)
                             <x-bkm-logifuture-colombia class="h-5" />
                         @break
 
-                        @case(20)
+                        @case(10)
                             <x-bkm-magloo-nigeria class="h-5" />
                         @break
 
-                        @case(24)
+                        @case(16)
                             <x-bkm-magloo-kenia class="h-5" />
                         @break
                     @endswitch
@@ -30,29 +30,29 @@
 
             <x-filament::dropdown.list>
 
-                @if (in_array(auth()->user()->bookmaker_id, [26, 27]))
+                @if (in_array(auth()->user()->bookmaker_id, [35, 36]))
-                    @if (auth()->user()->bookmaker_id != 26)
+                    @if (auth()->user()->bookmaker_id != 35)
-                        <x-filament::dropdown.list.item wire:click="swopBookmaker(26)">
+                        <x-filament::dropdown.list.item wire:click="swopBookmaker(35)">
                             <x-bkm-logifuture-nigeria class="h-5 mx-auto" />
                         </x-filament::dropdown.list.item>
                     @endif
 
-                    @if (auth()->user()->bookmaker_id != 27)
+                    @if (auth()->user()->bookmaker_id != 36)
-                        <x-filament::dropdown.list.item wire:click="swopBookmaker(27)">
+                        <x-filament::dropdown.list.item wire:click="swopBookmaker(36)">
                             <x-bkm-logifuture-colombia class="h-5 mx-auto" />
                         </x-filament::dropdown.list.item>
                     @endif
                 @endif
 
-                @if (in_array(auth()->user()->bookmaker_id, [20, 24]))
+                @if (in_array(auth()->user()->bookmaker_id, [10, 16]))
-                    @if (auth()->user()->bookmaker_id != 20)
+                    @if (auth()->user()->bookmaker_id != 10)
-                        <x-filament::dropdown.list.item wire:click="swopBookmaker(20)">
+                        <x-filament::dropdown.list.item wire:click="swopBookmaker(10)">
                             <x-bkm-magloo-nigeria class="h-5 mx-auto" />
                         </x-filament::dropdown.list.item>
                     @endif
 
-                    @if (auth()->user()->bookmaker_id != 24)
+                    @if (auth()->user()->bookmaker_id != 16)
-                        <x-filament::dropdown.list.item wire:click="swopBookmaker(24)">
+                        <x-filament::dropdown.list.item wire:click="swopBookmaker(16)">
                             <x-bkm-magloo-kenia class="h-5 mx-auto" />
                         </x-filament::dropdown.list.item>
                     @endif
@@ -117,7 +117,7 @@
 
                         <x-filament::dropdown.list @click="toggle">
 
-                            @if (in_array(auth()->user()->bookmaker_id, [26, 27]))
+                            @if (in_array(auth()->user()->bookmaker_id, [35, 36]))
                                 @if (auth()->user()->provider_id != 5)
                                     <x-filament::dropdown.list.item wire:click="swopProvider(5)">
                                         <x-bkm-logifuture-nigeria class="h-5 mx-auto" />
@@ -131,7 +131,7 @@
                                 @endif
                             @endif
 
-                            @if (in_array(auth()->user()->bookmaker_id, [20, 24]))
+                            @if (in_array(auth()->user()->bookmaker_id, [10, 16]))
                                 @if (auth()->user()->provider_id != 4)
                                     <x-filament::dropdown.list.item wire:click="swopProvider(4)">
                                         <x-bkm-magloo-nigeria class="h-5 mx-auto" />