From 67cbde2fa1f6e57894d30e9f9dd040829ac06c3d Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 21:32:04 +0200 Subject: [PATCH 1/5] ticket category permissions --- app/Http/Controllers/Admin/TicketCategoryController.php | 4 ++-- config/permissions_web.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/TicketCategoryController.php b/app/Http/Controllers/Admin/TicketCategoryController.php index 74fff87a..3d4d8e87 100644 --- a/app/Http/Controllers/Admin/TicketCategoryController.php +++ b/app/Http/Controllers/Admin/TicketCategoryController.php @@ -9,8 +9,8 @@ use Illuminate\Http\Request; class TicketCategoryController extends Controller { - const READ_PERMISSION = "admin.tickets.read"; - const WRITE_PERMISSION = "admin.tickets.write"; + const READ_PERMISSION = "admin.tickets.category.read"; + const WRITE_PERMISSION = "admin.tickets.category.write"; /** * * Display a listing of the resource. diff --git a/config/permissions_web.php b/config/permissions_web.php index 0ae789ca..1c3828f7 100644 --- a/config/permissions_web.php +++ b/config/permissions_web.php @@ -17,6 +17,9 @@ return [ 'admin.tickets.write', 'admin.tickets.get_notification', + 'admin.tickets.category.read', + 'admin.tickets.category.write', + 'admin.ticket_blacklist.read', 'admin.ticket_blacklist.write', From 2c9b933c6d0942888e74205b6593f2cc5e25fc34 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 21:36:59 +0200 Subject: [PATCH 2/5] fix server upgrade --- app/Http/Controllers/ServerController.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 6324f870..d6c344f5 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -389,13 +389,6 @@ class ServerController extends Controller $server->allocation = $serverAttributes['allocation']; $response = $this->pterodactyl->updateServer($server, $newProduct); if ($response->failed()) return redirect()->route('servers.index')->with('error', __("The system was unable to update your server product. Please try again later or contact support.")); - //update user balance - $user->decrement('credits', $priceupgrade); - //restart the server - $response = $this->pterodactyl->powerAction($server, 'restart'); - if ($response->failed()) { - return redirect()->route('servers.index')->with('error', $response->json()['errors'][0]['detail']); - } // Remove the allocation property from the server object as it is not a column in the database unset($server->allocation); @@ -414,7 +407,7 @@ class ServerController extends Controller $user->decrement('credits', $newProduct->price); //restart the server - $response = Pterodactyl::powerAction($server, "restart"); + $response = $this->pterodactyl->powerAction($server, 'restart'); if ($response->failed()) return redirect()->route('servers.index')->with('error', 'Server upgraded successfully! Could not restart the server: ' . $response->json()['errors'][0]['detail']); return redirect()->route('servers.show', ['server' => $server->id])->with('success', __('Server Successfully Upgraded')); } else { From fd1ce85723bdf36852021262d307ccc835ffbb03 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 21:47:34 +0200 Subject: [PATCH 3/5] remove OOM killer from product info --- themes/default/views/servers/create.blade.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/themes/default/views/servers/create.blade.php b/themes/default/views/servers/create.blade.php index fbc15466..5b8a3f3c 100644 --- a/themes/default/views/servers/create.blade.php +++ b/themes/default/views/servers/create.blade.php @@ -201,12 +201,6 @@ {{ __('Databases') }} -
  • - - {{ __('OOM Killer') }} - -
  • {{ __('Allocations') }} From dd962a0afbc7014e8efd5addabb1877d768cc99b Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 21:58:05 +0200 Subject: [PATCH 4/5] fix admin overview total credits counter --- 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 90cd9307..f3d883e8 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -38,7 +38,7 @@ class OverViewController extends Controller $counters = collect(); //Set basic variables in the collection $counters->put('users', User::query()->count()); - $counters->put('credits', number_format(User::query()->where('role', '!=', 'admin')->sum('credits'), 2, '.', '')); + $counters->put('credits', number_format(User::query()->whereHas("roles", function($q){ $q->where("id", "!=", "1"); })->sum('credits'), 2, '.', '')); $counters->put('payments', Payment::query()->count()); $counters->put('eggs', Egg::query()->count()); $counters->put('nests', Nest::query()->count()); From 680ffefb1e3cd785f49f938e076ed03ba2cc6bb9 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 22:03:52 +0200 Subject: [PATCH 5/5] fix server upgrade while installation --- app/Http/Controllers/ServerController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index d6c344f5..9a00ee1b 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -389,6 +389,9 @@ class ServerController extends Controller $server->allocation = $serverAttributes['allocation']; $response = $this->pterodactyl->updateServer($server, $newProduct); if ($response->failed()) return redirect()->route('servers.index')->with('error', __("The system was unable to update your server product. Please try again later or contact support.")); + //restart the server + $response = $this->pterodactyl->powerAction($server, 'restart'); + if ($response->failed()) return redirect()->route('servers.index')->with('error', 'Upgrade Failed! Could not restart the server: ' . $response->json()['errors'][0]['detail']); // Remove the allocation property from the server object as it is not a column in the database unset($server->allocation); @@ -406,9 +409,6 @@ class ServerController extends Controller // Withdraw the credits for the new product $user->decrement('credits', $newProduct->price); - //restart the server - $response = $this->pterodactyl->powerAction($server, 'restart'); - if ($response->failed()) return redirect()->route('servers.index')->with('error', 'Server upgraded successfully! Could not restart the server: ' . $response->json()['errors'][0]['detail']); return redirect()->route('servers.show', ['server' => $server->id])->with('success', __('Server Successfully Upgraded')); } else { return redirect()->route('servers.show', ['server' => $server->id])->with('error', __('Not Enough Balance for Upgrade'));