From f00f5addfe372ef23a377dc56731a9350fd2add8 Mon Sep 17 00:00:00 2001 From: Ferks-FK Date: Mon, 6 Feb 2023 20:34:58 +0000 Subject: [PATCH] Change missing variables --- .../Controllers/Admin/OverViewController.php | 4 ++- .../Admin/ShopProductController.php | 4 ++- app/Http/Controllers/Admin/UserController.php | 14 +++++---- .../Controllers/Admin/VoucherController.php | 21 ++++++++----- .../views/admin/overview/index.blade.php | 4 +-- .../views/admin/products/create.blade.php | 2 +- .../views/admin/store/create.blade.php | 2 +- .../default/views/admin/users/edit.blade.php | 2 +- .../default/views/admin/users/index.blade.php | 30 +++++++++---------- .../default/views/admin/users/show.blade.php | 2 +- .../views/admin/vouchers/create.blade.php | 2 +- .../views/admin/vouchers/edit.blade.php | 2 +- .../views/admin/vouchers/index.blade.php | 2 +- 13 files changed, 52 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index f5f67c99..eac33d02 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Classes\PterodactylClient; use App\Settings\PterodactylSettings; +use App\Settings\GeneralSettings; use App\Http\Controllers\Controller; use App\Models\Pterodactyl\Egg; use App\Models\Pterodactyl\Location; @@ -27,7 +28,7 @@ class OverViewController extends Controller $this->pterodactyl = new PterodactylClient($ptero_settings); } - public function index() + public function index(GeneralSettings $general_settings) { //Get counters $counters = collect(); @@ -215,6 +216,7 @@ class OverViewController extends Controller 'deletedNodesPresent' => ($DBnodes->count() != count($pteroNodeIds)) ? true : false, 'perPageLimit' => ($counters['servers']->total != Server::query()->count()) ? true : false, 'tickets' => $tickets, + 'credits_display_name' => $general_settings->credits_display_name ]); } diff --git a/app/Http/Controllers/Admin/ShopProductController.php b/app/Http/Controllers/Admin/ShopProductController.php index c8144b45..8c6f671b 100644 --- a/app/Http/Controllers/Admin/ShopProductController.php +++ b/app/Http/Controllers/Admin/ShopProductController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Models\ShopProduct; +use App\Settings\GeneralSettings; use App\Settings\LocaleSettings; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -44,10 +45,11 @@ class ShopProductController extends Controller * * @return Application|Factory|View|Response */ - public function create() + public function create(GeneralSettings $general_settings) { return view('admin.store.create', [ 'currencyCodes' => config('currency_codes'), + 'credits_display_name' => $general_settings->credits_display_name ]); } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index b99ec841..1366bcd5 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -9,6 +9,7 @@ use App\Notifications\DynamicNotification; use App\Settings\LocaleSettings; use App\Settings\PterodactylSettings; use App\Classes\PterodactylClient; +use App\Settings\GeneralSettings; use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -41,10 +42,11 @@ class UserController extends Controller * @param Request $request * @return Application|Factory|View|Response */ - public function index(LocaleSettings $locale_settings) + public function index(LocaleSettings $locale_settings, GeneralSettings $general_settings) { return view('admin.users.index', [ - 'locale_datatables' => $locale_settings->datatables + 'locale_datatables' => $locale_settings->datatables, + 'credits_display_name' => $general_settings->credits_display_name ]); } @@ -54,7 +56,7 @@ class UserController extends Controller * @param User $user * @return Application|Factory|View|Response */ - public function show(User $user, LocaleSettings $locale_settings) + public function show(User $user, LocaleSettings $locale_settings, GeneralSettings $general_settings) { //QUERY ALL REFERRALS A USER HAS //i am not proud of this at all. @@ -68,7 +70,8 @@ class UserController extends Controller return view('admin.users.show')->with([ 'user' => $user, 'referrals' => $allReferals, - 'locale_datatables' => $locale_settings->datatables + 'locale_datatables' => $locale_settings->datatables, + 'credits_display_name' => $general_settings->credits_display_name ]); } @@ -103,10 +106,11 @@ class UserController extends Controller * @param User $user * @return Application|Factory|View|Response */ - public function edit(User $user) + public function edit(User $user, GeneralSettings $general_settings) { return view('admin.users.edit')->with([ 'user' => $user, + 'credits_display_name' => $general_settings->credits_display_name ]); } diff --git a/app/Http/Controllers/Admin/VoucherController.php b/app/Http/Controllers/Admin/VoucherController.php index e46597cb..e8f747d5 100644 --- a/app/Http/Controllers/Admin/VoucherController.php +++ b/app/Http/Controllers/Admin/VoucherController.php @@ -6,6 +6,7 @@ use App\Events\UserUpdateCreditsEvent; use App\Http\Controllers\Controller; use App\Models\User; use App\Models\Voucher; +use App\Settings\GeneralSettings; use App\Settings\LocaleSettings; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -23,10 +24,11 @@ class VoucherController extends Controller * * @return Application|Factory|View */ - public function index(LocaleSettings $locale_settings) + public function index(LocaleSettings $locale_settings, GeneralSettings $general_settings) { return view('admin.vouchers.index', [ - 'locale_datatables' => $locale_settings->datatables + 'locale_datatables' => $locale_settings->datatables, + 'credits_display_name' => $general_settings->credits_display_name ]); } @@ -35,9 +37,11 @@ class VoucherController extends Controller * * @return Application|Factory|View */ - public function create() + public function create(GeneralSettings $general_settings) { - return view('admin.vouchers.create'); + return view('admin.vouchers.create', [ + 'credits_display_name' => $general_settings->credits_display_name + ]); } /** @@ -78,10 +82,11 @@ class VoucherController extends Controller * @param Voucher $voucher * @return Application|Factory|View */ - public function edit(Voucher $voucher) + public function edit(Voucher $voucher, GeneralSettings $general_settings) { return view('admin.vouchers.edit', [ 'voucher' => $voucher, + 'credits_display_name' => $general_settings->credits_display_name ]); } @@ -134,7 +139,7 @@ class VoucherController extends Controller * * @throws ValidationException */ - public function redeem(Request $request) + public function redeem(Request $request, GeneralSettings $general_settings) { //general validations $request->validate([ @@ -165,7 +170,7 @@ class VoucherController extends Controller if ($request->user()->credits + $voucher->credits >= 99999999) { throw ValidationException::withMessages([ - 'code' => "You can't redeem this voucher because you would exceed the limit of ".CREDITS_DISPLAY_NAME, + 'code' => "You can't redeem this voucher because you would exceed the limit of " . $general_settings->credits_display_name, ]); } @@ -175,7 +180,7 @@ class VoucherController extends Controller event(new UserUpdateCreditsEvent($request->user())); return response()->json([ - 'success' => "{$voucher->credits} ".CREDITS_DISPLAY_NAME.' '.__('have been added to your balance!'), + 'success' => "{$voucher->credits} ". $general_settings->credits_display_name .' '.__('have been added to your balance!'), ]); } diff --git a/themes/default/views/admin/overview/index.blade.php b/themes/default/views/admin/overview/index.blade.php index 062b50c6..d801656e 100644 --- a/themes/default/views/admin/overview/index.blade.php +++ b/themes/default/views/admin/overview/index.blade.php @@ -85,7 +85,7 @@ class="fas fa-coins text-white">
- {{__('Total')}} {{CREDITS_DISPLAY_NAME}} + {{__('Total')}} {{ $credits_display_name }} {{$counters['credits']}}
@@ -240,7 +240,7 @@ {{__('Node')}} {{__('Server count')}} {{__('Resource usage')}} - {{CREDITS_DISPLAY_NAME . ' ' . __('Usage')}} + {{ $credits_display_name . ' ' . __('Usage')}} diff --git a/themes/default/views/admin/products/create.blade.php b/themes/default/views/admin/products/create.blade.php index ab538d60..0922fc4b 100644 --- a/themes/default/views/admin/products/create.blade.php +++ b/themes/default/views/admin/products/create.blade.php @@ -63,7 +63,7 @@
- + {{__('Type')}} @error('name') diff --git a/themes/default/views/admin/users/edit.blade.php b/themes/default/views/admin/users/edit.blade.php index ad938f67..94c15785 100644 --- a/themes/default/views/admin/users/edit.blade.php +++ b/themes/default/views/admin/users/edit.blade.php @@ -70,7 +70,7 @@
- + - - discordId - ip - pterodactyl_id - {{ __('Avatar') }} - {{ __('Name') }} - {{ __('Role') }} - {{ __('Email') }} - {{ CREDITS_DISPLAY_NAME }} - {{ __('Servers') }} - {{ __('Referrals') }} - {{ __('Verified') }} - {{ __('Last seen') }} - - + + discordId + ip + pterodactyl_id + {{__('Avatar')}} + {{__('Name')}} + {{__('Role')}} + {{__('Email')}} + {{ $credits_display_name }} + {{__('Servers')}} + {{__('Referrals')}} + {{__('Verified')}} + {{__('Last seen')}} + + diff --git a/themes/default/views/admin/users/show.blade.php b/themes/default/views/admin/users/show.blade.php index 3c6bf8f3..79cc8541 100644 --- a/themes/default/views/admin/users/show.blade.php +++ b/themes/default/views/admin/users/show.blade.php @@ -151,7 +151,7 @@
- +
diff --git a/themes/default/views/admin/vouchers/create.blade.php b/themes/default/views/admin/vouchers/create.blade.php index 4f28e191..f5ba3591 100644 --- a/themes/default/views/admin/vouchers/create.blade.php +++ b/themes/default/views/admin/vouchers/create.blade.php @@ -54,7 +54,7 @@
- + diff --git a/themes/default/views/admin/vouchers/edit.blade.php b/themes/default/views/admin/vouchers/edit.blade.php index 11c7c5e3..92cfd036 100644 --- a/themes/default/views/admin/vouchers/edit.blade.php +++ b/themes/default/views/admin/vouchers/edit.blade.php @@ -55,7 +55,7 @@
- + diff --git a/themes/default/views/admin/vouchers/index.blade.php b/themes/default/views/admin/vouchers/index.blade.php index 2dd37dff..aa8e679e 100644 --- a/themes/default/views/admin/vouchers/index.blade.php +++ b/themes/default/views/admin/vouchers/index.blade.php @@ -42,7 +42,7 @@ {{__('Status')}} {{__('Code')}} {{__('Memo')}} - {{CREDITS_DISPLAY_NAME}} + {{ $credits_display_name }} {{__('Used / Uses')}} {{__('Expires')}}