From f37b78d7502eebc52f5cc361beccf29790b0fb90 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 21:32:04 +0200 Subject: [PATCH 1/2] 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 2b0321733e9029ef5c5a01412ec7b08b42eb24a9 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 16 May 2023 21:36:59 +0200 Subject: [PATCH 2/2] 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 {