From 043edf9a9b6b2b3b062f67b1c804e2d2112ff48a Mon Sep 17 00:00:00 2001 From: ok236449 Date: Fri, 19 Aug 2022 19:18:44 +0200 Subject: [PATCH 01/15] Show individual node status on admin overview --- app/Classes/Pterodactyl.php | 15 ++-- app/Classes/Settings/System.php | 2 + .../Controllers/Admin/OverViewController.php | 85 +++++++++++++------ database/seeders/Seeds/SettingsSeeder.php | 7 ++ .../views/admin/overview/index.blade.php | 68 +++++++++++++-- .../admin/settings/tabs/system.blade.php | 11 +++ 6 files changed, 146 insertions(+), 42 deletions(-) diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php index a7bc9bd5..b0b93373 100644 --- a/app/Classes/Pterodactyl.php +++ b/app/Classes/Pterodactyl.php @@ -14,11 +14,6 @@ use Illuminate\Support\Facades\Http; class Pterodactyl { - /** - * @description per_page option to pull more than the default 50 from pterodactyl - */ - public const PER_PAGE = 200; - //TODO: Extend error handling (maybe logger for more errors when debugging) /** @@ -73,7 +68,7 @@ class Pterodactyl public static function getEggs(Nest $nest) { try { - $response = self::client()->get("/application/nests/{$nest->id}/eggs?include=nest,variables&per_page=" . self::PER_PAGE); + $response = self::client()->get("/application/nests/{$nest->id}/eggs?include=nest,variables&per_page=" . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT")); } catch (Exception $e) { throw self::getException($e->getMessage()); } @@ -88,7 +83,7 @@ class Pterodactyl public static function getNodes() { try { - $response = self::client()->get('/application/nodes?per_page=' . self::PER_PAGE); + $response = self::client()->get('/application/nodes?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT")); } catch (Exception $e) { throw self::getException($e->getMessage()); } @@ -115,7 +110,7 @@ class Pterodactyl public static function getServers() { try { - $response = self::client()->get('/application/servers'); + $response = self::client()->get('/application/servers?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT")); } catch (Exception $e) { throw self::getException($e->getMessage()); } @@ -130,7 +125,7 @@ class Pterodactyl public static function getNests() { try { - $response = self::client()->get('/application/nests?per_page=' . self::PER_PAGE); + $response = self::client()->get('/application/nests?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT")); } catch (Exception $e) { throw self::getException($e->getMessage()); } @@ -145,7 +140,7 @@ class Pterodactyl public static function getLocations() { try { - $response = self::client()->get('/application/locations?per_page=' . self::PER_PAGE); + $response = self::client()->get('/application/locations?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT")); } catch (Exception $e) { throw self::getException($e->getMessage()); } diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index 63266ad4..56e9d480 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -42,6 +42,7 @@ public function checkPteroClientkey(){ "server-limit-purchase" => "required|min:0|integer", "pterodactyl-api-key" => "required|string", "pterodactyl-url" => "required|string", + "per-page-limit" => "required|min:0|integer", "pterodactyl-admin-api-key" => "required|string", ]); @@ -70,6 +71,7 @@ public function checkPteroClientkey(){ "SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE" => "server-limit-purchase", "SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url", "SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url", + 'SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT' => "per-page-limit", "SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key", "SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO" => "enable-login-logo", "SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN" => "pterodactyl-admin-api-key", diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index 29049b8f..19608455 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -11,6 +11,8 @@ use App\Models\Payment; use App\Models\Server; use App\Models\User; use Illuminate\Support\Facades\Cache; +use App\Classes\Pterodactyl; +use App\Models\Product; class OverViewController extends Controller { @@ -18,38 +20,73 @@ class OverViewController extends Controller public function index() { - $userCount = Cache::remember('user:count', self::TTL, function () { - return User::query()->count(); - }); + $counters = Cache::remember('counters', self::TTL, function () { + $output = collect(); + $output->put('users', User::query()->count()); + $output->put('credits', number_format(User::query()->where("role","!=","admin")->sum('credits'), 2, '.', '')); + $output->put('payments', Payment::query()->count()); + $output->put('eggs', Egg::query()->count()); + $output->put('nests', Nest::query()->count()); + $output->put('locations', Location::query()->count()); - $creditCount = Cache::remember('credit:count', self::TTL, function () { - return User::query()->where("role","!=","admin")->sum('credits'); - }); - - $paymentCount = Cache::remember('payment:count', self::TTL, function () { - return Payment::query()->count(); - }); - - $serverCount = Cache::remember('server:count', self::TTL, function () { - return Server::query()->count(); + $output->put('servers', collect()); + $output['servers']->active = 0; + $output['servers']->total = 0; + $output->put('earnings', collect()); + $output['earnings']->active = 0; + $output['earnings']->total = 0; + $output->put('totalUsagePercent', 0); + + return $output; }); $lastEgg = Egg::query()->latest('updated_at')->first(); $syncLastUpdate = $lastEgg ? $lastEgg->updated_at->isoFormat('LLL') : __('unknown'); + + $nodes = Cache::remember('nodes', self::TTL, function() use($counters){ + $output = collect(); + foreach($nodes = Node::query()->get() as $node){ //gets all node information and prepares the structure + $nodeId = $node['id']; + $output->put($nodeId, collect()); + $output[$nodeId]->name = $node['name']; + $node = Pterodactyl::getNode($nodeId); + $output[$nodeId]->usagePercent = round(max($node['allocated_resources']['memory']/($node['memory']*($node['memory_overallocate']+100)/100), $node['allocated_resources']['disk']/($node['disk']*($node['disk_overallocate']+100)/100))*100, 2); + $counters['totalUsagePercent'] += $output[$nodeId]->usagePercent; + + $output[$nodeId]->totalServers = 0; + $output[$nodeId]->activeServers = 0; + $output[$nodeId]->totalEarnings = 0; + $output[$nodeId]->activeEarnings = 0; + } + $counters['totalUsagePercent'] = round($counters['totalUsagePercent']/$nodes->count(), 2); + + 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']; + + if($CPServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first()){ + $prize = Product::query()->where('id', $CPServer->product_id)->first()->price; + if (!$CPServer->suspended){ + $counters['earnings']->active += $prize; + $counters['servers']->active ++; + $output[$nodeId]->activeEarnings += $prize; + $output[$nodeId]->activeServers ++; + } + $counters['earnings']->total += $prize; + $counters['servers']->total ++; + $output[$nodeId]->totalEarnings += $prize; + $output[$nodeId]->totalServers ++; + } + } + return $output; + }); return view('admin.overview.index', [ - 'serverCount' => $serverCount, - 'userCount' => $userCount, - 'paymentCount' => $paymentCount, - 'creditCount' => number_format($creditCount, 2, '.', ''), - - 'locationCount' => Location::query()->count(), - 'nodeCount' => Node::query()->count(), - 'nestCount' => Nest::query()->count(), - 'eggCount' => Egg::query()->count(), - 'syncLastUpdate' => $syncLastUpdate + 'counters' => $counters, + 'nodes' => $nodes, + 'syncLastUpdate' => $syncLastUpdate, + 'perPageLimit' => ($counters['servers']->total != Server::query()->count())?true:false ]); - } + } /** * @description Sync locations,nodes,nests,eggs with the linked pterodactyl panel diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php index a79501a9..95a110de 100644 --- a/database/seeders/Seeds/SettingsSeeder.php +++ b/database/seeders/Seeds/SettingsSeeder.php @@ -378,6 +378,13 @@ class SettingsSeeder extends Seeder 'type' => 'string', 'description' => 'The URL to your Pterodactyl Panel. Must not end with a / ' ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT', + ], [ + 'value' => 200, + 'type' => 'integer', + 'description' => 'The Pterodactyl API perPage limit. It is necessary to set it higher than your server count.' + ]); Settings::firstOrCreate([ 'key' => 'SETTINGS::MISC:PHPMYADMIN:URL', ], [ diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index 8da6292d..bfc81563 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -50,7 +50,7 @@
{{__('Servers')}} - {{$serverCount}} + {{$counters['servers']->total}}
@@ -63,7 +63,7 @@
{{__('Users')}} - {{$userCount}} + {{$counters['users']}}
@@ -77,7 +77,7 @@
{{__('Total')}} {{CREDITS_DISPLAY_NAME}} - {{$creditCount}} + {{$counters['credits']}}
@@ -90,7 +90,7 @@
{{__('Payments')}} - {{$paymentCount}} + {{$counters['payments']}}
@@ -121,19 +121,19 @@ {{__('Locations')}} - {{$locationCount}} + {{$counters['locations']}} {{__('Nodes')}} - {{$nodeCount}} + {{$nodes->count()}} {{__('Nests')}} - {{$nestCount}} + {{$counters['nests']}} {{__('Eggs')}} - {{$eggCount}} + {{$counters['eggs']}} @@ -143,6 +143,58 @@ +
+
+
+
+
+ {{__('Individual nodes')}} +
+
+
+
+ @if ($perPageLimit) +
+
{{ __('Error!') }}
+

+ {{ __('You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.') }}
+ {{ __('You can do that in settings.') }} +

+
+ @endif + + + + + + + + + + + + @foreach($nodes as $nodeID => $node) + + + + + + + + @endforeach + + + + + + + + + +
{{__('ID')}}{{__('Node')}}{{__('Server count')}}{{__('Resource usage')}}{{CREDITS_DISPLAY_NAME . ' ' . __('Usage')}}
{{$nodeID}}{{$node->name}}{{$node->activeServers}}/{{$node->totalServers}}{{$node->usagePercent}}%{{$node->activeEarnings}}/{{$node->totalEarnings}}
{{__('Total')}} ({{__('active')}}/{{__('total')}}):{{$counters['servers']->active}}/{{$counters['servers']->total}}{{$counters['totalUsagePercent']}}%{{$counters['earnings']->active}}/{{$counters['earnings']->total}}
+
+
+
diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php index f5f2df70..899dc133 100644 --- a/resources/views/admin/settings/tabs/system.blade.php +++ b/resources/views/admin/settings/tabs/system.blade.php @@ -70,6 +70,17 @@ value="{{ config('SETTINGS::SYSTEM:PTERODACTYL:URL') }}" class="form-control @error('pterodactyl-url') is-invalid @enderror" required> +
+
+ + +
+ +
From c929fd7dddaf651ce71c05ac4debb7d60b47d958 Mon Sep 17 00:00:00 2001 From: ok236449 Date: Fri, 19 Aug 2022 20:14:30 +0200 Subject: [PATCH 02/15] fix overallocation --- app/Classes/Pterodactyl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php index a7bc9bd5..f03ef5de 100644 --- a/app/Classes/Pterodactyl.php +++ b/app/Classes/Pterodactyl.php @@ -368,8 +368,8 @@ class Pterodactyl throw self::getException($e->getMessage()); } $node = $response['attributes']; - $freeMemory = $node['memory'] - $node['allocated_resources']['memory']; - $freeDisk = $node['disk'] - $node['allocated_resources']['disk']; + $freeMemory = ($node['memory']*($node['memory_overallocate']+100)/100) - $node['allocated_resources']['memory']; + $freeDisk = ($node['disk']*($node['disk_overallocate']+100)/100) - $node['allocated_resources']['disk']; if ($freeMemory < $requireMemory) { return false; } From 16067c6cc8882e18b2208e37b0aa95d4667d522c Mon Sep 17 00:00:00 2001 From: ok236449 Date: Fri, 19 Aug 2022 21:50:04 +0200 Subject: [PATCH 03/15] sync renamed servers on Pterodactyl --- app/Http/Controllers/ServerController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index cf731ddf..20deffca 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -45,6 +45,13 @@ class ServerController extends Controller $server->node = $serverRelationships['node']['attributes']['name']; + //Check if a server got renamed on Pterodactyl + $savedServer = Server::query()->where('id', $server->id)->first(); + if($savedServer->name != $serverAttributes['name']){ + $savedServer->name = $serverAttributes['name']; + $server->name = $serverAttributes['name']; + $savedServer->save(); + } //get productname by product_id for server $product = Product::find($server->product_id); From 21af9d9e771248eed140a07d99059b299fb7ccbf Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 19 Aug 2022 23:08:11 +0200 Subject: [PATCH 04/15] Update app.php --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 90bdfdde..0778437d 100644 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,7 @@ use App\Models\Settings; return [ - 'version' => '0.8.2', + 'version' => '0.8.3', /* |-------------------------------------------------------------------------- From 5fc4103a7c3276015167f8c94ee10bb9e4d6e5f0 Mon Sep 17 00:00:00 2001 From: ok236449 Date: Sat, 20 Aug 2022 17:07:54 +0200 Subject: [PATCH 05/15] Latest payments section --- .../Controllers/Admin/OverViewController.php | 40 ++++++++++- .../views/admin/overview/index.blade.php | 69 ++++++++++++++++++- 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index 19608455..7f44e56f 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -13,6 +13,7 @@ use App\Models\User; use Illuminate\Support\Facades\Cache; use App\Classes\Pterodactyl; use App\Models\Product; +use Carbon\Carbon; class OverViewController extends Controller { @@ -22,6 +23,7 @@ class OverViewController extends Controller { $counters = Cache::remember('counters', self::TTL, function () { $output = collect(); + //Set basic variables in the collection $output->put('users', User::query()->count()); $output->put('credits', number_format(User::query()->where("role","!=","admin")->sum('credits'), 2, '.', '')); $output->put('payments', Payment::query()->count()); @@ -29,6 +31,7 @@ class OverViewController extends Controller $output->put('nests', Nest::query()->count()); $output->put('locations', Location::query()->count()); + //Prepare for counting $output->put('servers', collect()); $output['servers']->active = 0; $output['servers']->total = 0; @@ -36,6 +39,41 @@ class OverViewController extends Controller $output['earnings']->active = 0; $output['earnings']->total = 0; $output->put('totalUsagePercent', 0); + + //Prepare subCollection 'payments' + $output->put('payments', collect()); + //Get and save payments from last 2 months for later filtering and looping + $payments = Payment::query()->where('created_at', '>=', Carbon::today()->startOfMonth()->subMonth())->where('status', 'paid')->get(); + //Prepare collections and set a few variables + $output['payments']->put('thisMonth', collect()); + $output['payments']->put('lastMonth', collect()); + $output['payments']['thisMonth']->timeStart = Carbon::today()->startOfMonth()->toDateString(); + $output['payments']['thisMonth']->timeEnd = Carbon::today()->toDateString(); + $output['payments']['lastMonth']->timeStart = Carbon::today()->startOfMonth()->subMonth()->toDateString(); + $output['payments']['lastMonth']->timeEnd = Carbon::today()->endOfMonth()->subMonth()->toDateString(); + + //Fill out variables for each currency separately + foreach($payments->where('created_at', '>=', Carbon::today()->startOfMonth()) as $payment){ + $paymentCurrency = $payment->currency_code; + if(!isset($output['payments']['thisMonth'][$paymentCurrency])){ + $output['payments']['thisMonth']->put($paymentCurrency, collect()); + $output['payments']['thisMonth'][$paymentCurrency]->total = 0; + $output['payments']['thisMonth'][$paymentCurrency]->count = 0; + } + $output['payments']['thisMonth'][$paymentCurrency]->total += $payment->total_price; + $output['payments']['thisMonth'][$paymentCurrency]->count ++; + } + foreach($payments->where('created_at', '<', Carbon::today()->startOfMonth()) as $payment){ + $paymentCurrency = $payment->currency_code; + if(!isset($output['payments']['lastMonth'][$paymentCurrency])){ + $output['payments']['lastMonth']->put($paymentCurrency, collect()); + $output['payments']['lastMonth'][$paymentCurrency]->total = 0; + $output['payments']['lastMonth'][$paymentCurrency]->count = 0; + } + $output['payments']['lastMonth'][$paymentCurrency]->total += $payment->total_price; + $output['payments']['lastMonth'][$paymentCurrency]->count ++; + } + $output['payments']->total = Payment::query()->count(); return $output; }); @@ -79,7 +117,7 @@ class OverViewController extends Controller } return $output; }); - + //dd($counters); return view('admin.overview.index', [ 'counters' => $counters, 'nodes' => $nodes, diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index fa9c9124..719b8b06 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -90,7 +90,7 @@
{{__('Payments')}} - {{$counters['payments']}} + {{$counters['payments']->total}}
@@ -163,7 +163,7 @@
- {{__('Individual nodes')}} + {{__('Individual nodes')}}
@@ -209,6 +209,71 @@
+
+
+
+
+ {{__('Latest payments')}} +
+
+
+
+
+
+ {{__('Last month')}}: + + + + + + + + + + + + @foreach($counters['payments']['lastMonth'] as $currency => $income) + + + + + + @endforeach + +
{{__('Currency')}}{{__('Number of payments')}}{{__('Total income')}}
{{$currency}}{{$income->count}}{{$income->total}}
+
+
+ {{__('This month')}}: + + + + + + + + + + + + @foreach($counters['payments']['thisMonth'] as $currency => $income) + + + + + + @endforeach + +
{{__('Currency')}}{{__('Number of payments')}}{{__('Total income')}}
{{$currency}}{{$income->count}}{{$income->total}}
+
+
+
+ +
+
From c26a47a982adadda950d826926da690110f104ce Mon Sep 17 00:00:00 2001 From: ok236449 Date: Sat, 20 Aug 2022 18:49:33 +0200 Subject: [PATCH 06/15] Delete server on 404 instead of giving 500 --- app/Classes/Pterodactyl.php | 10 ++++++++-- app/Http/Controllers/ServerController.php | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php index 620feea1..95893dca 100644 --- a/app/Classes/Pterodactyl.php +++ b/app/Classes/Pterodactyl.php @@ -287,7 +287,7 @@ class Pterodactyl * @param int $pterodactylId * @return mixed */ - public static function getServerAttributes(int $pterodactylId) + public static function getServerAttributes(int $pterodactylId, bool $deleteOn404 = false) { try { $response = self::client()->get("/application/servers/{$pterodactylId}?include=egg,node,nest,location"); @@ -299,7 +299,13 @@ class Pterodactyl - if ($response->failed()) throw self::getException("Failed to get server attributes from pterodactyl - ", $response->status()); + if ($response->failed()){ + if($deleteOn404){ //Delete the server if it does not exist (server deleted on pterodactyl) + Server::where('pterodactyl_id', $pterodactylId)->first()->delete(); + return; + } + else throw self::getException("Failed to get server attributes from pterodactyl - ", $response->status()); + } return $response->json()['attributes']; } diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 20deffca..23aa53f8 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -30,8 +30,8 @@ class ServerController extends Controller foreach ($servers as $server) { //Get server infos from ptero - $serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id); - + $serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id, true); + if(!$serverAttributes) continue; $serverRelationships = $serverAttributes['relationships']; $serverLocationAttributes = $serverRelationships['location']['attributes']; From 4871272670dc1b5769b3848a3f9ce212f87cf527 Mon Sep 17 00:00:00 2001 From: ok236449 Date: Sat, 20 Aug 2022 21:19:27 +0200 Subject: [PATCH 07/15] Added latest tickets to admin overview --- .../Controllers/Admin/OverViewController.php | 32 ++++++++++++++++- .../views/admin/overview/index.blade.php | 36 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index 7f44e56f..178e4822 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -13,6 +13,7 @@ use App\Models\User; use Illuminate\Support\Facades\Cache; use App\Classes\Pterodactyl; use App\Models\Product; +use App\Models\Ticket; use Carbon\Carbon; class OverViewController extends Controller @@ -117,12 +118,41 @@ class OverViewController extends Controller } return $output; }); + + $tickets = Cache::remember('tickets', self::TTL, function(){ + $output = collect(); + foreach(Ticket::query()->latest()->take(3)->get() as $ticket){ + $output->put($ticket->ticket_id, collect()); + $output[$ticket->ticket_id]->title = $ticket->title; + $user = User::query()->where('id', $ticket->user_id)->first(); + $output[$ticket->ticket_id]->user_id = $user->id; + $output[$ticket->ticket_id]->user = $user->name; + $output[$ticket->ticket_id]->status = $ticket->status; + $output[$ticket->ticket_id]->last_updated = $ticket->updated_at->diffForHumans(); + switch ($ticket->status) { + case 'Open': + $output[$ticket->ticket_id]->statusBadgeColor = 'badge-success'; + break; + case 'Closed': + $output[$ticket->ticket_id]->statusBadgeColor = 'badge-danger'; + break; + case 'Answered': + $output[$ticket->ticket_id]->statusBadgeColor = 'badge-info'; + break; + default: + $output[$ticket->ticket_id]->statusBadgeColor = 'badge-warning'; + break; + } + } + return $output; + }); //dd($counters); return view('admin.overview.index', [ 'counters' => $counters, 'nodes' => $nodes, 'syncLastUpdate' => $syncLastUpdate, - 'perPageLimit' => ($counters['servers']->total != Server::query()->count())?true:false + 'perPageLimit' => ($counters['servers']->total != Server::query()->count())?true:false, + 'tickets' => $tickets ]); } diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index 719b8b06..d7c70c7e 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -142,6 +142,42 @@ {{__('Last updated :date', ['date' => $syncLastUpdate])}} +
+
+
+
+ {{__('Latest tickets')}} +
+
+
+
+ @if(!$tickets->count()){{__('There are no tickets')}}. + @else + + + + + + + + + + + + @foreach($tickets as $ticket_id => $ticket) + + + + + + + @endforeach + + +
{{__('Title')}}{{__('User')}}{{__('Status')}}{{__('Last updated')}}
#{{$ticket_id}} - {{$ticket->title}}{{$ticket->user}}{{$ticket->status}}{{$ticket->last_updated}}
+ @endif +
+
From bb38b1066292585232e442000538b289cc4f7efd Mon Sep 17 00:00:00 2001 From: ok236449 Date: Sat, 20 Aug 2022 21:20:18 +0200 Subject: [PATCH 08/15] Hide close button when already closed --- resources/views/moderator/ticket/show.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/moderator/ticket/show.blade.php b/resources/views/moderator/ticket/show.blade.php index 22bd2ea1..f6a309f2 100644 --- a/resources/views/moderator/ticket/show.blade.php +++ b/resources/views/moderator/ticket/show.blade.php @@ -51,11 +51,13 @@ @endif

Created on: {{ $ticket->created_at->diffForHumans() }}

+ @if($ticket->status!='Closed')
{{csrf_field()}} {{method_field("POST") }}
+ @endif
From f43565b1c7174ee7393a5073af78c91f5a868ace Mon Sep 17 00:00:00 2001 From: ok236449 Date: Mon, 22 Aug 2022 17:00:35 +0200 Subject: [PATCH 09/15] 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 10/15] 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 dfc3d0bd427f7dae1181413b56c7a5aae730dded Mon Sep 17 00:00:00 2001 From: ok236449 Date: Tue, 23 Aug 2022 20:08:49 +0200 Subject: [PATCH 11/15] 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 178e4822..c0cb0c4c 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -97,7 +97,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']; From da9bd9d5474ec2062d910242bad3685d3792450e Mon Sep 17 00:00:00 2001 From: ok236449 Date: Tue, 23 Aug 2022 20:09:42 +0200 Subject: [PATCH 12/15] 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']; From 30d29cdd62fd6727e22131e2cdcf4147e454b43d Mon Sep 17 00:00:00 2001 From: ok236449 Date: Wed, 24 Aug 2022 17:52:05 +0200 Subject: [PATCH 13/15] Check for overallocation for every package --- app/Http/Controllers/ProductController.php | 14 +++++++++++++- resources/views/servers/create.blade.php | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index a5e7bcbd..61e480f0 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Classes\Pterodactyl; use App\Models\Egg; use App\Models\Location; use App\Models\Node; @@ -55,6 +56,10 @@ class ProductController extends Controller public function getLocationsBasedOnEgg(Request $request, Egg $egg) { $nodes = $this->getNodesBasedOnEgg($request, $egg); + foreach($nodes as $key => $node){ + $pteroNode = Pterodactyl::getNode($node->id); + if($pteroNode['allocated_resources']['memory']>=($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)||$pteroNode['allocated_resources']['disk']>=($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)) $nodes->forget($key); + } $locations = collect(); //locations @@ -87,7 +92,7 @@ class ProductController extends Controller { if (is_null($egg->id) || is_null($node->id)) return response()->json('node and egg id is required', '400'); - return Product::query() + $products = Product::query() ->where('disabled', '=', false) ->whereHas('nodes', function (Builder $builder) use ($node) { $builder->where('id', '=', $node->id); @@ -96,5 +101,12 @@ class ProductController extends Controller $builder->where('id', '=', $egg->id); }) ->get(); + + $pteroNode = Pterodactyl::getNode($node->id); + foreach($products as $key => $product){ + if($product->memory>($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)-$pteroNode['allocated_resources']['memory']||$product->disk>($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)-$pteroNode['allocated_resources']['disk']) $product->doesNotFit = true; + } + + return $products; } } diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php index 5454a6b6..4ac74f79 100644 --- a/resources/views/servers/create.blade.php +++ b/resources/views/servers/create.blade.php @@ -218,10 +218,10 @@
From df0d37bb81668ae86096e08af7920fef587f98e1 Mon Sep 17 00:00:00 2001 From: ok236449 Date: Wed, 24 Aug 2022 17:52:51 +0200 Subject: [PATCH 14/15] Check for resources when upgrading server --- app/Http/Controllers/ServerController.php | 13 ++++++++++++- resources/views/servers/settings.blade.php | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 20deffca..5324cbd1 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -241,6 +241,9 @@ class ServerController extends Controller $serverRelationships = $serverAttributes['relationships']; $serverLocationAttributes = $serverRelationships['location']['attributes']; + //Get current product + $currentProduct = Product::where('id', $server->product_id)->first(); + //Set server infos $server->location = $serverLocationAttributes['long'] ? $serverLocationAttributes['long'] : @@ -249,11 +252,19 @@ class ServerController extends Controller $server->node = $serverRelationships['node']['attributes']['name']; $server->name = $serverAttributes['name']; $server->egg = $serverRelationships['egg']['attributes']['name']; - $products = Product::orderBy("created_at")->get(); + + $pteroNode = Pterodactyl::getNode($serverRelationships['node']['attributes']['id']); + + $products = Product::orderBy("created_at") + ->whereHas('nodes', function (Builder $builder) use ($serverRelationships) { //Only show products for that node + $builder->where('id', '=', $serverRelationships['node']['attributes']['id']); + }) + ->get(); // Set the each product eggs array to just contain the eggs name foreach ($products as $product) { $product->eggs = $product->eggs->pluck('name')->toArray(); + if($product->memory-$currentProduct->memory>($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)-$pteroNode['allocated_resources']['memory']||$product->disk-$currentProduct->disk>($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)-$pteroNode['allocated_resources']['disk']) $product->doesNotFit = true; } return view('servers.settings')->with([ diff --git a/resources/views/servers/settings.blade.php b/resources/views/servers/settings.blade.php index e320533c..5c8513aa 100644 --- a/resources/views/servers/settings.blade.php +++ b/resources/views/servers/settings.blade.php @@ -255,8 +255,8 @@ @foreach($products as $product) @if(in_array($server->egg, $product->eggs) && $product->id != $server->product->id && $product->disabled == false) - + @endif @endforeach From 2b3b8ddec9f6bef4bc1d61638f2200999162b3ec Mon Sep 17 00:00:00 2001 From: ok236449 Date: Wed, 24 Aug 2022 18:22:24 +0200 Subject: [PATCH 15/15] fix single underscore in translation --- resources/views/servers/settings.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/servers/settings.blade.php b/resources/views/servers/settings.blade.php index 5c8513aa..1a1b269b 100644 --- a/resources/views/servers/settings.blade.php +++ b/resources/views/servers/settings.blade.php @@ -261,7 +261,7 @@ @endforeach
{{__("Once the Upgrade button is pressed, we will automatically deduct the amount for the first hour according to the new product from your credits")}}.
-
{{_("Server will be automatically restarted once upgraded")}} +
{{__("Server will be automatically restarted once upgraded")}}