This commit is contained in:
salam committed 2026-01-26 01:52:47 +01:00
1 parent 45cd621cf7
commit d317c733b9
13 files changed
+142 -58

No files matched your search

@@ -29,8 +29,6 @@ class Fixtures
$total_soccer = 0; $total_soccer = 0;
$total_others = 0; $total_others = 0;
$now = Carbon::now();
/** /**
* Delete * Delete
*/ */
@@ -53,7 +51,11 @@ class Fixtures
if ($today) { if ($today) {
Nuh::$options['days_from'] = 0; Nuh::$options['days_from'] = 0;
Nuh::$options['days_to'] = 1; if (now()->between(today(), today()->addHour())) {
Nuh::$options['days_to'] = 2;
} else {
Nuh::$options['days_to'] = 2;
}
} elseif ($week) { } elseif ($week) {
Nuh::$options['days_from'] = 0; Nuh::$options['days_from'] = 0;
Nuh::$options['days_to'] = 6; Nuh::$options['days_to'] = 6;
@@ -134,7 +136,7 @@ class Fixtures
} }
if ($debug) { if ($debug) {
Notice::note($now->toDateString()." - $count events processed", 'g'); Notice::note(now()->toDateString()." - $count events processed", 'g');
} }
} }
if ($debug) { if ($debug) {
@@ -53,12 +53,12 @@ class EventResource extends Resource
public static function getEloquentQuery(): Builder public static function getEloquentQuery(): Builder
{ {
$query = parent::getEloquentQuery() $query = parent::getEloquentQuery()
->where('starttime', '>', Carbon::now())
->with('competition_group') ->with('competition_group')
->with('country') ->with('country')
->with('home') ->with('home')
->with('away') ->with('away')
->with('event_user_star'); ->with('event_user_star')
->where('starttime', '>=', now());
if (auth()->user()->stars) { if (auth()->user()->stars) {
$query->whereHas('event_user_star'); $query->whereHas('event_user_star');
+6 -7
View File
@@ -64,15 +64,13 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
TextColumn::make('bookmaker_id')->label('Id'), TextColumn::make('bookmaker_id')->label('Id'),
BookmakerIcon::make('bookmaker.icon')->label('Icon')->size('lg'), BookmakerIcon::make('bookmaker.icon')->label('Icon')->size('lg'),
TextInputColumn::make('time_lastcheck') TextInputColumn::make('time_lastcheck')
->tooltip('If lastcheck is older bookmaker will be ignored')
->label('Time Passed') ->label('Time Passed')
->prefix('Seconds:') ->prefix('Seconds:')
->rules(['required', 'max:200', 'min:100']), ->rules(['required', 'integer', 'between:60,1200']),
TextInputColumn::make('margin_threshold') TextInputColumn::make('margin_threshold')
->tooltip('If margin is higher bookmaker will be ignored')
->label('Maximum Margin') ->label('Maximum Margin')
->prefix('Threshold:') ->prefix('Threshold:')
->rules(['required', 'max:200', 'min:100']), ->rules(['required', 'integer', 'between:100,200']),
// ToggleColumn::make('is_active'), // ToggleColumn::make('is_active'),
]) ])
->searchable(['bookmaker.name']) ->searchable(['bookmaker.name'])
@@ -96,7 +94,7 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
); );
} }
}) })
->form([ ->schema([
TextInput::make('time_lastcheck') TextInput::make('time_lastcheck')
->numeric() ->numeric()
@@ -114,11 +112,12 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
); );
} }
}) })
->form([ ->schema([
TextInput::make('margin_threshold') TextInput::make('margin_threshold')
->hiddenLabel() ->hiddenLabel()
->numeric() ->numeric()
->rules(['required', 'max:200', 'min:100']) ->minValue(100)
->maxValue(250)
->prefix('Threshold'), ->prefix('Threshold'),
]), ]),
BulkAction::make('Switch On') BulkAction::make('Switch On')
Generated
+9 -9
View File
@@ -10924,16 +10924,16 @@
}, },
{ {
"name": "phpstan/phpdoc-parser", "name": "phpstan/phpdoc-parser",
"version": "2.3.1", "version": "2.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git", "url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "16dbf9937da8d4528ceb2145c9c7c0bd29e26374" "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/16dbf9937da8d4528ceb2145c9c7c0bd29e26374", "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a",
"reference": "16dbf9937da8d4528ceb2145c9c7c0bd29e26374", "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -10965,9 +10965,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types", "description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": { "support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues", "issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.1" "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2"
}, },
"time": "2026-01-12T11:33:04+00:00" "time": "2026-01-25T14:56:51+00:00"
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
@@ -12814,12 +12814,12 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {},
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^8.3" "php": "^8.3"
}, },
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.6.0" "plugin-api-version": "2.9.0"
} }
@@ -20,20 +20,26 @@ return new class extends Migration
$table->boolean('in_feed')->default(0); $table->boolean('in_feed')->default(0);
$table->boolean('send_status')->default(0); $table->boolean('send_status')->default(0);
$table->boolean('has_to_qualify')->index()->default(0); $table->boolean('has_to_qualify')->index()->default(0);
$table->integer('bkm_2w')->nullable()->default(0); /**
$table->integer('bkm_2ws1')->nullable()->default(0); * favorit client is lower then favorit from method
$table->integer('bkm_3w')->nullable()->default(0); * 0.01
$table->integer('bkm_3wht')->nullable()->default(0); * 0.3
$table->integer('bkm_dc')->nullable()->default(0); * 0.5
$table->integer('bkm_dbn')->nullable()->default(0); */
$table->integer('bkm_ggng')->nullable()->default(0); $table->integer('alarm_2w')->nullable()->default(0);
$table->integer('bkm_po')->nullable()->default(0); $table->integer('alarm_2ws1')->nullable()->default(0);
$table->integer('bkm_poht')->nullable()->default(0); $table->integer('alarm_3w')->nullable()->default(0);
$table->integer('bkm_poq1')->nullable()->default(0); $table->integer('alarm_3wht')->nullable()->default(0);
$table->integer('bkm_to')->nullable()->default(0); $table->integer('alarm_dc')->nullable()->default(0);
$table->integer('bkm_toht')->nullable()->default(0); $table->integer('alarm_dbn')->nullable()->default(0);
$table->integer('bkm_toq1')->nullable()->default(0); $table->integer('alarm_ggng')->nullable()->default(0);
$table->integer('bkm_tq')->nullable()->default(0); $table->integer('alarm_po')->nullable()->default(0);
$table->integer('alarm_poht')->nullable()->default(0);
$table->integer('alarm_poq1')->nullable()->default(0);
$table->integer('alarm_to')->nullable()->default(0);
$table->integer('alarm_toht')->nullable()->default(0);
$table->integer('alarm_toq1')->nullable()->default(0);
$table->integer('alarm_tq')->nullable()->default(0);
$table->timestamps(); $table->timestamps();
}); });
@@ -0,0 +1,4 @@
<div
class="text-gray-600 dark:text-gray-500 border border-gray-300 dark:border-gray-700 bg-gray-50 dark:bg-gray-100/10 rounded">
{{ $slot }}
</div>
@@ -0,0 +1,4 @@
<div
class="text-green-600 dark:text-green-500 border border-green-300 dark:border-green-700 bg-green-50 dark:bg-green-100/10 rounded">
{{ $slot }}
</div>
@@ -0,0 +1,4 @@
<div
class="text-red-600 dark:text-red-500 border border-red-300 dark:border-red-700 bg-red-50 dark:bg-red-100/10 rounded">
{{ $slot }}
</div>
@@ -0,0 +1,4 @@
<div
class="text-amber-600 dark:text-yellow-500 border border-amber-500 dark:border-yellow-700 bg-amber-50 dark:bg-yellow-100/10 rounded">
{{ $slot }}
</div>
@@ -12,10 +12,11 @@
@endphp @endphp
@if ($getColumns() == 2) @if ($getColumns() == 2)
<div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 gap-1 mb-1" style="font-size: 10.5px; text-align:center; width:200px;"> <div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 gap-1 mb-1"
style="font-size: 10.5px; text-align:center; width:200px;">
@else @else
<div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 gap-1 mb-1" <div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 gap-1 mb-1"
style="font-size: 10.5px; text-align:center; width:250px;"> style="font-size: 10.5px; text-align:center; width:270px;">
@endif @endif
@@ -26,9 +27,17 @@
@include('filament.tables.columns.multiline.multiline-compare') @include('filament.tables.columns.multiline.multiline-compare')
@if (auth()->user()->is_multiline_direct) @if (auth()->user()->is_multiline_direct)
@include('filament.tables.columns.multiline.multilines-all', ['multilines' => $data, 'client' => $client, 'slots' => $getSlots()]) @include('filament.tables.columns.multiline.multilines-all', [
'multilines' => $data,
'client' => $client,
'slots' => $getSlots(),
])
@else @else
@include('filament.tables.columns.multiline.multilines-slots', ['multilines' => $data, 'client' => $client, 'slots' => $getSlots()]) @include('filament.tables.columns.multiline.multilines-slots', [
'multilines' => $data,
'client' => $client,
'slots' => $getSlots(),
])
@endif @endif
@endif @endif
@@ -2,7 +2,7 @@
$client = $getClient(); $client = $getClient();
@endphp @endphp
@if($getState() && $client) @if ($getState() && $client)
@include('filament.tables.columns.multiline.bkm', [ @include('filament.tables.columns.multiline.bkm', [
'bookmaker_id' => $client->bookmaker_id, 'bookmaker_id' => $client->bookmaker_id,
'icon' => auth()->user()->bookmaker->icon ?? '', 'icon' => auth()->user()->bookmaker->icon ?? '',
@@ -16,10 +16,12 @@
@case ('odds_2ways_s1') @case ('odds_2ways_s1')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->h2w, 'odd' => $client->h2w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->a2w, 'odd' => $client->a2w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@@ -28,50 +30,58 @@
@case ('odds_3ways_ht') @case ('odds_3ways_ht')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->h3w, 'odd' => $client->h3w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->d3w, 'odd' => $client->d3w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->a3w, 'odd' => $client->a3w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@case ('odds_dc') @case ('odds_dc')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->dc1x, 'odd' => $client->dc1x,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->dc12, 'odd' => $client->dc12,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->dcx2, 'odd' => $client->dcx2,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@case ('odds_dnb') @case ('odds_dnb')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->dnb1, 'odd' => $client->dnb1,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->dnb2, 'odd' => $client->dnb2,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@case ('odds_ggng') @case ('odds_ggng')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->gg, 'odd' => $client->gg,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->ng, 'odd' => $client->ng,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@@ -82,14 +92,17 @@
@case ('odds_points_q1') @case ('odds_points_q1')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->home, 'odd' => $client->home,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->away, 'odd' => $client->away,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->handicap, 'odd' => $client->handicap,
'alarm' => 0,
'd' => 1, 'd' => 1,
]) ])
@break; @break;
@@ -100,14 +113,17 @@
@case ('odds_totals_q1') @case ('odds_totals_q1')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->over, 'odd' => $client->over,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->under, 'odd' => $client->under,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->total, 'odd' => $client->total,
'alarm' => 0,
'd' => 1, 'd' => 1,
]) ])
@break; @break;
@@ -116,19 +132,19 @@
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $client->margin, 'odd' => $client->margin,
'alarm' => 0,
'd' => 1, 'd' => 1,
]) ])
@else @else
{{-- @include('filament.tables.columns.multiline.bkm', [ @include('filament.tables.columns.multiline.bkm', [
'bookmaker_id' => auth()->user()->bookmaker_id, 'bookmaker_id' => auth()->user()->bookmaker_id,
'icon' => auth()->user()->bookmaker->icon ?? '', 'icon' => auth()->user()->bookmaker->icon ?? '',
]) --}} ])
<div>&nbsp;</div> {{-- <div>&nbsp;</div> --}}
<div></div> <div></div>
<div></div> <div></div>
<div></div> <div></div>
@if ($getColumns() == 3) @if ($getColumns() == 3)
<div></div> <div></div>
@endif @endif
@endif @endif
@@ -2,7 +2,7 @@
$compare = $getCompare(); $compare = $getCompare();
@endphp @endphp
@if($getState() && $compare) @if ($getState() && $compare)
@include('filament.tables.columns.multiline.bkm', [ @include('filament.tables.columns.multiline.bkm', [
'bookmaker_id' => $compare->bookmaker_id, 'bookmaker_id' => $compare->bookmaker_id,
'icon' => $compare->bookmaker->icon ?? '', 'icon' => $compare->bookmaker->icon ?? '',
@@ -16,10 +16,12 @@
@case ('odds_2ways_s1') @case ('odds_2ways_s1')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->h2w, 'odd' => $compare->h2w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->a2w, 'odd' => $compare->a2w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@@ -28,35 +30,41 @@
@case ('odds_3ways_ht') @case ('odds_3ways_ht')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->h3w, 'odd' => $compare->h3w,
'alarm' => 1,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->d3w, 'odd' => $compare->d3w,
'alarm' => 2,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->a3w, 'odd' => $compare->a3w,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@case ('odds_dc') @case ('odds_dc')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->dc1x, 'odd' => $compare->dc1x,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->dc12, 'odd' => $compare->dc12,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->dcx2, 'odd' => $compare->dcx2,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@case ('odds_dnb') @case ('odds_dnb')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->dnb1, 'odd' => $compare->dnb1,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
@@ -67,11 +75,12 @@
@case ('odds_ggng') @case ('odds_ggng')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->gg, 'odd' => $compare->gg,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->ng, 'odd' => $compare->ng,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@break; @break;
@@ -82,14 +91,17 @@
@case ('odds_points_q1') @case ('odds_points_q1')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->home, 'odd' => $compare->home,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->away, 'odd' => $compare->away,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->handicap, 'odd' => $compare->handicap,
'alarm' => 0,
'd' => 1, 'd' => 1,
]) ])
@break; @break;
@@ -100,14 +112,17 @@
@case ('odds_totals_q1') @case ('odds_totals_q1')
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->over, 'odd' => $compare->over,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->under, 'odd' => $compare->under,
'alarm' => 0,
'd' => 2, 'd' => 2,
]) ])
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->total, 'odd' => $compare->total,
'alarm' => 0,
'd' => 1, 'd' => 1,
]) ])
@break; @break;
@@ -116,7 +131,7 @@
@include('filament.tables.columns.multiline.odd-compare', [ @include('filament.tables.columns.multiline.odd-compare', [
'odd' => $compare->margin, 'odd' => $compare->margin,
'alarm' => 0,
'd' => 1, 'd' => 1,
]) ])
@endif @endif
@@ -1,3 +1,24 @@
<div class="px-1 text-blue-500 dark:text-blue-600"> @switch($alarm)
{{ number_format($odd, $d) }} @case(1)
</div> <x-alarm-red>
{{ number_format($odd, $d) }}
</x-alarm-red>
@break
@case(2)
<x-alarm-yellow>
{{ number_format($odd, $d) }}
</x-alarm-yellow>
@break
@case(3)
<x-alarm-green>
{{ number_format($odd, $d) }}
</x-alarm-green>
@break
@default
<x-alarm-gray>
{{ number_format($odd, $d) }}
</x-alarm-gray>
@endswitch