diff --git a/app/Filament/Pages/Verification.php b/app/Filament/Pages/Verification.php index b89752f..3a9ddbd 100644 --- a/app/Filament/Pages/Verification.php +++ b/app/Filament/Pages/Verification.php @@ -19,7 +19,6 @@ use Filament\Notifications\Notification; use Filament\Pages\Page; use Filament\Support\Icons\Heroicon; -use Illuminate\Support\Facades\Auth; use UnitEnum; class Verification extends Page implements HasActions, HasForms @@ -53,7 +52,7 @@ public function boot(): void public function mount(): void { - $user = Auth::user(); + $user = auth()->user(); $this->company = $user->company; // Load unified verification request @@ -135,7 +134,7 @@ public function submitVerificationAction(): Action User::superAdmin() ->get() ->each(function ($admin) use ($isRevision): void { - $user = Auth::user(); + $user = auth()->user(); $admin->notify(new BroadcastNotification([ 'title' => $isRevision ? 'Pembaruan Data Verifikasi ✨' : 'Ada Pengajuan Verifikasi Baru! 🚀', diff --git a/app/Filament/Resources/Manage/Contacts/ContactResource.php b/app/Filament/Resources/Manage/Contacts/ContactResource.php index 086760e..c742b94 100644 --- a/app/Filament/Resources/Manage/Contacts/ContactResource.php +++ b/app/Filament/Resources/Manage/Contacts/ContactResource.php @@ -22,7 +22,6 @@ use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Mail; use UnitEnum; @@ -170,7 +169,7 @@ public static function table(Table $table): Table $record->update([ 'reply_message' => $data['reply_message'], 'replied_at' => now(), - 'replied_by' => Auth::id(), + 'replied_by' => auth()->id(), ]); CheerfulNotification::success( diff --git a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/AcceptAction.php b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/AcceptAction.php index 568c311..c2a598c 100644 --- a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/AcceptAction.php +++ b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/AcceptAction.php @@ -11,7 +11,6 @@ use Filament\Actions\Action; use Filament\Support\Icons\Heroicon; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Support\Facades\Auth; class AcceptAction extends Action { @@ -26,7 +25,7 @@ protected function setUp(): void $cooperationMedia = $record->cooperationMedia() ->whereHas('partnerMedia', function (Builder $query): void { $query->whereHas('company', function (Builder $subQuery): void { - $subQuery->where('user_id', Auth::id()); + $subQuery->where('user_id', auth()->id()); }); }) ->first(); @@ -56,8 +55,8 @@ protected function setUp(): void } }) ->visible(function (Cooperation $record): bool { - /** @var \App\Models\User $user */ - $user = Auth::user(); + + $user = auth()->user(); if (! $user || ! $user->hasRole('Perusahaan')) { return false; @@ -66,7 +65,7 @@ protected function setUp(): void $cooperationMedia = $record->cooperationMedia() ->whereHas('partnerMedia', function (Builder $query): void { $query->whereHas('company', function (Builder $subQuery): void { - $subQuery->where('user_id', Auth::id()); + $subQuery->where('user_id', auth()->id()); }); }) ->first(); diff --git a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/CreateTaskAssignmentAction.php b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/CreateTaskAssignmentAction.php index 86c3064..45f87bb 100644 --- a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/CreateTaskAssignmentAction.php +++ b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/CreateTaskAssignmentAction.php @@ -103,7 +103,7 @@ protected function setUp(): void ->modalHeading('Buat Penugasan') ->modalSubmitActionLabel('Simpan') ->visible(function (Cooperation $record): bool { - /** @var \App\Models\User $user */ + $user = Auth::user(); return $user && ! $user->hasRole('Perusahaan') diff --git a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/RejectAction.php b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/RejectAction.php index 79b0404..56c4e0a 100644 --- a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/RejectAction.php +++ b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/RejectAction.php @@ -9,7 +9,6 @@ use App\Notifications\BroadcastNotification; use Filament\Actions\Action; use Filament\Support\Icons\Heroicon; -use Illuminate\Support\Facades\Auth; class RejectAction extends Action { @@ -24,7 +23,7 @@ protected function setUp(): void $cooperationMedia = $record->cooperationMedia() ->whereHas('partnerMedia', function ($query) { $query->whereHas('company', function ($subQuery) { - $subQuery->where('user_id', Auth::id()); + $subQuery->where('user_id', auth()->id()); }); }) ->first(); @@ -49,8 +48,8 @@ protected function setUp(): void } }) ->visible(function (Cooperation $record): bool { - /** @var \App\Models\User $user */ - $user = Auth::user(); + + $user = auth()->user(); if (! $user || ! $user->hasRole('Perusahaan')) { return false; @@ -59,7 +58,7 @@ protected function setUp(): void $cooperationMedia = $record->cooperationMedia() ->whereHas('partnerMedia', function ($query) { $query->whereHas('company', function ($subQuery) { - $subQuery->where('user_id', Auth::id()); + $subQuery->where('user_id', auth()->id()); }); }) ->first(); diff --git a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/SendProposalAction.php b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/SendProposalAction.php index 08f7608..a01a7a7 100644 --- a/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/SendProposalAction.php +++ b/app/Filament/Resources/Manage/Cooperations/Actions/Cooperation/SendProposalAction.php @@ -99,7 +99,7 @@ protected function setUp(): void User::superAdmin() ->get() ->each(function ($admin) use ($isRevision, $record, $cooperationMedia): void { - /** @var \App\Models\User $user */ + $user = Auth::user(); $admin->notify(new BroadcastNotification([ 'title' => $isRevision ? 'Pembaruan Proposal Kerja Sama ✨' : 'Ada Proposal Kerja Sama Baru! 🚀', @@ -118,7 +118,7 @@ protected function setUp(): void ->modalHeading('Proposal Kerja Sama') ->modalSubmitActionLabel('Kirim Proposal') ->visible(function (Cooperation $record): bool { - /** @var \App\Models\User $user */ + $user = Auth::user(); if (! $user->hasRole('Perusahaan')) { diff --git a/app/Filament/Resources/Manage/Cooperations/Pages/ListCooperations.php b/app/Filament/Resources/Manage/Cooperations/Pages/ListCooperations.php index 1240d26..f6f9691 100644 --- a/app/Filament/Resources/Manage/Cooperations/Pages/ListCooperations.php +++ b/app/Filament/Resources/Manage/Cooperations/Pages/ListCooperations.php @@ -5,7 +5,6 @@ use App\Filament\Resources\Manage\Cooperations\CooperationResource; use Filament\Actions\CreateAction; use Filament\Resources\Pages\ListRecords; -use Illuminate\Support\Facades\Auth; class ListCooperations extends ListRecords { @@ -17,7 +16,7 @@ protected function getHeaderActions(): array { $actions = []; - if (! Auth::user()->hasRole('Perusahaan')) { + if (! auth()->user()->hasRole('Perusahaan')) { $actions[] = CreateAction::make() ->label('Tambah'); } diff --git a/app/Filament/Resources/Manage/Cooperations/RelationManagers/ReportRelationManager.php b/app/Filament/Resources/Manage/Cooperations/RelationManagers/ReportRelationManager.php index 62ac9bc..372713e 100644 --- a/app/Filament/Resources/Manage/Cooperations/RelationManagers/ReportRelationManager.php +++ b/app/Filament/Resources/Manage/Cooperations/RelationManagers/ReportRelationManager.php @@ -137,7 +137,7 @@ public function table(Table $table): Table User::superAdmin() ->get() ->each(function ($admin) use ($record): void { - /** @var \App\Models\User $user */ + $user = Auth::user(); $admin->notify(new BroadcastNotification([ 'title' => 'Ada Laporan Baru! 📝✨', @@ -151,7 +151,7 @@ public function table(Table $table): Table }); }) ->visible(function (): bool { - /** @var \App\Models\User $user */ + $user = Auth::user(); if (! $user || ! $user->hasRole('Perusahaan')) { diff --git a/app/Filament/Resources/Manage/Journalists/Actions/DeleteJournalistAction.php b/app/Filament/Resources/Manage/Journalists/Actions/DeleteJournalistAction.php index ba9cf68..2d0fdec 100644 --- a/app/Filament/Resources/Manage/Journalists/Actions/DeleteJournalistAction.php +++ b/app/Filament/Resources/Manage/Journalists/Actions/DeleteJournalistAction.php @@ -5,7 +5,6 @@ use App\Enums\VerificationStatus; use App\Filament\Support\CheerfulNotification; use Filament\Actions\DeleteAction; -use Illuminate\Support\Facades\Auth; class DeleteJournalistAction extends DeleteAction { @@ -18,8 +17,8 @@ protected function setUp(): void ); $this->visible(function (): bool { - /** @var \App\Models\User $user */ - $user = Auth::user(); + + $user = auth()->user(); if (! $user->hasRole('Perusahaan')) { return true; diff --git a/app/Filament/Resources/Manage/Journalists/Actions/EditJournalistAction.php b/app/Filament/Resources/Manage/Journalists/Actions/EditJournalistAction.php index 783f38b..014ea1a 100644 --- a/app/Filament/Resources/Manage/Journalists/Actions/EditJournalistAction.php +++ b/app/Filament/Resources/Manage/Journalists/Actions/EditJournalistAction.php @@ -8,7 +8,6 @@ use Filament\Actions\EditAction; use Filament\Support\Enums\Width; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Storage; class EditJournalistAction extends EditAction @@ -94,8 +93,8 @@ protected function setUp(): void return $record; }) ->visible(function (): bool { - /** @var \App\Models\User $user */ - $user = Auth::user(); + + $user = auth()->user(); if (! $user->hasRole('Perusahaan')) { return true; diff --git a/app/Filament/Resources/Publication/News/Pages/CreateNews.php b/app/Filament/Resources/Publication/News/Pages/CreateNews.php index d548fac..4e9afc9 100644 --- a/app/Filament/Resources/Publication/News/Pages/CreateNews.php +++ b/app/Filament/Resources/Publication/News/Pages/CreateNews.php @@ -8,7 +8,6 @@ use Filament\Notifications\Notification; use Filament\Resources\Pages\CreateRecord; use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Auth; class CreateNews extends CreateRecord { @@ -39,7 +38,7 @@ protected function getRedirectUrl(): string protected function handleRecordCreation(array $data): Model { - $data['author_id'] = Auth::id(); + $data['author_id'] = auth()->id(); return static::getModel()::create($data); } diff --git a/app/Services/VerificationService.php b/app/Services/VerificationService.php index 8f18c13..84ee7f8 100644 --- a/app/Services/VerificationService.php +++ b/app/Services/VerificationService.php @@ -11,7 +11,6 @@ use App\Models\VerificationRequest; use App\Models\VerificationReview; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; class VerificationService @@ -207,7 +206,7 @@ public function submitVerification(Company $company, ?VerificationRequest $exist // New submission return VerificationRequest::create([ 'company_id' => $company->id, - 'submitted_by' => Auth::id(), + 'submitted_by' => auth()->id(), 'status' => VerificationStatus::PENDING, ])->load(['reviews.reviewer']); } @@ -225,7 +224,7 @@ public function processReview(VerificationRequest $verificationRequest, Decision // Create review record VerificationReview::create([ 'verification_request_id' => $verificationRequest->id, - 'reviewer_id' => Auth::id(), + 'reviewer_id' => auth()->id(), 'decision' => $decision, 'note' => $note, ]);