From 128b10bbb174bcc6a8bc1f5cde3c0c3daeda5bbf Mon Sep 17 00:00:00 2001 From: IceToast Date: Tue, 25 Jan 2022 22:52:19 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=E2=9C=A8=20replaced=20Settings::getValu?= =?UTF-8?q?eByKey=20with=20config()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/CreditProductController.php | 4 +- .../Controllers/Admin/PaymentController.php | 44 +++++++++---------- .../Controllers/Admin/ProductController.php | 17 +++---- .../Controllers/Admin/ServerController.php | 9 ++-- app/Http/Controllers/Admin/UserController.php | 15 ++++--- app/Http/Controllers/Api/UserController.php | 12 ++--- .../Controllers/Auth/SocialiteController.php | 26 ++++++----- app/Http/Controllers/StoreController.php | 8 ++-- app/Listeners/UnsuspendServers.php | 12 ++--- app/Listeners/Verified.php | 4 +- app/Models/CreditProduct.php | 32 +++++++------- 11 files changed, 95 insertions(+), 88 deletions(-) diff --git a/app/Http/Controllers/Admin/CreditProductController.php b/app/Http/Controllers/Admin/CreditProductController.php index 268811d8..e510f76e 100644 --- a/app/Http/Controllers/Admin/CreditProductController.php +++ b/app/Http/Controllers/Admin/CreditProductController.php @@ -26,8 +26,8 @@ class CreditProductController extends Controller if ( env('APP_ENV') == 'local' || - Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:SECRET") && Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID") || - Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:SECRET") && Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET") && Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:METHODS") + config("SETTINGS::PAYMENTS:PAYPAL:SECRET") && config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID") || + config("SETTINGS::PAYMENTS:STRIPE:SECRET") && config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET") && config("SETTINGS::PAYMENTS:STRIPE:METHODS") ) $isPaymentSetup = true; return view('admin.store.index', [ diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 3b2a8ad9..68379777 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -134,7 +134,7 @@ class PaymentController extends Controller */ protected function getPaypalClientId() { - return env('APP_ENV') == 'local' ? Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID") : Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID"); + return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID") : config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID"); } /** @@ -142,7 +142,7 @@ class PaymentController extends Controller */ protected function getPaypalClientSecret() { - return env('APP_ENV') == 'local' ? Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET") : Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:SECRET"); + return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET") : config("SETTINGS::PAYMENTS:PAYPAL:SECRET"); } /** @@ -167,9 +167,9 @@ class PaymentController extends Controller $user->increment('credits', $creditProduct->quantity); //update server limit - if (Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { - if ($user->server_limit < Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { - $user->update(['server_limit' => Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); + if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { + if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { + $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); } } @@ -308,9 +308,9 @@ class PaymentController extends Controller $user->increment('credits', $creditProduct->quantity); //update server limit - if (Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { - if ($user->server_limit < Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { - $user->update(['server_limit' => Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); + if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { + if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { + $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); } } @@ -408,9 +408,9 @@ class PaymentController extends Controller $user->increment('credits', $payment->amount); //update server limit - if (Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { - if ($user->server_limit < Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { - $user->update(['server_limit' => Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); + if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) { + if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) { + $user->update(['server_limit' => config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')]); } } @@ -487,8 +487,8 @@ class PaymentController extends Controller protected function getStripeSecret() { return env('APP_ENV') == 'local' - ? Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:TEST_SECRET") - : Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:SECRET"); + ? config("SETTINGS::PAYMENTS:STRIPE:TEST_SECRET") + : config("SETTINGS::PAYMENTS:STRIPE:SECRET"); } /** @@ -497,8 +497,8 @@ class PaymentController extends Controller protected function getStripeEndpointSecret() { return env('APP_ENV') == 'local' - ? Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET") - : Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET"); + ? config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET") + : config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET"); } @@ -511,13 +511,13 @@ class PaymentController extends Controller $logoPath = storage_path('app/public/logo.png'); $seller = new Party([ - 'name' => Settings::getValueByKey("SETTINGS::INVOICE:COMPANY_NAME"), - 'phone' => Settings::getValueByKey("SETTINGS::INVOICE:COMPANY_PHONE"), - 'address' => Settings::getValueByKey("SETTINGS::INVOICE:COMPANY_ADDRESS"), - 'vat' => Settings::getValueByKey("SETTINGS::INVOICE:COMPANY_VAT"), + 'name' => config("SETTINGS::INVOICE:COMPANY_NAME"), + 'phone' => config("SETTINGS::INVOICE:COMPANY_PHONE"), + 'address' => config("SETTINGS::INVOICE:COMPANY_ADDRESS"), + 'vat' => config("SETTINGS::INVOICE:COMPANY_VAT"), 'custom_fields' => [ - 'E-Mail' => Settings::getValueByKey("SETTINGS::INVOICE:COMPANY_MAIL"), - "Web" => Settings::getValueByKey("SETTINGS::INVOICE:COMPANY_WEBSITE") + 'E-Mail' => config("SETTINGS::INVOICE:COMPANY_MAIL"), + "Web" => config("SETTINGS::INVOICE:COMPANY_WEBSITE") ], ]); @@ -552,7 +552,7 @@ class PaymentController extends Controller ->series(now()->format('mY')) ->delimiter("-") ->sequence($newInvoiceID) - ->serialNumberFormat(Settings::getValueByKey("SETTINGS::INVOICE:PREFIX") . '{DELIMITER}{SERIES}{SEQUENCE}') + ->serialNumberFormat(config("SETTINGS::INVOICE:PREFIX") . '{DELIMITER}{SERIES}{SEQUENCE}') ->notes($notes); if (file_exists($logoPath)) { diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index 6386fe0a..6b855f9f 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -34,14 +34,15 @@ class ProductController extends Controller */ public function create() { - return view('admin.products.create' , [ + return view('admin.products.create', [ 'locations' => Location::with('nodes')->get(), 'nests' => Nest::with('eggs')->get(), ]); } - public function clone(Request $request , Product $product){ - return view('admin.products.create' , [ + public function clone(Request $request, Product $product) + { + return view('admin.products.create', [ 'product' => $product, 'locations' => Location::with('nodes')->get(), 'nests' => Nest::with('eggs')->get(), @@ -94,7 +95,7 @@ class ProductController extends Controller { return view('admin.products.show', [ 'product' => $product, - 'minimum_credits' => Settings::getValueByKey("SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER"), + 'minimum_credits' => config("SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER"), ]); } @@ -193,14 +194,14 @@ class ProductController extends Controller return datatables($query) ->addColumn('actions', function (Product $product) { return ' - - - + + +
' . csrf_field() . ' ' . method_field("DELETE") . ' - +
'; }) diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php index 3006de94..4a82c1e6 100644 --- a/app/Http/Controllers/Admin/ServerController.php +++ b/app/Http/Controllers/Admin/ServerController.php @@ -103,7 +103,8 @@ class ServerController extends Controller * @param Server $server * @return RedirectResponse */ - public function toggleSuspended(Server $server){ + public function toggleSuspended(Server $server) + { try { $server->isSuspended() ? $server->unSuspend() : $server->suspend(); } catch (Exception $exception) { @@ -140,13 +141,13 @@ class ServerController extends Controller return '
' . csrf_field() . ' - +
' . csrf_field() . ' ' . method_field("DELETE") . ' - +
'; @@ -162,7 +163,7 @@ class ServerController extends Controller return $server->suspended ? $server->suspended->diffForHumans() : ''; }) ->editColumn('name', function (Server $server) { - return 'pterodactyl_id . '">' . $server->name . ''; + return 'pterodactyl_id . '">' . $server->name . ''; }) ->rawColumns(['user', 'actions', 'status', 'name']) ->make(); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index c0940cd7..54536f0b 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -226,7 +226,8 @@ class UserController extends Controller * @param User $user * @return RedirectResponse */ - public function toggleSuspended(User $user){ + public function toggleSuspended(User $user) + { try { !$user->isSuspended() ? $user->suspend() : $user->unSuspend(); } catch (Exception $exception) { @@ -268,17 +269,17 @@ class UserController extends Controller $suspendIcon = $user->isSuspended() ? "fa-play-circle" : "fa-pause-circle"; $suspendText = $user->isSuspended() ? __("Unsuspend") : __("Suspend"); return ' - - - + + +
' . csrf_field() . ' - +
' . csrf_field() . ' ' . method_field("DELETE") . ' - +
'; }) @@ -301,7 +302,7 @@ class UserController extends Controller return '' . $user->role . ''; }) ->editColumn('name', function (User $user) { - return 'pterodactyl_id . '">' . $user->name . ''; + return 'pterodactyl_id . '">' . $user->name . ''; }) ->orderColumn('last_seen', function ($query, $order) { $query->orderBy('last_seen', $order); diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index b2b6c921..62ee244e 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -92,7 +92,7 @@ class UserController extends Controller //Update Users Password on Pterodactyl //Username,Mail,First and Lastname are required aswell - $response = Pterodactyl::client()->patch('/application/users/'.$user->pterodactyl_id, [ + $response = Pterodactyl::client()->patch('/application/users/' . $user->pterodactyl_id, [ "username" => $request->name, "first_name" => $request->name, "last_name" => $request->name, @@ -195,9 +195,9 @@ class UserController extends Controller $user = $discordUser ? $discordUser->user : User::findOrFail($id); if ($user->isSuspended()) { - throw ValidationException::withMessages([ - 'error' => 'The user is already suspended', - ]); + throw ValidationException::withMessages([ + 'error' => 'The user is already suspended', + ]); } $user->suspend(); @@ -242,8 +242,8 @@ class UserController extends Controller $user = User::create([ 'name' => $request->input('name'), 'email' => $request->input('email'), - 'credits' => Settings::getValueByKey('SETTINGS::USER:INITIAL_CREDITS', 150), - 'server_limit' => Settings::getValueByKey('SETTINGS::USER:INITIAL_SERVER_LIMIT', 1), + 'credits' => config('SETTINGS::USER:INITIAL_CREDITS', 150), + 'server_limit' => config('SETTINGS::USER:INITIAL_SERVER_LIMIT', 1), 'password' => Hash::make($request->input('password')), ]); diff --git a/app/Http/Controllers/Auth/SocialiteController.php b/app/Http/Controllers/Auth/SocialiteController.php index 04b6f203..c2418ce8 100644 --- a/app/Http/Controllers/Auth/SocialiteController.php +++ b/app/Http/Controllers/Auth/SocialiteController.php @@ -15,7 +15,7 @@ class SocialiteController extends Controller { public function redirect() { - $scopes = !empty(Settings::getValueByKey("SETTINGS::DISCORD:BOT_TOKEN")) && !empty(Settings::getValueByKey("SETTINGS::DISCORD:GUILD_ID")) ? ['guilds.join'] : []; + $scopes = !empty(config("SETTINGS::DISCORD:BOT_TOKEN")) && !empty(config("SETTINGS::DISCORD:GUILD_ID")) ? ['guilds.join'] : []; return Socialite::driver('discord') ->scopes($scopes) @@ -31,17 +31,17 @@ class SocialiteController extends Controller /** @var User $user */ $user = Auth::user(); $discord = Socialite::driver('discord')->user(); - $botToken = Settings::getValueByKey("SETTINGS::DISCORD:BOT_TOKEN"); - $guildId = Settings::getValueByKey("SETTINGS::DISCORD:GUILD_ID"); - $roleId = Settings::getValueByKey("SETTINGS::DISCORD:ROLE_ID"); + $botToken = config("SETTINGS::DISCORD:BOT_TOKEN"); + $guildId = config("SETTINGS::DISCORD:GUILD_ID"); + $roleId = config("SETTINGS::DISCORD:ROLE_ID"); //save / update discord_users if (is_null($user->discordUser)) { //create discord user in db DiscordUser::create(array_merge($discord->user, ['user_id' => Auth::user()->id])); //update user - Auth::user()->increment('credits', Settings::getValueByKey('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD')); - Auth::user()->increment('server_limit', Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD')); + Auth::user()->increment('credits', config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD')); + Auth::user()->increment('server_limit', config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD')); Auth::user()->update(['discord_verified_at' => now()]); } else { $user->discordUser->update($discord->user); @@ -55,18 +55,22 @@ class SocialiteController extends Controller 'Authorization' => 'Bot ' . $botToken, 'Content-Type' => 'application/json', ] - )->put("https://discord.com/api/guilds/{$guildId}/members/{$discord->id}", - ['access_token' => $discord->token]); + )->put( + "https://discord.com/api/guilds/{$guildId}/members/{$discord->id}", + ['access_token' => $discord->token] + ); //give user a role in the discord server - if (!empty($roleId)){ + if (!empty($roleId)) { $response = Http::withHeaders( [ 'Authorization' => 'Bot ' . $botToken, 'Content-Type' => 'application/json', ] - )->put("https://discord.com/api/guilds/{$guildId}/members/{$discord->id}/roles/{$roleId}", - ['access_token' => $discord->token]); + )->put( + "https://discord.com/api/guilds/{$guildId}/members/{$discord->id}/roles/{$roleId}", + ['access_token' => $discord->token] + ); } } diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php index db692bfb..c3717653 100644 --- a/app/Http/Controllers/StoreController.php +++ b/app/Http/Controllers/StoreController.php @@ -15,17 +15,17 @@ class StoreController extends Controller if ( env('APP_ENV') == 'local' || - Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:SECRET") && Settings::getValueByKey("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID") || - Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:SECRET") && Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET") && Settings::getValueByKey("SETTINGS::PAYMENTS:STRIPE:METHODS") + config("SETTINGS::PAYMENTS:PAYPAL:SECRET") && config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID") || + config("SETTINGS::PAYMENTS:STRIPE:SECRET") && config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET") && config("SETTINGS::PAYMENTS:STRIPE:METHODS") ) $isPaymentSetup = true; //Required Verification for creating an server - if (Settings::getValueByKey('SETTINGS::USER:FORCE_EMAIL_VERIFICATION', false) === 'true' && !Auth::user()->hasVerifiedEmail()) { + if (config('SETTINGS::USER:FORCE_EMAIL_VERIFICATION', false) === 'true' && !Auth::user()->hasVerifiedEmail()) { return redirect()->route('profile.index')->with('error', __("You are required to verify your email address before you can purchase credits.")); } //Required Verification for creating an server - if (Settings::getValueByKey('SETTINGS::USER:FORCE_DISCORD_VERIFICATION', false) === 'true' && !Auth::user()->discordUser) { + if (config('SETTINGS::USER:FORCE_DISCORD_VERIFICATION', false) === 'true' && !Auth::user()->discordUser) { return redirect()->route('profile.index')->with('error', __("You are required to link your discord account before you can purchase Credits")); } diff --git a/app/Listeners/UnsuspendServers.php b/app/Listeners/UnsuspendServers.php index 5d8ce069..7f75364c 100644 --- a/app/Listeners/UnsuspendServers.php +++ b/app/Listeners/UnsuspendServers.php @@ -19,11 +19,11 @@ class UnsuspendServers implements ShouldQueue */ public function handle(UserUpdateCreditsEvent $event) { - if ($event->user->credits > Settings::getValueByKey('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER' , 50)){ - /** @var Server $server */ - foreach ($event->user->servers as $server){ - if ($server->isSuspended()) $server->unSuspend(); - } - } + if ($event->user->credits > config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER', 50)) { + /** @var Server $server */ + foreach ($event->user->servers as $server) { + if ($server->isSuspended()) $server->unSuspend(); + } + } } } diff --git a/app/Listeners/Verified.php b/app/Listeners/Verified.php index 875bd4c0..6620cad3 100644 --- a/app/Listeners/Verified.php +++ b/app/Listeners/Verified.php @@ -24,7 +24,7 @@ class Verified */ public function handle($event) { - $event->user->increment('server_limit' , Settings::getValueByKey('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL')); - $event->user->increment('credits' , Settings::getValueByKey('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL')); + $event->user->increment('server_limit', config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL')); + $event->user->increment('credits', config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL')); } } diff --git a/app/Models/CreditProduct.php b/app/Models/CreditProduct.php index 5fa07b59..52c5873a 100644 --- a/app/Models/CreditProduct.php +++ b/app/Models/CreditProduct.php @@ -46,40 +46,40 @@ class CreditProduct extends Model * * @return float */ - public function formatToCurrency($value,$locale = 'en_US') + public function formatToCurrency($value, $locale = 'en_US') { $formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY); return $formatter->formatCurrency($value, $this->currency_code); } /** - * @description Returns the tax in % taken from the Configuration - * - * @return int - */ + * @description Returns the tax in % taken from the Configuration + * + * @return int + */ public function getTaxPercent() { - $tax = Settings::getValueByKey("SETTINGS::PAYMENTS:SALES_TAX"); + $tax = config("SETTINGS::PAYMENTS:SALES_TAX"); return $tax < 0 ? 0 : $tax; } /** - * @description Returns the tax as Number - * - * @return float - */ + * @description Returns the tax as Number + * + * @return float + */ public function getTaxValue() { - return number_format($this->price*$this->getTaxPercent()/100,2); + return number_format($this->price * $this->getTaxPercent() / 100, 2); } /** - * @description Returns the full price of a Product including tax - * - * @return float - */ + * @description Returns the full price of a Product including tax + * + * @return float + */ public function getTotalPrice() { - return number_format($this->price+$this->getTaxValue(),2); + return number_format($this->price + $this->getTaxValue(), 2); } }