From 7ed402a22752848d1b8ef28c852e7796a3d0b22a Mon Sep 17 00:00:00 2001 From: 1day2die Date: Thu, 2 Jun 2022 18:41:08 +0200 Subject: [PATCH] choose who can see their referral URL --- app/Classes/Settings/Misc.php | 4 +- database/seeders/Seeds/SettingsSeeder.php | 7 + .../views/admin/settings/tabs/misc.blade.php | 13 + resources/views/profile/index.blade.php | 338 +++++++++--------- 4 files changed, 192 insertions(+), 170 deletions(-) diff --git a/app/Classes/Settings/Misc.php b/app/Classes/Settings/Misc.php index e0404f7a..1b37777f 100644 --- a/app/Classes/Settings/Misc.php +++ b/app/Classes/Settings/Misc.php @@ -39,6 +39,7 @@ class Misc 'mailfromname' => 'nullable|string', 'enable_referral' => 'nullable|string', 'referral_reward' => 'nullable|numeric', + 'referral_allowed' => 'nullable|string', ]); if ($validator->fails()) { @@ -72,7 +73,8 @@ class Misc "SETTINGS::MAIL:FROM_ADDRESS" => "mailfromadress", "SETTINGS::MAIL:FROM_NAME" => "mailfromname", "SETTINGS::REFERRAL::ENABLED" => "enable_referral", - "SETTINGS::REFERRAL::REWARD" => "referral_reward" + "SETTINGS::REFERRAL::REWARD" => "referral_reward", + "SETTINGS::REFERRAL::ALLOWED" => "referral_allowed" ]; diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php index 69abd413..3b06c069 100644 --- a/database/seeders/Seeds/SettingsSeeder.php +++ b/database/seeders/Seeds/SettingsSeeder.php @@ -479,5 +479,12 @@ class SettingsSeeder extends Seeder 'type' => 'integer', 'description' => 'Credit reward a user should receive when a user registers with his referral code' ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::REFERRAL::ALLOWED', + ], [ + 'value' =>"client", + 'type' => 'string', + 'description' => 'Who should be allowed to to use the referral code. all/client' + ]); } } diff --git a/resources/views/admin/settings/tabs/misc.blade.php b/resources/views/admin/settings/tabs/misc.blade.php index a126b927..df566c9d 100644 --- a/resources/views/admin/settings/tabs/misc.blade.php +++ b/resources/views/admin/settings/tabs/misc.blade.php @@ -210,6 +210,19 @@ class="form-control @error('referral_reward') is-invalid @enderror"> +
+ + +
diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php index b471e14e..bf31a1c9 100644 --- a/resources/views/profile/index.blade.php +++ b/resources/views/profile/index.blade.php @@ -100,209 +100,209 @@ class="fa fa-coins mr-2">{{ $user->Credits() }} - -
- @if(config('SETTINGS::REFERRAL::ENABLED') == "true" && $user->role != "member") - - {{_("Referral URL")}} : {{route("register")}}?ref={{$user->referral_code}} - @else - - {{_("Make a purchase to reveal your referral-URL")}} - @endif + @if(config('SETTINGS::REFERRAL::ENABLED') == "true") + @if((config('SETTINGS::REFERRAL::ALLOWED') == "client" && $user->role != "member") || config('SETTINGS::REFERRAL::ALLOWED') == "everyone") +
+ + {{_("Referral URL")}} : {{route("register")}}?ref={{$user->referral_code}} + @else + + {{_("Make a purchase to reveal your referral-URL")}} + @endif +
+ @endif
- - -
{{ $user->role }} -
- {{ $user->created_at->isoFormat('LL') }} +
{{ $user->role }} +
+ {{ $user->created_at->isoFormat('LL') }} +
- - -
-
-
-
-
-
- @if( $errors->has('pterodactyl_error_message') ) - @foreach( $errors->get('pterodactyl_error_message') as $err ) - - {{ $err }} - - @endforeach - @endif - @if( $errors->has('pterodactyl_error_status') ) - @foreach( $errors->get('pterodactyl_error_status') as $err ) - + +
+
+
+
+
+
+ @if( $errors->has('pterodactyl_error_message') ) + @foreach( $errors->get('pterodactyl_error_message') as $err ) + {{ $err }} - @endforeach - @endif -
+ @endforeach + @endif + @if( $errors->has('pterodactyl_error_status') ) + @foreach( $errors->get('pterodactyl_error_status') as $err ) + + {{ $err }} + + @endforeach + @endif +
- @error('name') -
- {{ $message }} + @error('name') +
+ {{ $message }} +
+ @enderror
- @enderror
-
-
-
-
+
+
+
- @error('email') -
- {{ $message }} + @error('email') +
+ {{ $message }} +
+ @enderror
- @enderror
-
-
-
-
{{ __('Change Password') }}
-
-
-
- - +
+
+
{{ __('Change Password') }}
+
+
+
+ + - @error('current_password') -
- {{ $message }} + @error('current_password') +
+ {{ $message }} +
+ @enderror +
+
+
+
+
+
+ + + @error('new_password') +
+ {{ $message }} +
+ @enderror +
+
+
+
+
+
+ + + + @error('new_password_confirmation') +
+ {{ $message }} +
+ @enderror
- @enderror
-
-
-
- - - @error('new_password') -
- {{ $message }} -
- @enderror -
-
-
-
-
-
- - - - @error('new_password_confirmation') -
- {{ $message }} -
- @enderror -
-
-
-
- @if (!empty(config('SETTINGS::DISCORD:CLIENT_ID')) && !empty(config('SETTINGS::DISCORD:CLIENT_SECRET'))) -
- @if (is_null(Auth::user()->discordUser)) - {{ __('Link your discord account!') }} -
-
- @if ($credits_reward_after_verify_discord) -

{{ __('By verifying your discord account, you receive extra Credits and increased Server amounts') }} -

- @endif -
-
- - - {{ __('Login with Discord') }} - - @else -
-
-

{{ __('You are verified!') }}

-
-
-
-
-
-
-

{{ $user->discordUser->username }} - {{ $user->discordUser->locale }} -

-

{{ $user->discordUser->id }} + @if (!empty(config('SETTINGS::DISCORD:CLIENT_ID')) && !empty(config('SETTINGS::DISCORD:CLIENT_SECRET'))) +

+ @if (is_null(Auth::user()->discordUser)) + {{ __('Link your discord account!') }} +
+
+ @if ($credits_reward_after_verify_discord) +

{{ __('By verifying your discord account, you receive extra Credits and increased Server amounts') }}

-
-
avatar
-
-
- - {{ __('Re-Sync Discord') }} - + @endif
-
- @endif -
- @endif -
-
-
- + + {{ __('Login with Discord') }} + + @else +
+
+

{{ __('You are verified!') }}

+
+
+
+
+
+
+

{{ $user->discordUser->username }} + {{ $user->discordUser->locale }} +

+

{{ $user->discordUser->id }} +

+
+
avatar
+
+
+ + {{ __('Re-Sync Discord') }} + +
+
+
+ @endif + +
+ @endif +
+
+
+ +
-
+
-
- + -
- +
+ -
- - +
+ + -@endsection + @endsection