From f43565b1c7174ee7393a5073af78c91f5a868ace Mon Sep 17 00:00:00 2001 From: ok236449 Date: Mon, 22 Aug 2022 17:00:35 +0200 Subject: [PATCH 1/3] Edit message if server count does not match --- resources/views/admin/overview/index.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index fa9c9124..b02d431e 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -173,7 +173,8 @@
{{ __('Error!') }}

{{ __('You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.') }}
- {{ __('You can do that in settings.') }} + {{ __('You can do that in settings.') }}
+ {{ __('Note') }}: {{ __('If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel.') }}

@endif From d73e3c4ea24c30e449dc0aa7c5d219b6beae7422 Mon Sep 17 00:00:00 2001 From: ok236449 Date: Tue, 23 Aug 2022 20:06:30 +0200 Subject: [PATCH 2/3] hide server that was just deleted --- resources/views/servers/index.blade.php | 203 ++++++++++++------------ 1 file changed, 102 insertions(+), 101 deletions(-) diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php index 3c84086d..8dc81061 100644 --- a/resources/views/servers/index.blade.php +++ b/resources/views/servers/index.blade.php @@ -40,127 +40,128 @@
@foreach ($servers as $server) - -
-
-
-
{{ $server->name }} -
-
-
- -
- @if (!empty(config('SETTINGS::MISC:PHPMYADMIN:URL'))) - {{ __('Database') }} - @endif -
- {{ $server->created_at->isoFormat('LL') }} + @if($server->location&&$server->node&&$server->nest&&$server->egg) +
+
+
+
{{ $server->name }} +
+
+
+ +
+ @if (!empty(config('SETTINGS::MISC:PHPMYADMIN:URL'))) + {{ __('Database') }} + @endif +
+ {{ $server->created_at->isoFormat('LL') }} +
-
-
-
-
-
{{ __('Status') }}:
-
- - {{ $server->isSuspended() ? 'Suspended' : 'Active' }} -
-
-
-
- {{ __('Location') }}: -
-
- {{ $server->location }} - +
+
+
+
{{ __('Status') }}:
+
+ + {{ $server->isSuspended() ? 'Suspended' : 'Active' }} +
+
+
+ {{ __('Location') }}: +
+
+ {{ $server->location }} + +
-
-
-
- {{ __('Software') }}: -
-
- {{ $server->nest }}
+
+
+ {{ __('Software') }}: +
+
+ {{ $server->nest }} +
-
-
-
- {{ __('Specification') }}:
-
- {{ $server->egg }} -
-
-
-
- {{ __('Resource plan') }}: -
-
- {{ $server->product->name }} - - +
+
+ {{ __('Specification') }}: +
+
+ {{ $server->egg }} +
+
+
+ {{ __('Resource plan') }}: +
+
+ {{ $server->product->name }} + + +
-
-
-
- {{ __('Price') }}: - - ({{ CREDITS_DISPLAY_NAME }}) -
-
-
-
-
{{ __('per Hour') }}
- - {{ number_format($server->product->getHourlyPrice(), 2, '.', '') }} - -
-
-
{{ __('per Month') }} +
+
+ {{ __('Price') }}: + + ({{ CREDITS_DISPLAY_NAME }}) + +
+
+
+
+
{{ __('per Hour') }}
+ + {{ number_format($server->product->getHourlyPrice(), 2, '.', '') }} + +
+
+
{{ __('per Month') }} +
+ + {{ $server->product->getHourlyPrice() * 24 * 30 }} +
- - {{ $server->product->getHourlyPrice() * 24 * 30 }} -
-
-
- - - {{ __('Manage') }} - - - - {{ __('Settings') }} - +
+ + + {{ __('Manage') }} + + + + {{ __('Settings') }} + +
-
+ @endif @endforeach
From da9bd9d5474ec2062d910242bad3685d3792450e Mon Sep 17 00:00:00 2001 From: ok236449 Date: Tue, 23 Aug 2022 20:09:42 +0200 Subject: [PATCH 3/3] fix division by zero --- app/Http/Controllers/Admin/OverViewController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index 19608455..58af87b7 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -58,7 +58,7 @@ class OverViewController extends Controller $output[$nodeId]->totalEarnings = 0; $output[$nodeId]->activeEarnings = 0; } - $counters['totalUsagePercent'] = round($counters['totalUsagePercent']/$nodes->count(), 2); + $counters['totalUsagePercent'] = ($nodes->count())?round($counters['totalUsagePercent']/$nodes->count(), 2):0; foreach(Pterodactyl::getServers() as $server){ //gets all servers from Pterodactyl and calculates total of credit usage for each node separately + total $nodeId = $server['attributes']['node'];