v1.0.3

README.md

@@ -6,6 +6,8 @@
 
 CtrlPanel offers an easy-to-use and free billing solution for all starting and experienced hosting providers that seamlessly integrates with the Pterodactyl panel. It facilitates account creation, server ordering, and management, while offering addons, multiple payment methods, and customizable themes for a comprehensive solution.
 
+> ⚠️ **Important Notice:** CtrlPanel is **only compatible with Pterodactyl**. It does not support Pelican or any other hosting panels.
+
 ![GitHub tag](https://img.shields.io/github/tag/Ctrlpanel-gg/panel)
 ![Overall Installations](https://img.shields.io/badge/Overall%20Installations-5000%2B-green)
 ![GitHub stars](https://img.shields.io/github/stars/Ctrlpanel-gg/panel) <!--
@@ -41,15 +43,13 @@ Demo Server: [demo.CtrlPanel.gg](https://demo.CtrlPanel.gg)
 
 ### 🐳 Docker
 
-*Soon...*
-
-<!-- ```bash
-docker run ...
+```bash
+docker run -d -p 8080:80 -p 8443:443 --name ctrlpanel ghcr.io/ctrlpanel-gg/panel:1.0.2
 ```
 
-CtrlPanel is now running on [0.0.0.0:3001](http://0.0.0.0:3001). Don't forget to configure the database and Pterodactyl. [Documentation](documentation link here)
+CtrlPanel is now running on [0.0.0.0:8080](http://0.0.0.0:8080). Don't forget to configure the database and Pterodactyl.
 
-more info: [Docker](docker documentation link here) -->
+more info: [Docker](https://github.com/Ctrlpanel-gg/panel/blob/main/.github/docker/README.md)
 
 ### 💪🏻 Non-Docker
 

app/Classes/PterodactylClient.php

@@ -66,7 +66,7 @@ public function clientAdmin(PterodactylSettings $ptero_settings)
     private function getException(string $message = '', int $status = 0): Exception
     {
         if ($status == 404) {
-            return new Exception('Ressource does not exist on pterodactyl - ' . $message, 404);
+            return new Exception('Resource does not exist on pterodactyl - ' . $message, 404);
         }
 
         if ($status == 403) {
@@ -81,6 +81,14 @@ private function getException(string $message = '', int $status = 0): Exception
             return new Exception('Pterodactyl server error - ' . $message, 500);
         }
 
+        if ($status == 0) {
+            return new Exception('Unable to connect to Pterodactyl node - Please check if the node is online and accessible', 503);
+        }
+
+        if ($status >= 500 && $status < 600) {
+            return new Exception('Pterodactyl node error (HTTP ' . $status . ') - ' . $message, $status);
+        }
+
         return new Exception('Request Failed, is pterodactyl set-up correctly? - ' . $message);
     }
 
@@ -256,33 +264,47 @@ public function getAllocations(Node $node)
      * @param  int  $allocationId
      * @return Response
      */
-    public function createServer(Server $server, Egg $egg, int $allocationId)
+    public function createServer(Server $server, Egg $egg, int $allocationId, mixed $eggVariables = null)
     {
-        return $this->application->post('application/servers', [
-            'name' => $server->name,
-            'external_id' => $server->id,
-            'user' => $server->user->pterodactyl_id,
-            'egg' => $egg->id,
-            'docker_image' => $egg->docker_image,
-            'startup' => $egg->startup,
-            'environment' => $egg->getEnvironmentVariables(),
-            'oom_disabled' => !$server->product->oom_killer,
-            'limits' => [
-                'memory' => $server->product->memory,
-                'swap' => $server->product->swap,
-                'disk' => $server->product->disk,
-                'io' => $server->product->io,
-                'cpu' => $server->product->cpu,
-            ],
-            'feature_limits' => [
-                'databases' => $server->product->databases,
-                'backups' => $server->product->backups,
-                'allocations' => $server->product->allocations,
-            ],
-            'allocation' => [
-                'default' => $allocationId,
-            ],
-        ]);
+       try {
+            $response = $this->application->post('application/servers', [
+                'name' => $server->name,
+                'external_id' => $server->id,
+                'user' => $server->user->pterodactyl_id,
+                'egg' => $egg->id,
+                'docker_image' => $egg->docker_image,
+                'startup' => $egg->startup,
+                'environment' => $this->getEnvironmentVariables($egg, $eggVariables),
+                'oom_disabled' => !$server->product->oom_killer,
+                'limits' => [
+                    'memory' => $server->product->memory,
+                    'swap' => $server->product->swap,
+                    'disk' => $server->product->disk,
+                    'io' => $server->product->io,
+                    'cpu' => $server->product->cpu,
+                ],
+                'feature_limits' => [
+                    'databases' => $server->product->databases,
+                    'backups' => $server->product->backups,
+                    'allocations' => $server->product->allocations,
+                ],
+                'allocation' => [
+                    'default' => $allocationId,
+                ],
+            ]);
+
+            if ($response->failed()) {
+                throw self::getException('Failed to create server on pterodactyl', $response->status());
+            }
+
+            return $response;
+        } catch (Exception $e) {
+            // If it's a connection error (status 0), throw a specific exception
+            if ($e->getCode() === 0) {
+                throw self::getException('Unable to connect to Pterodactyl node - Please check if the node is online and accessible', 503);
+            }
+            throw $e;
+        }
     }
 
     public function suspendServer(Server $server)
@@ -452,4 +474,20 @@ public function checkNodeResources(Node $node, int $requireMemory, int $requireD
 
         return true;
     }
+
+    private function getEnvironmentVariables(Egg $egg, $variables)
+    {
+        $environment = [];
+        $variables = json_decode($variables, true);
+
+        foreach ($egg->environment as $envVariable) {
+            $matchedVariable = collect($variables)->firstWhere('env_variable', $envVariable['env_variable']);
+
+            $environment[$envVariable['env_variable']] = $matchedVariable
+                ? $matchedVariable['filled_value']
+                : $envVariable['default_value'];
+        }
+
+        return $environment;
+    }
 }

app/Console/Commands/ChargeServers.php

@@ -104,7 +104,6 @@ public function handle()
                     } catch (\Exception $exception) {
                         $this->error($exception->getMessage());
                     }
-                    return;
                 }
 
                 // charge credits to user
@@ -127,8 +126,10 @@ public function notifyUsers()
         if (!empty($this->usersToNotify)) {
             /** @var User $user */
             foreach ($this->usersToNotify as $user) {
+                $suspendServers = $user->servers()->whereNotNull('suspended')->get();
+
                 $this->line("<fg=yellow>Notified user:</> <fg=blue>{$user->name}</>");
-                $user->notify(new ServersSuspendedNotification());
+                $user->notify(new ServersSuspendedNotification($suspendServers));
             }
         }
 

app/Exceptions/Handler.php

@@ -2,11 +2,16 @@
 
 namespace App\Exceptions;
 
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 use Throwable;
 
 class Handler extends ExceptionHandler
 {
+
+
     /**
      * A list of exception types with their corresponding custom log levels.
      *
@@ -47,4 +52,29 @@ public function register()
             //
         });
     }
+
+
+    /**
+     * @param $request
+     * @param Throwable $exception
+     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
+     * @throws Throwable
+     */
+    public function render($request, Throwable $exception)
+    {
+        Log::error($exception->getMessage()); // Log the exception
+
+        if ($this->isHttpException($exception)) {
+            if (view()->exists('errors.' . $exception->getStatusCode())) {
+                return response()->view(
+                    'errors.' . $exception->getStatusCode(),
+                    ['exception' => $exception],
+                    $exception->getStatusCode()
+                );
+            }
+        }
+
+        // Fallback to default behavior for non-HTTP exceptions
+        return parent::render($request, $exception);
+    }
 }

app/Extensions/PaymentGateways/MercadoPago/MercadoPagoExtension.php

@@ -19,6 +19,7 @@
 use Illuminate\Support\Facades\Http;
 use App\Notifications\ConfirmPaymentNotification;
 use App\Extensions\PaymentGateways\MercadoPago\MercadoPagoSettings;
+use Illuminate\Http\RedirectResponse;
 
 /**
  * Summary of MercadoPagoExtension
@@ -62,6 +63,7 @@ public static function getRedirectUrl(Payment $payment, ShopProduct $shopProduct
                     'failure' => route('payment.Cancel'),
                     'pending' => route('payment.MercadoPagoSuccess'),
                 ],
+                'auto_return' => 'approved',
                 'notification_url' => route('payment.MercadoPagoWebhook'),
                 'payer' => [
                     'email' => $user->email,
@@ -74,6 +76,7 @@ public static function getRedirectUrl(Payment $payment, ShopProduct $shopProduct
                         'currency_id' => $shopProduct->currency_code,
                     ],
                 ],
+                'external_reference' => $payment->id,
                 'metadata' => [
                     'credit_amount' => $shopProduct->quantity,
                     'user_id' => $user->id,
@@ -93,13 +96,19 @@ public static function getRedirectUrl(Payment $payment, ShopProduct $shopProduct
         }
     }
 
-    static function Success(Request $request): void
+    static function Success(Request $request): RedirectResponse
     {
-        $payment = Payment::findOrFail($request->input('payment'));
+        $payment = Payment::findOrFail($request->input('external_reference'));
+
+        // In some cases, the webhook is received even before the success route.
+        if ($payment->status === PaymentStatus::PAID) {
+            return Redirect::route('home')->with('success', 'Your payment has already been processed!')->send();
+        }
+
         $payment->status = PaymentStatus::PROCESSING;
         $payment->save();
-        Redirect::route('home')->with('success', 'Your payment is being processed!')->send();
-        return;
+
+        return Redirect::route('home')->with('success', 'Your payment is being processed!')->send();
     }
 
     static function Webhook(Request $request): JsonResponse

app/Extensions/PaymentGateways/Mollie/MollieExtension.php

@@ -6,17 +6,15 @@
 use App\Enums\PaymentStatus;
 use App\Events\PaymentEvent;
 use App\Events\UserUpdateCreditsEvent;
-use App\Models\PartnerDiscount;
 use App\Models\Payment;
 use App\Models\ShopProduct;
 use App\Models\User;
-use App\Models\Coupon;
+use App\Notifications\ConfirmPaymentNotification;
 use App\Traits\Coupon as CouponTrait;
-use App\Events\CouponUsedEvent;
 use Exception;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Http;
@@ -52,9 +50,9 @@ public static function getRedirectUrl(Payment $payment, ShopProduct $shopProduct
                     'value' => $totalPriceString,
                 ],
                 'description' => "Order #{$payment->id} - " . $shopProduct->name,
-                'redirectUrl' => route('payment.MollieSuccess'),
+                'redirectUrl' => route('payment.MollieSuccess', ['payment_id' => $payment->id]),
                 'cancelUrl' => route('payment.Cancel'),
-                'webhookUrl' => url('/extensions/payment/MollieWebhook'),
+                'webhookUrl' => route('payment.MollieWebhook'),
                 'metadata' => [
                     'payment_id' => $payment->id,
                 ],
@@ -72,14 +70,18 @@ public static function getRedirectUrl(Payment $payment, ShopProduct $shopProduct
         }
     }
 
-    static function success(Request $request): void
+    static function success(Request $request): RedirectResponse
     {
-        $payment = Payment::findOrFail($request->input('payment'));
+        $payment = Payment::findOrFail($request->input('payment_id'));
+
+        if ($payment->status === PaymentStatus::PAID) {
+            return Redirect::route('home')->with('success', 'Your payment has already been processed!')->send();
+        }
+
         $payment->status = PaymentStatus::PROCESSING;
         $payment->save();
 
-        Redirect::route('home')->with('success', 'Your payment is being processed')->send();
-        return;
+        return Redirect::route('home')->with('success', 'Your payment is being processed')->send();
     }
 
     static function webhook(Request $request): JsonResponse
@@ -97,15 +99,15 @@ static function webhook(Request $request): JsonResponse
                 return response()->json(['success' => false]);
             }
 
-
             $payment = Payment::findOrFail($response->json()['metadata']['payment_id']);
+            $user = User::findOrFail($payment->user_id);
             $shopProduct = ShopProduct::findOrFail($payment->shop_item_product_id);
-            event(new PaymentEvent($payment, $payment, $shopProduct));
 
             if ($response->json()['status'] == 'paid') {
-                $user = User::findOrFail($payment->user_id);
                 $payment->status = PaymentStatus::PAID;
                 $payment->save();
+                $user->notify(new ConfirmPaymentNotification($payment));
+                event(new PaymentEvent($user, $payment, $shopProduct));
                 event(new UserUpdateCreditsEvent($user));
             }
         } catch (Exception $ex) {