From 7ca842e712817f540e8c95bb1c046d65320b735f Mon Sep 17 00:00:00 2001 From: ok236449 Date: Fri, 6 Jan 2023 00:01:23 +0100 Subject: [PATCH] many many fixes --- app/Classes/Settings/System.php | 1 + .../Controllers/Admin/PaymentController.php | 5 +-- .../Controllers/Admin/ProductController.php | 3 ++ .../Moderation/TicketsController.php | 10 ++++-- app/Http/Controllers/TicketsController.php | 10 ++++++ database/seeders/Seeds/SettingsSeeder.php | 18 ++++++++-- .../views/admin/partners/create.blade.php | 12 +++++-- resources/views/admin/partners/edit.blade.php | 12 +++++-- .../views/admin/payments/index.blade.php | 8 ++--- .../views/admin/products/index.blade.php | 2 ++ .../views/admin/settings/tabs/misc.blade.php | 8 ++--- .../admin/settings/tabs/payment.blade.php | 2 +- .../admin/settings/tabs/system.blade.php | 33 ++++++++++++------- .../information/imprint-content.blade.php | 2 +- .../views/moderator/ticket/index.blade.php | 5 ++- resources/views/profile/index.blade.php | 9 +++-- resources/views/servers/index.blade.php | 26 ++++----------- resources/views/servers/settings.blade.php | 3 +- resources/views/ticket/index.blade.php | 6 ++-- resources/views/ticket/show.blade.php | 11 +++++++ routes/web.php | 1 + 21 files changed, 126 insertions(+), 61 deletions(-) diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index f2759c1f..2aacc5a8 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -72,6 +72,7 @@ public function checkPteroClientkey(){ "SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR" => "server-create-charge-first-hour", "SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME" => "credits-display-name", "SETTINGS::SERVER:ALLOCATION_LIMIT" => "allocation-limit", + "SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER" => "minimum-credits", "SETTINGS::USER:FORCE_DISCORD_VERIFICATION" => "force-discord-verification", "SETTINGS::USER:FORCE_EMAIL_VERIFICATION" => "force-email-verification", "SETTINGS::USER:INITIAL_CREDITS" => "initial-credits", diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 30f03085..7c547aaa 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -673,7 +673,7 @@ class PaymentController extends Controller $query = Payment::with('user'); return datatables($query) - ->editColumn('user', function (Payment $payment) { + ->addColumn('user', function (Payment $payment) { return ($payment->user)?''.$payment->user->name.'':__('Unknown user'); }) @@ -691,7 +691,8 @@ class PaymentController extends Controller }) ->editColumn('created_at', function (Payment $payment) { - return $payment->created_at ? $payment->created_at->diffForHumans() : ''; + return ['display' => $payment->created_at ? $payment->created_at->diffForHumans() : '', + 'raw' => $payment->created_at ? strtotime($payment->created_at) : '']; }) ->addColumn('actions', function (Payment $payment) { return ''; diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index 6b855f9f..99a469ac 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -228,6 +228,9 @@ class ProductController extends Controller '; }) + ->editColumn('minimum_credits', function (Product $product) { + return $product->minimum_credits==-1 ? config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER') : $product->minimum_credits; + }) ->editColumn('created_at', function (Product $product) { return $product->created_at ? $product->created_at->diffForHumans() : ''; }) diff --git a/app/Http/Controllers/Moderation/TicketsController.php b/app/Http/Controllers/Moderation/TicketsController.php index ac08ba08..698a81e4 100644 --- a/app/Http/Controllers/Moderation/TicketsController.php +++ b/app/Http/Controllers/Moderation/TicketsController.php @@ -109,10 +109,14 @@ class TicketsController extends Controller return '' . $tickets->status . ''; }) - ->editColumn('updated_at', function (Ticket $tickets) { - return $tickets->updated_at ? $tickets->updated_at->diffForHumans() : ''; + ->editColumn('priority', function (Ticket $tickets) { + return __($tickets->priority); }) - ->rawColumns(['category', 'title', 'user_id', 'status', 'updated_at', 'actions']) + ->editColumn('updated_at', function (Ticket $tickets) { + return ['display' => $tickets->updated_at ? $tickets->updated_at->diffForHumans() : '', + 'raw' => $tickets->updated_at ? strtotime($tickets->updated_at) : '']; + }) + ->rawColumns(['category', 'title', 'user_id', 'status', 'priority', 'updated_at', 'actions']) ->make(true); } diff --git a/app/Http/Controllers/TicketsController.php b/app/Http/Controllers/TicketsController.php index 8bb21a66..93aaaabc 100644 --- a/app/Http/Controllers/TicketsController.php +++ b/app/Http/Controllers/TicketsController.php @@ -92,6 +92,13 @@ class TicketsController extends Controller Notification::send($admin, new AdminReplyNotification($ticket, $user, $newmessage)); return redirect()->back()->with('success', __('Your comment has been submitted')); } + public function close($ticket_id) + { + $ticket = Ticket::where('user_id', Auth::user()->id)->where("ticket_id", $ticket_id)->firstOrFail(); + $ticket->status = "Closed"; + $ticket->save(); + return redirect()->back()->with('success', __('A ticket has been closed, ID: #') . $ticket->ticket_id); + } public function dataTable() { @@ -122,6 +129,9 @@ class TicketsController extends Controller return '' . $tickets->status . ''; }) + ->editColumn('priority', function (Ticket $tickets) { + return __($tickets->priority); + }) ->editColumn('updated_at', function (Ticket $tickets) { return $tickets->updated_at ? $tickets->updated_at->diffForHumans() : ''; }) diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php index 83f88da4..0ad55960 100644 --- a/database/seeders/Seeds/SettingsSeeder.php +++ b/database/seeders/Seeds/SettingsSeeder.php @@ -118,6 +118,13 @@ class SettingsSeeder extends Seeder 'type' => 'integer', 'description' => 'The maximum amount of allocations to pull per node for automatic deployment, if more allocations are being used than this limit is set to, no new servers can be created!' ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER', + ], [ + 'value' => '0', + 'type' => 'integer', + 'description' => 'The minimum amount of credits user has to have to create a server. Can be overridden by package limits.' + ]); //credits display name Settings::firstOrCreate([ @@ -546,16 +553,23 @@ class SettingsSeeder extends Seeder Settings::firstOrCreate([ 'key' => 'SETTINGS::SYSTEM:SHOW_IMPRINT', ], [ - 'value' => "true", + 'value' => "false", 'type' => 'boolean', 'description' => 'Enable/disable imprint in footer' ]); Settings::firstOrCreate([ 'key' => 'SETTINGS::SYSTEM:SHOW_PRIVACY', ], [ - 'value' => "true", + 'value' => "false", 'type' => 'boolean', 'description' => 'Enable/disable privacy policy in footer' ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:SHOW_TOS', + ], [ + 'value' => 'false', + 'type' => 'boolean', + 'description' => 'Enable/disable Terms of Service in footer', + ]); } } diff --git a/resources/views/admin/partners/create.blade.php b/resources/views/admin/partners/create.blade.php index 8ac26d54..c2a56427 100644 --- a/resources/views/admin/partners/create.blade.php +++ b/resources/views/admin/partners/create.blade.php @@ -56,7 +56,11 @@
- + @@ -69,7 +73,11 @@
- +
- + @@ -71,7 +75,11 @@
- +
{{ __('Tax Value') }} {{ __('Tax Percentage') }} {{ __('Total Price') }} - {{ __('User') }} {{ __('Payment ID') }} {{ __('Payment Method') }} {{ __('Created at') }} @@ -74,20 +73,19 @@ serverSide: true, stateSave: true, ajax: "{{ route('admin.payments.datatable') }}", - order: [[ 9, "desc" ]], + order: [[ 10, "desc" ]], columns: [ {data: 'id',name: 'payments.id'}, {data: 'type'}, - {data: 'user', sortable: false}, + {data: 'user'}, {data: 'amount'}, {data: 'price'}, {data: 'tax_value'}, {data: 'tax_percent'}, {data: 'total_price'}, - {data: 'user'}, {data: 'payment_id'}, {data: 'payment_method'}, - {data: 'created_at'}, + {data: 'created_at', type: 'num', render: {_: 'display', sort: 'raw'}}, {data: 'actions' , sortable : false}, ], fnDrawCallback: function(oSettings) { diff --git a/resources/views/admin/products/index.blade.php b/resources/views/admin/products/index.blade.php index 30d2b712..bc15a70b 100644 --- a/resources/views/admin/products/index.blade.php +++ b/resources/views/admin/products/index.blade.php @@ -52,6 +52,7 @@ {{__('Backups')}} {{__('Nodes')}} {{__('Eggs')}} + {{__('Min Credits')}} {{__('Servers')}} {{__('Created at')}} @@ -99,6 +100,7 @@ {data: "backups"}, {data: "nodes", sortable: false}, {data: "eggs", sortable: false}, + {data: "minimum_credits"}, {data: "servers", sortable: false}, {data: "created_at"}, {data: "actions", sortable: false} diff --git a/resources/views/admin/settings/tabs/misc.blade.php b/resources/views/admin/settings/tabs/misc.blade.php index 01a57b68..4515917e 100644 --- a/resources/views/admin/settings/tabs/misc.blade.php +++ b/resources/views/admin/settings/tabs/misc.blade.php @@ -258,16 +258,16 @@ data-content="{{ __('If a referred user buys credits, the referral-user will get x% of the Credits the referred user bought') }}" class="fas fa-info-circle"> + type="number" min="0" max="99999999" value="{{ config('SETTINGS::REFERRAL:PERCENTAGE') }}" + class="form-control @error('referral_percentage') is-invalid @enderror">
+ type="number" min="0" max="99999999" value="{{ config('SETTINGS::REFERRAL::REWARD') }}" + class="form-control @error('referral_reward') is-invalid @enderror">
diff --git a/resources/views/admin/settings/tabs/payment.blade.php b/resources/views/admin/settings/tabs/payment.blade.php index beaf78bd..f5f0f8cf 100644 --- a/resources/views/admin/settings/tabs/payment.blade.php +++ b/resources/views/admin/settings/tabs/payment.blade.php @@ -130,7 +130,7 @@ data-content="Tax Value that will be added to the total price of the order.

Example: 19 results in (19%)" class="fas fa-info-circle">
-
diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php index 1cf92b8f..4a36e218 100644 --- a/resources/views/admin/settings/tabs/system.blade.php +++ b/resources/views/admin/settings/tabs/system.blade.php @@ -113,7 +113,7 @@
-
@@ -189,20 +189,20 @@
-
-
@@ -210,28 +210,28 @@
@@ -278,15 +278,26 @@
- +
+
+
+ + +
+ +
diff --git a/resources/views/information/imprint-content.blade.php b/resources/views/information/imprint-content.blade.php index cfa2276b..fb101eef 100644 --- a/resources/views/information/imprint-content.blade.php +++ b/resources/views/information/imprint-content.blade.php @@ -8,7 +8,7 @@ City
Country
Phone: +00 000 000 000
- Email: [email protected] + Email: PUT YOUR EMAIL HERE

diff --git a/resources/views/moderator/ticket/index.blade.php b/resources/views/moderator/ticket/index.blade.php index 3ec056a4..fe908a0f 100644 --- a/resources/views/moderator/ticket/index.blade.php +++ b/resources/views/moderator/ticket/index.blade.php @@ -40,6 +40,7 @@ {{__('Category')}} {{__('Title')}} {{__('User')}} + {{__('Priority')}} {{__('Status')}} {{__('Last Updated')}} {{__('Actions')}} @@ -69,12 +70,14 @@ serverSide: true, stateSave: true, ajax: "{{route('moderator.ticket.datatable')}}", + order: [[ 4, "desc" ]], columns: [ {data: 'category'}, {data: 'title'}, {data: 'user_id'}, + {data: 'priority'}, {data: 'status'}, - {data: 'updated_at'}, + {data: 'updated_at', type: 'num', render: {_: 'display', sort: 'raw'}}, {data: 'actions', sortable: false}, ], fnDrawCallback: function( oSettings ) { diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.php index 82723940..41682761 100644 --- a/resources/views/profile/index.blade.php +++ b/resources/views/profile/index.blade.php @@ -312,15 +312,14 @@