From 166dccd3de5f9cd81e08252702b992b7ee0a6c92 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 8 May 2023 21:16:06 +0200 Subject: [PATCH 1/3] Update web.php --- routes/web.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/routes/web.php b/routes/web.php index 8de0863e..425c5613 100644 --- a/routes/web.php +++ b/routes/web.php @@ -76,9 +76,11 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () { Route::patch('/servers/cancel/{server}', [ServerController::class, 'cancel'])->name('servers.cancel'); Route::resource('servers', ServerController::class); - $serverSettings = app(App\Settings\ServerSettings::class); - if ($serverSettings->enable_upgrade) { - Route::post('servers/{server}/upgrade', [ServerController::class, 'upgrade'])->name('servers.upgrade'); + if (config('app.key')) { + $serverSettings = app(App\Settings\ServerSettings::class); + if ($serverSettings->enable_upgrade) { + Route::post('servers/{server}/upgrade', [ServerController::class, 'upgrade'])->name('servers.upgrade'); + } } Route::post('profile/selfdestruct', [ProfileController::class, 'selfDestroyUser'])->name('profile.selfDestroyUser'); From 6f74a7379f2fbfa0623688a6cc82f2b00ca75537 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 8 May 2023 23:00:29 +0200 Subject: [PATCH 2/3] Show referredBy on User --- app/Models/User.php | 14 +++++++ .../default/views/admin/users/show.blade.php | 37 ++++++++++++------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index c72e693c..da4a3a7f 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +use Illuminate\Support\Facades\DB; use Spatie\Activitylog\LogOptions; use Spatie\Activitylog\Traits\CausesActivity; use Spatie\Activitylog\Traits\LogsActivity; @@ -97,6 +98,8 @@ class User extends Authenticatable implements MustVerifyEmail $ptero_settings = new PterodactylSettings(); $this->pterodactyl = new PterodactylClient($ptero_settings); + + } public static function boot() @@ -285,6 +288,17 @@ class User extends Authenticatable implements MustVerifyEmail ])->save(); } + public function referredBy(){ + $referee = DB::table('user_referrals')->where("registered_user_id",$this->id)->first(); + + if($referee){ + $referee = User::where("id",$referee->referral_id)->firstOrFail(); + return $referee; + } + return Null; + + } + public function getActivitylogOptions(): LogOptions { return LogOptions::defaults() diff --git a/themes/default/views/admin/users/show.blade.php b/themes/default/views/admin/users/show.blade.php index 3ab0d62e..5656c307 100644 --- a/themes/default/views/admin/users/show.blade.php +++ b/themes/default/views/admin/users/show.blade.php @@ -173,18 +173,6 @@ -
-
-
- -
-
- - {{ $user->CreditUsage() }} - -
-
-
@@ -199,7 +187,30 @@
- +
+
+
+ +
+
+ + {{ $user->CreditUsage() }} + +
+
+
+
+
+
+ +
+
+ + {{ $user->referredBy() != Null ? $user->referredBy()->name : "None" }} + +
+
+
From f53aa0e8b0caf656a35821373da94d4a1661004f Mon Sep 17 00:00:00 2001 From: 1day2die Date: Mon, 8 May 2023 23:13:50 +0200 Subject: [PATCH 3/3] Fix Ptero UserID --- app/Http/Controllers/Auth/RegisterController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 9f1e8019..566d86fd 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -142,7 +142,7 @@ class RegisterController extends Controller $user->syncRoles(4); $response = $this->pterodactyl->application->post('/application/users', [ - 'external_id' => $user->pterodactyl_id, + 'external_id' => null, 'username' => $user->name, 'email' => $user->email, 'first_name' => $user->name, @@ -151,6 +151,14 @@ class RegisterController extends Controller 'root_admin' => false, 'language' => 'en', ]); + + $user->update([ + 'pterodactyl_id' => $response->json()['attributes']['id'], + ]); + + + + if ($response->failed()) { $user->delete();