From 826be5ce5b2c43e34b93a9f642d8687aeebb1c4a Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 31 Jan 2023 10:16:45 +0100 Subject: [PATCH 1/6] increase ticket ID lenght --- app/Http/Controllers/TicketsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/TicketsController.php b/app/Http/Controllers/TicketsController.php index e025f94d..cf86ea43 100644 --- a/app/Http/Controllers/TicketsController.php +++ b/app/Http/Controllers/TicketsController.php @@ -50,7 +50,7 @@ class TicketsController extends Controller $ticket = new Ticket([ 'title' => $request->input('title'), 'user_id' => Auth::user()->id, - 'ticket_id' => strtoupper(Str::random(5)), + 'ticket_id' => strtoupper(Str::random(8)), 'ticketcategory_id' => $request->input('ticketcategory'), 'priority' => $request->input('priority'), 'message' => $request->input('message'), From e90479e452db52a82864964aa0d9b55eae21165a Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 31 Jan 2023 10:23:18 +0100 Subject: [PATCH 2/6] ,show priority on ticket --- .../views/moderator/ticket/show.blade.php | 38 +++++++++++---- themes/default/views/ticket/show.blade.php | 48 +++++++++++++------ 2 files changed, 61 insertions(+), 25 deletions(-) diff --git a/themes/default/views/moderator/ticket/show.blade.php b/themes/default/views/moderator/ticket/show.blade.php index f6a309f2..8e56c780 100644 --- a/themes/default/views/moderator/ticket/show.blade.php +++ b/themes/default/views/moderator/ticket/show.blade.php @@ -39,17 +39,35 @@ @endif

Title: {{ $ticket->title }}

Category: {{ $ticketcategory->name }}

-

- @if ($ticket->status === 'Open') - Status: Open - @elseif ($ticket->status === 'Closed') - Status: Closed - @elseif ($ticket->status === 'Answered') - Status: Answered - @elseif ($ticket->status === 'Client Reply') - Status: Client Reply - @endif +

Status: + @switch($ticket->status) + @case("Open") + Open + @break + @case("Closed") + Closed + @break + @case("Answered") + Answered + @break + @case("Client Reply") + Client Reply + @break + @endswitch

+

Priority: + @switch($ticket->priority) + @case("Low") + Low + @break + @case("Medium") + Closed + @break + @case("High") + Answered + @break + @endswitch +

Created on: {{ $ticket->created_at->diffForHumans() }}

@if($ticket->status!='Closed')
diff --git a/themes/default/views/ticket/show.blade.php b/themes/default/views/ticket/show.blade.php index 2da1ccc4..a2be2686 100644 --- a/themes/default/views/ticket/show.blade.php +++ b/themes/default/views/ticket/show.blade.php @@ -39,17 +39,35 @@ @endif

Title: {{ $ticket->title }}

Category: {{ $ticketcategory->name }}

-

- @if ($ticket->status === 'Open') - Status: Open - @elseif ($ticket->status === 'Closed') - Status: Closed - @elseif ($ticket->status === 'Answered') - Status: Answered - @elseif ($ticket->status === 'Client Reply') - Status: Client Reply - @endif -

+

Status: + @switch($ticket->status) + @case("Open") + Open + @break + @case("Closed") + Closed + @break + @case("Answered") + Answered + @break + @case("Client Reply") + Client Reply + @break + @endswitch +

+

Priority: + @switch($ticket->priority) + @case("Low") + Low + @break + @case("Medium") + Closed + @break + @case("High") + Answered + @break + @endswitch +

Created on: {{ $ticket->created_at->diffForHumans() }}

@if($ticket->status!='Closed') @endsection From eeed88aba8bd61f30264c8433039b565e4e9ac43 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 31 Jan 2023 10:38:43 +0100 Subject: [PATCH 3/6] Refactor whole PartnerController --- .../{ => Admin}/PartnerController.php | 91 +++--------------- routes/web.php | 2 +- .../views/admin/partners/create.blade.php | 95 ++++++++++++++++--- 3 files changed, 92 insertions(+), 96 deletions(-) rename app/Http/Controllers/{ => Admin}/PartnerController.php (63%) diff --git a/app/Http/Controllers/PartnerController.php b/app/Http/Controllers/Admin/PartnerController.php similarity index 63% rename from app/Http/Controllers/PartnerController.php rename to app/Http/Controllers/Admin/PartnerController.php index 887e56d3..08dfa952 100644 --- a/app/Http/Controllers/PartnerController.php +++ b/app/Http/Controllers/Admin/PartnerController.php @@ -1,7 +1,8 @@ 'required|integer|max:100|min:0', ]); + if(PartnerDiscount::where("user_id",$request->user_id)->exists()){ + return redirect()->route('admin.partners.index')->with('error', __('Partner already exists')); + } + PartnerDiscount::create($request->all()); return redirect()->route('admin.partners.index')->with('success', __('partner has been created!')); @@ -48,10 +53,10 @@ class PartnerController extends Controller /** * Display the specified resource. * - * @param Voucher $voucher + * @param Partner $voucher * @return Response */ - public function show(Voucher $voucher) + public function show(Partner $voucher) { // } @@ -59,7 +64,7 @@ class PartnerController extends Controller /** * Show the form for editing the specified resource. * - * @param Voucher $voucher + * @param Partner $voucher * @return Application|Factory|View */ public function edit(PartnerDiscount $partner) @@ -75,7 +80,7 @@ class PartnerController extends Controller * Update the specified resource in storage. * * @param Request $request - * @param Voucher $voucher + * @param Partner $voucher * @return RedirectResponse */ public function update(Request $request, PartnerDiscount $partner) @@ -95,7 +100,7 @@ class PartnerController extends Controller /** * Remove the specified resource from storage. * - * @param Voucher $voucher + * @param Partner $partner * @return RedirectResponse */ public function destroy(PartnerDiscount $partner) @@ -105,81 +110,7 @@ class PartnerController extends Controller return redirect()->back()->with('success', __('partner has been removed!')); } - public function users(Voucher $voucher) - { - return view('admin.vouchers.users', [ - 'voucher' => $voucher, - ]); - } - /** - * @param Request $request - * @return JsonResponse - * - * @throws ValidationException - */ - public function redeem(Request $request) - { - //general validations - $request->validate([ - 'code' => 'required|exists:vouchers,code', - ]); - - //get voucher by code - $voucher = Voucher::where('code', '=', $request->input('code'))->firstOrFail(); - - //extra validations - if ($voucher->getStatus() == 'USES_LIMIT_REACHED') { - throw ValidationException::withMessages([ - 'code' => __('This voucher has reached the maximum amount of uses'), - ]); - } - - if ($voucher->getStatus() == 'EXPIRED') { - throw ValidationException::withMessages([ - 'code' => __('This voucher has expired'), - ]); - } - - if (! $request->user()->vouchers()->where('id', '=', $voucher->id)->get()->isEmpty()) { - throw ValidationException::withMessages([ - 'code' => __('You already redeemed this voucher code'), - ]); - } - - 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, - ]); - } - - //redeem voucher - $voucher->redeem($request->user()); - - event(new UserUpdateCreditsEvent($request->user())); - - return response()->json([ - 'success' => "{$voucher->credits} ".CREDITS_DISPLAY_NAME.' '.__('have been added to your balance!'), - ]); - } - - public function usersDataTable(Voucher $voucher) - { - $users = $voucher->users(); - - return datatables($users) - ->editColumn('name', function (User $user) { - return ''.$user->name.''; - }) - ->addColumn('credits', function (User $user) { - return ' '.$user->credits(); - }) - ->addColumn('last_seen', function (User $user) { - return $user->last_seen ? $user->last_seen->diffForHumans() : ''; - }) - ->rawColumns(['name', 'credits', 'last_seen']) - ->make(); - } public function dataTable() { diff --git a/routes/web.php b/routes/web.php index e4a5d910..8f0cf0e4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -10,6 +10,7 @@ use App\Http\Controllers\Admin\ApplicationApiController; use App\Http\Controllers\Admin\InvoiceController; use App\Http\Controllers\Admin\LegalController; use App\Http\Controllers\Admin\OverViewController; +use App\Http\Controllers\Admin\PartnerController; use App\Http\Controllers\Admin\PaymentController; use App\Http\Controllers\Admin\ProductController; use App\Http\Controllers\Admin\ServerController as AdminServerController; @@ -22,7 +23,6 @@ use App\Http\Controllers\Auth\SocialiteController; use App\Http\Controllers\HomeController; use App\Http\Controllers\Moderation\TicketsController as ModTicketsController; use App\Http\Controllers\NotificationController; -use App\Http\Controllers\PartnerController; use App\Http\Controllers\ProductController as FrontProductController; use App\Http\Controllers\ProfileController; use App\Http\Controllers\ServerController; diff --git a/themes/default/views/admin/partners/create.blade.php b/themes/default/views/admin/partners/create.blade.php index f635e51b..03f8cab3 100644 --- a/themes/default/views/admin/partners/create.blade.php +++ b/themes/default/views/admin/partners/create.blade.php @@ -6,12 +6,12 @@
-

{{__('Vouchers')}}

+

{{__('Partner')}}

  1. {{__('Dashboard')}}
    2. -
  2. {{__('Vouchers')}} +
  3. {{__('Partner')}}
  4. {{__('Create')}} @@ -40,19 +40,14 @@ @csrf
    - - - @error('user') -
    - {{$message}} + +
    + +
    - @enderror
    @@ -143,5 +138,75 @@ }) + + + +@endsection From a7ef7eb17daca24e4e6f464551e4b4e9a65e49c7 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 31 Jan 2023 10:39:06 +0100 Subject: [PATCH 4/6] Refactor Partnercontroller --- app/Http/Controllers/Admin/PartnerController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/PartnerController.php b/app/Http/Controllers/Admin/PartnerController.php index 08dfa952..fa40fd6c 100644 --- a/app/Http/Controllers/Admin/PartnerController.php +++ b/app/Http/Controllers/Admin/PartnerController.php @@ -53,10 +53,10 @@ class PartnerController extends Controller /** * Display the specified resource. * - * @param Partner $voucher + * @param Partner $partner * @return Response */ - public function show(Partner $voucher) + public function show(Partner $partner) { // } @@ -64,7 +64,7 @@ class PartnerController extends Controller /** * Show the form for editing the specified resource. * - * @param Partner $voucher + * @param Partner $partner * @return Application|Factory|View */ public function edit(PartnerDiscount $partner) @@ -80,7 +80,7 @@ class PartnerController extends Controller * Update the specified resource in storage. * * @param Request $request - * @param Partner $voucher + * @param Partner $partner * @return RedirectResponse */ public function update(Request $request, PartnerDiscount $partner) From c8c3bff636bec113849b97e7dcab6f91f47305a8 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 31 Jan 2023 12:37:27 +0100 Subject: [PATCH 5/6] Update Blue-ish Theme --- public/themes/blue/app.css | 117 ++++++++----------------------------- 1 file changed, 24 insertions(+), 93 deletions(-) diff --git a/public/themes/blue/app.css b/public/themes/blue/app.css index cdd91be4..10839a8e 100644 --- a/public/themes/blue/app.css +++ b/public/themes/blue/app.css @@ -1,93 +1,24 @@ -@import "default.css"; - -/******************* CUSTOM CSS ********************/ - -.layout-fixed .wrapper .sidebar { - height: calc(100vh - 3.5rem - 1px); - background: radial-gradient(#061b29, black); -} - -body:not(.sidebar-mini-md) .content-wrapper, body:not(.sidebar-mini-md) .main-footer, body:not(.sidebar-mini-md) .main-header { - transition: margin-left .3s ease-in-out; - margin-left: 250px; - background: radial-gradient(#061b29, black); -} - -[class*=sidebar-dark] .brand-link, [class*=sidebar-dark] .brand-link .pushmenu { - color: hsla(0,0%,100%,.8); - background: radial-gradient(#061b29, black); -} - -.main-sidebar .brand-text, .main-sidebar .logo-xl, .main-sidebar .logo-xs, .sidebar .nav-link p, .sidebar .user-panel .info { - transition: margin-left .3s linear,opacity .3s ease,visibility .3s ease; - color: #d3d3d3; -} - -.sidebar-dark-primary .nav-sidebar>.nav-item>.nav-link.active, .sidebar-light-primary .nav-sidebar>.nav-item>.nav-link.active { - color: #fff; - background: radial-gradient(#1b4b61, #fd030300); - border-radius: 50px; -} - - -.dark-mode .card { - background-color: #00000000; - color: #ffffff99; - border-width: 3px; - border-color: #f7f7f7; - border-style: double; - border-radius: 15px; -} - -.btn-info { - color: #ffffff; - background-color: #b8171700; - border-color: #ffffff; - box-shadow: none; -} - - -.btn-warning { - color: #ffffff; - background-color: #ffc10700; - border-color: #ffffff; - box-shadow: none; -} - - -.card-title { - float: left; - font-size: 1.1rem; - font-weight: 400; - margin: 0; - color: white; -} - -.dark-mode .text-muted { - color: #ffffff99!important; -} - -.dark-mode .list-group-item { - background-color: #343a4000; - border-color: #ffffff99; -} - -.dark-mode .info-box { - background-color: #343a4000; - color: #fff; - border: 3px; - border-style: double; - border-radius: 15px; - border-color: white; -} - -label:not(.form-check-label):not(.custom-file-label) { - font-weight: 700; - color: #ffffffc2; -} - -.dark-mode .custom-control-label:before, .dark-mode .custom-file-label, .dark-mode .custom-file-label:after, .dark-mode .custom-select, .dark-mode .form-control, .dark-mode .input-group-text { - background-color: #007af400; - color: #828282; -} - +@import "default.css";.layout-fixed .wrapper .sidebar{ height:calc(100vh - 3.5rem - 1px);background:radial-gradient(#061b29,black);} +body:not(.sidebar-mini-md) .content-wrapper,body:not(.sidebar-mini-md) .main-footer,body:not(.sidebar-mini-md) .main-header{ transition:margin-left .3s ease-in-out;margin-left:250px;background:radial-gradient(#061b29,black);} +[class*=sidebar-dark] .brand-link,[class*=sidebar-dark] .brand-link .pushmenu{ color:hsla(0,0%,100%,.8);background:radial-gradient(#061b29,black);} +.main-sidebar .brand-text,.main-sidebar .logo-xl,.main-sidebar .logo-xs,.sidebar .nav-link p,.sidebar .user-panel .info{ transition:margin-left .3s linear,opacity .3s ease,visibility .3s ease;color:#d3d3d3;} +.sidebar-dark-primary .nav-sidebar>.nav-item>.nav-link.active,.sidebar-light-primary .nav-sidebar>.nav-item>.nav-link.active{ color:#fff;background:radial-gradient(#1b4b61,#fd030300);border-radius:50px;} +.dark-mode .card{ background-color:#00000000;color:#ffffff99;border-width:3px;border-color:#f7f7f7;border-style:double;border-radius:15px;} +.btn-info{ color:#ffffff;background-color:#b8171700;border-color:#ffffff;box-shadow:none;} +.btn-warning{ color:#ffffff;background-color:#ffc10700;border-color:#ffffff;box-shadow:none;} +.card-title{ float:left;font-size:1.1rem;font-weight:400;margin:0;color:white;} +.dark-mode .text-muted{ color:#ffffff99!important;} +.dark-mode .list-group-item{ background-color:#343a4000;border-color:#ffffff99;} +.dark-mode .info-box{ background-color:#343a4000;color:#fff;border:3px;border-style:double;border-radius:15px;border-color:white;} +label:not(.form-check-label):not(.custom-file-label){ font-weight:700;color:#ffffffc2;} +.dark-mode .custom-control-label:before,.dark-mode .custom-file-label,.dark-mode .custom-file-label:after,.dark-mode .custom-select,.dark-mode .form-control,.dark-mode .input-group-text{ background-color:#007af400;color:#828282;} +.alert-success{ color:#fff;background-color:#28a745;border-color:#ffffff;border-radius:15px;border-style:double;} +.dark-mode{ color:#fff;background:radial-gradient(#061b29,black);} +.dark-mode .invoice{ background-color:#343a4000;border:3px;border-radius:15px;border-color:white;border:double;} +.dark-mode .nav-tabs .nav-item.show .nav-link,.dark-mode .nav-tabs .nav-link.active{ background-color:#ffffff1c;color:#fff;} +.slim-crop-area img,.slim-image-editor img,.slim-popover img,.slim img{ background:black;} +.dark-mode .callout{ background-color:#00ff0333;} +.callout.callout-info{ border-left-color:#00e11d;} +.p-3{ padding:1rem!important;background:#04141e;} +.small-box>.small-box-footer{ color:hsla(0,0%,100%,.8);display:block;padding:3px 0;position:relative;text-align:center;text-decoration:none;z-index:10;background:#061b29;} +.dark-mode .dropdown-menu{ background-color:#061b29;border-color:white;} \ No newline at end of file From 4b3ee928ff9b8148b069deca00aae89fb20f4eee Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 31 Jan 2023 14:21:36 +0100 Subject: [PATCH 6/6] localization --- .../Controllers/Admin/PartnerController.php | 11 --------- .../views/moderator/ticket/show.blade.php | 24 +++++++++---------- themes/default/views/ticket/show.blade.php | 24 +++++++++---------- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/app/Http/Controllers/Admin/PartnerController.php b/app/Http/Controllers/Admin/PartnerController.php index fa40fd6c..c91f592d 100644 --- a/app/Http/Controllers/Admin/PartnerController.php +++ b/app/Http/Controllers/Admin/PartnerController.php @@ -50,17 +50,6 @@ class PartnerController extends Controller return redirect()->route('admin.partners.index')->with('success', __('partner has been created!')); } - /** - * Display the specified resource. - * - * @param Partner $partner - * @return Response - */ - public function show(Partner $partner) - { - // - } - /** * Show the form for editing the specified resource. * diff --git a/themes/default/views/moderator/ticket/show.blade.php b/themes/default/views/moderator/ticket/show.blade.php index 8e56c780..13711dd0 100644 --- a/themes/default/views/moderator/ticket/show.blade.php +++ b/themes/default/views/moderator/ticket/show.blade.php @@ -35,40 +35,40 @@
    @if(!empty($server)) -

    Server: pterodactyl_id }}" target="__blank">{{ $server->name }}

    +

    {{__("Server")}}: pterodactyl_id }}" target="__blank">{{ $server->name }}

    @endif -

    Title: {{ $ticket->title }}

    -

    Category: {{ $ticketcategory->name }}

    -

    Status: +

    {{__("Title")}}: {{ $ticket->title }}

    +

    {{__("Category")}}: {{ $ticketcategory->name }}

    +

    {{__("Status")}}: @switch($ticket->status) @case("Open") - Open + {{__("Open")}} @break @case("Closed") - Closed + {{__("Closed")}} @break @case("Answered") - Answered + {{__("Answered")}} @break @case("Client Reply") - Client Reply + {{__("Client Reply")}} @break @endswitch

    Priority: @switch($ticket->priority) @case("Low") - Low + {{__("Low")}} @break @case("Medium") - Closed + {{__("Closed")}} @break @case("High") - Answered + {{__("Answered")}} @break @endswitch

    -

    Created on: {{ $ticket->created_at->diffForHumans() }}

    +

    {{__("Created on")}}: {{ $ticket->created_at->diffForHumans() }}

    @if($ticket->status!='Closed') {{csrf_field()}} diff --git a/themes/default/views/ticket/show.blade.php b/themes/default/views/ticket/show.blade.php index a2be2686..96a3b46b 100644 --- a/themes/default/views/ticket/show.blade.php +++ b/themes/default/views/ticket/show.blade.php @@ -35,40 +35,40 @@
    @if(!empty($server)) -

    Server: {{ $server->name }}

    +

    {{__("Server")}}: {{ $server->name }}

    @endif -

    Title: {{ $ticket->title }}

    -

    Category: {{ $ticketcategory->name }}

    -

    Status: +

    {{__("Title")}}: {{ $ticket->title }}

    +

    {{__("Category")}}: {{ $ticketcategory->name }}

    +

    {{__("Status")}}: @switch($ticket->status) @case("Open") - Open + {{__("Open")}} @break @case("Closed") - Closed + {{__("Closed")}} @break @case("Answered") - Answered + {{__("Answered")}} @break @case("Client Reply") - Client Reply + {{__("Client Reply")}} @break @endswitch

    Priority: @switch($ticket->priority) @case("Low") - Low + {{__("Low")}} @break @case("Medium") - Closed + {{__("Closed")}} @break @case("High") - Answered + {{__("Answered")}} @break @endswitch

    -

    Created on: {{ $ticket->created_at->diffForHumans() }}

    +

    {{__("Created on")}}: {{ $ticket->created_at->diffForHumans() }}

    @if($ticket->status!='Closed')