From 04a4f2ab96b310cae7be61da0538b3aa1ff410f3 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 3 May 2023 15:44:22 +0200 Subject: [PATCH 1/3] disable invoices by default --- app/Helpers/ExtensionHelper.php | 4 ++-- .../settings/2023_02_01_182021_create_invoice_settings.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Helpers/ExtensionHelper.php b/app/Helpers/ExtensionHelper.php index 117e54e3..f465078b 100644 --- a/app/Helpers/ExtensionHelper.php +++ b/app/Helpers/ExtensionHelper.php @@ -64,7 +64,7 @@ class ExtensionHelper // replace all slashes with backslashes $extensions = array_map(fn ($item) => str_replace('/', '\\', $item), $extensions); - // add the ExtensionClass to the end of the namespace + // add the ExtensionClass to the end of the namespace $extensions = array_map(fn ($item) => $item . '\\' . basename($item) . 'Extension', $extensions); // filter out non existing extension classes $extensions = array_filter($extensions, fn ($item) => class_exists($item)); @@ -104,7 +104,7 @@ class ExtensionHelper if (!(basename($extension) == $extensionName)) { continue; } - + $extension = str_replace('/', '\\', $extension); $extensionClass = $extension . '\\' . $extensionName . 'Extension'; return $extensionClass; } diff --git a/database/settings/2023_02_01_182021_create_invoice_settings.php b/database/settings/2023_02_01_182021_create_invoice_settings.php index 3fb83537..8569c3ff 100644 --- a/database/settings/2023_02_01_182021_create_invoice_settings.php +++ b/database/settings/2023_02_01_182021_create_invoice_settings.php @@ -16,7 +16,7 @@ class CreateInvoiceSettings extends SettingsMigration $this->migrator->add('invoice.company_phone', $table_exists ? $this->getOldValue('SETTINGS::INVOICE:COMPANY_PHONE') : ''); $this->migrator->add('invoice.company_vat', $table_exists ? $this->getOldValue('SETTINGS::INVOICE:COMPANY_VAT') : ''); $this->migrator->add('invoice.company_website', $table_exists ? $this->getOldValue('SETTINGS::INVOICE:COMPANY_WEBSITE') : ''); - $this->migrator->add('invoice.enabled', $table_exists ? $this->getOldValue('SETTINGS::INVOICE:ENABLED') : true); + $this->migrator->add('invoice.enabled', $table_exists ? $this->getOldValue('SETTINGS::INVOICE:ENABLED') : false); $this->migrator->add('invoice.prefix', $table_exists ? $this->getOldValue('SETTINGS::INVOICE:PREFIX') : 'INV'); } From 5d288cd07078f9fbfc873f22af47e146b1601775 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 3 May 2023 16:05:55 +0200 Subject: [PATCH 2/3] Update UserPayment.php --- app/Listeners/UserPayment.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Listeners/UserPayment.php b/app/Listeners/UserPayment.php index 4fbe9ba8..3417a7ce 100644 --- a/app/Listeners/UserPayment.php +++ b/app/Listeners/UserPayment.php @@ -35,7 +35,7 @@ class UserPayment $this->referral_always_give_commission = $referral_settings->always_give_commission; $this->credits_display_name = $general_settings->credits_display_name; } - + /** * Handle the event. * @@ -79,8 +79,8 @@ class UserPayment } } //update role give Referral-reward - if ($user->role == 'member') { - $user->update(['role' => 'client']); + if ($user->hasRole(4)) { + $user->syncRoles(3); //give referral commission only on first purchase if (($this->referral_mode === "commission" || $this->referral_mode === "both") && $shopProduct->type == "Credits" && !$this->referral_always_give_commission) { From 804a800d4f49f0f833bbaaef6d1add568f2a85bc Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 3 May 2023 16:16:50 +0200 Subject: [PATCH 3/3] full frontend perms showing roles --- app/Console/Commands/MakeUserCommand.php | 2 ++ app/Http/Middleware/isMod.php | 2 +- routes/web.php | 2 +- .../default/views/admin/users/show.blade.php | 15 +++--------- .../views/moderator/ticket/show.blade.php | 24 +++++-------------- themes/default/views/ticket/show.blade.php | 24 +++++-------------- 6 files changed, 19 insertions(+), 50 deletions(-) diff --git a/app/Console/Commands/MakeUserCommand.php b/app/Console/Commands/MakeUserCommand.php index 0932f9f2..fb1366fe 100644 --- a/app/Console/Commands/MakeUserCommand.php +++ b/app/Console/Commands/MakeUserCommand.php @@ -101,6 +101,8 @@ class MakeUserCommand extends Command ['Referral code', $user->referral_code], ]); + $user->syncRoles(1); + return 1; } } diff --git a/app/Http/Middleware/isMod.php b/app/Http/Middleware/isMod.php index 8c5453a2..51d6db85 100644 --- a/app/Http/Middleware/isMod.php +++ b/app/Http/Middleware/isMod.php @@ -18,7 +18,7 @@ class isMod */ public function handle(Request $request, Closure $next) { - if (Auth::user() && Auth::user()->role == 'moderator' || Auth::user() && Auth::user()->hasRole("Admin")) { + if (Auth::user() && Auth::user()->role == 'moderator' || Auth::user() && Auth::user()->hasRole(1)) { return $next($request); } diff --git a/routes/web.php b/routes/web.php index f13a33a9..c7c6a9de 100644 --- a/routes/web.php +++ b/routes/web.php @@ -113,7 +113,7 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () { Route::post('ticket/new', [TicketsController::class, 'store'])->middleware(['throttle:ticket-new'])->name('ticket.new.store'); Route::get('ticket/show/{ticket_id}', [TicketsController::class, 'show'])->name('ticket.show'); Route::post('ticket/reply', [TicketsController::class, 'reply'])->middleware(['throttle:ticket-reply'])->name('ticket.reply'); - Route::post('ticket/close/{ticket_id}', [TicketsController::class, 'close'])->name('ticket.close'); + Route::post('ticket/status/{ticket_id}', [TicketsController::class, 'changeStatus'])->name('ticket.changeStatus'); //admin diff --git a/themes/default/views/admin/users/show.blade.php b/themes/default/views/admin/users/show.blade.php index 5d2da412..3ab0d62e 100644 --- a/themes/default/views/admin/users/show.blade.php +++ b/themes/default/views/admin/users/show.blade.php @@ -74,18 +74,9 @@
- role == 'moderator') - badge-info - @elseif ($user->role == 'client') - badge-success - @else - badge-secondary @endif - "> - {{ $user->role }} - + @foreach ($user->roles as $role) + {{$role->name}} + @endforeach
diff --git a/themes/default/views/moderator/ticket/show.blade.php b/themes/default/views/moderator/ticket/show.blade.php index 18c69e2f..3bec1feb 100644 --- a/themes/default/views/moderator/ticket/show.blade.php +++ b/themes/default/views/moderator/ticket/show.blade.php @@ -112,15 +112,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticket->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticket->user->name }} - @if($ticket->user->role === "member") - Member - @elseif ($ticket->user->role === "client") - Client - @elseif ($ticket->user->role === "moderator") - Moderator - @elseif ($ticket->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticket->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticket->created_at->diffForHumans() }} @@ -135,15 +129,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticketcomment->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticketcomment->user->name }} - @if($ticketcomment->user->role === "member") - Member - @elseif ($ticketcomment->user->role === "client") - Client - @elseif ($ticketcomment->user->role === "moderator") - Moderator - @elseif ($ticketcomment->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticketcomment->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticketcomment->created_at->diffForHumans() }} diff --git a/themes/default/views/ticket/show.blade.php b/themes/default/views/ticket/show.blade.php index 663b25f3..5a936afa 100644 --- a/themes/default/views/ticket/show.blade.php +++ b/themes/default/views/ticket/show.blade.php @@ -112,15 +112,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticket->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticket->user->name }} - @if($ticket->user->role === "member") - Member - @elseif ($ticket->user->role === "client") - Client - @elseif ($ticket->user->role === "moderator") - Moderator - @elseif ($ticket->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticket->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticket->created_at->diffForHumans() }} @@ -136,15 +130,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticketcomment->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticketcomment->user->name }} - @if($ticketcomment->user->role === "member") - Member - @elseif ($ticketcomment->user->role === "client") - Client - @elseif ($ticketcomment->user->role === "moderator") - Moderator - @elseif ($ticketcomment->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticketcomment->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticketcomment->created_at->diffForHumans() }}