From 8aca14f17ebeefc7ff01e3f6a459ce3b596bcb6f Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Fri, 9 May 2025 22:44:17 +0500 Subject: [PATCH] =?UTF-8?q?egerde=20=20sargyt=20d=C3=B6redeni=C5=88=20roly?= =?UTF-8?q?=20bar=20ulanyjy=20bolsa,=20o=C5=88a=20notification=20barmaly?= =?UTF-8?q?=20d=C3=A4l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User.php | 14 ++++++++++++++ app/Nova/Resources/Order/Loan/LoanOrder.php | 13 ++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 8987086..9324689 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -222,4 +222,18 @@ class User extends Authenticatable { return $this->options && array_key_exists($option, $this->options) ? $this->options[$option] : ''; } + + /** + * Check if user has roles + */ + public function doesntHaveRoles(): bool + { + if ($this->isMe()) { + return false; + } + + $this->loadMissing('roles'); + + return $this->roles->count() < 1; + } } diff --git a/app/Nova/Resources/Order/Loan/LoanOrder.php b/app/Nova/Resources/Order/Loan/LoanOrder.php index d4523cd..41e4c71 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanOrder.php @@ -22,6 +22,7 @@ use App\Rules\DowranAgaAllowed; use App\Rules\OnlyLetters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Email; @@ -136,7 +137,9 @@ class LoanOrder extends Resource */ public static function afterCreate(NovaRequest $request, Model $model): void { - LoanOrderRepo::notifyUser($request, $model, __('Loan order created'), 'success', 'pencil'); + if ($request->user()->doesntHaveRoles()) { + LoanOrderRepo::notifyUser($request, $model, __('Loan order created'), 'success', 'pencil'); + } } /** @@ -148,7 +151,9 @@ class LoanOrder extends Resource */ public static function afterUpdate(NovaRequest $request, Model $model): void { - LoanOrderRepo::notifyUser($request, $model, __('Loan order updated'), 'info', 'pencil-alt'); + if ($request->user()->doesntHaveRoles()) { + LoanOrderRepo::notifyUser($request, $model, __('Loan order updated'), 'info', 'pencil-alt'); + } } /** @@ -160,7 +165,9 @@ class LoanOrder extends Resource */ public static function afterDelete(NovaRequest $request, Model $model): void { - LoanOrderRepo::notifyUser($request, $model, __('Loan order deleted'), 'error', 'trash'); + if ($request->user()->doesntHaveRoles()) { + LoanOrderRepo::notifyUser($request, $model, __('Loan order deleted'), 'error', 'trash'); + } } /**