refactor: change Auth:: to auth()-> and remove comment /** @var \App\Models\User $user */
This commit is contained in:
parent
2983cd243f
commit
95562c87fb
@ -19,7 +19,6 @@
|
|||||||
use Filament\Notifications\Notification;
|
use Filament\Notifications\Notification;
|
||||||
use Filament\Pages\Page;
|
use Filament\Pages\Page;
|
||||||
use Filament\Support\Icons\Heroicon;
|
use Filament\Support\Icons\Heroicon;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use UnitEnum;
|
use UnitEnum;
|
||||||
|
|
||||||
class Verification extends Page implements HasActions, HasForms
|
class Verification extends Page implements HasActions, HasForms
|
||||||
@ -53,7 +52,7 @@ public function boot(): void
|
|||||||
|
|
||||||
public function mount(): void
|
public function mount(): void
|
||||||
{
|
{
|
||||||
$user = Auth::user();
|
$user = auth()->user();
|
||||||
$this->company = $user->company;
|
$this->company = $user->company;
|
||||||
|
|
||||||
// Load unified verification request
|
// Load unified verification request
|
||||||
@ -135,7 +134,7 @@ public function submitVerificationAction(): Action
|
|||||||
User::superAdmin()
|
User::superAdmin()
|
||||||
->get()
|
->get()
|
||||||
->each(function ($admin) use ($isRevision): void {
|
->each(function ($admin) use ($isRevision): void {
|
||||||
$user = Auth::user();
|
$user = auth()->user();
|
||||||
|
|
||||||
$admin->notify(new BroadcastNotification([
|
$admin->notify(new BroadcastNotification([
|
||||||
'title' => $isRevision ? 'Pembaruan Data Verifikasi ✨' : 'Ada Pengajuan Verifikasi Baru! 🚀',
|
'title' => $isRevision ? 'Pembaruan Data Verifikasi ✨' : 'Ada Pengajuan Verifikasi Baru! 🚀',
|
||||||
|
|||||||
@ -22,7 +22,6 @@
|
|||||||
use Filament\Tables\Columns\IconColumn;
|
use Filament\Tables\Columns\IconColumn;
|
||||||
use Filament\Tables\Columns\TextColumn;
|
use Filament\Tables\Columns\TextColumn;
|
||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Illuminate\Support\Facades\Mail;
|
use Illuminate\Support\Facades\Mail;
|
||||||
use UnitEnum;
|
use UnitEnum;
|
||||||
|
|
||||||
@ -170,7 +169,7 @@ public static function table(Table $table): Table
|
|||||||
$record->update([
|
$record->update([
|
||||||
'reply_message' => $data['reply_message'],
|
'reply_message' => $data['reply_message'],
|
||||||
'replied_at' => now(),
|
'replied_at' => now(),
|
||||||
'replied_by' => Auth::id(),
|
'replied_by' => auth()->id(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
CheerfulNotification::success(
|
CheerfulNotification::success(
|
||||||
|
|||||||
@ -11,7 +11,6 @@
|
|||||||
use Filament\Actions\Action;
|
use Filament\Actions\Action;
|
||||||
use Filament\Support\Icons\Heroicon;
|
use Filament\Support\Icons\Heroicon;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class AcceptAction extends Action
|
class AcceptAction extends Action
|
||||||
{
|
{
|
||||||
@ -26,7 +25,7 @@ protected function setUp(): void
|
|||||||
$cooperationMedia = $record->cooperationMedia()
|
$cooperationMedia = $record->cooperationMedia()
|
||||||
->whereHas('partnerMedia', function (Builder $query): void {
|
->whereHas('partnerMedia', function (Builder $query): void {
|
||||||
$query->whereHas('company', function (Builder $subQuery): void {
|
$query->whereHas('company', function (Builder $subQuery): void {
|
||||||
$subQuery->where('user_id', Auth::id());
|
$subQuery->where('user_id', auth()->id());
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
->first();
|
->first();
|
||||||
@ -56,8 +55,8 @@ protected function setUp(): void
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
->visible(function (Cooperation $record): bool {
|
->visible(function (Cooperation $record): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = auth()->user();
|
||||||
|
|
||||||
if (! $user || ! $user->hasRole('Perusahaan')) {
|
if (! $user || ! $user->hasRole('Perusahaan')) {
|
||||||
return false;
|
return false;
|
||||||
@ -66,7 +65,7 @@ protected function setUp(): void
|
|||||||
$cooperationMedia = $record->cooperationMedia()
|
$cooperationMedia = $record->cooperationMedia()
|
||||||
->whereHas('partnerMedia', function (Builder $query): void {
|
->whereHas('partnerMedia', function (Builder $query): void {
|
||||||
$query->whereHas('company', function (Builder $subQuery): void {
|
$query->whereHas('company', function (Builder $subQuery): void {
|
||||||
$subQuery->where('user_id', Auth::id());
|
$subQuery->where('user_id', auth()->id());
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
->first();
|
->first();
|
||||||
|
|||||||
@ -103,7 +103,7 @@ protected function setUp(): void
|
|||||||
->modalHeading('Buat Penugasan')
|
->modalHeading('Buat Penugasan')
|
||||||
->modalSubmitActionLabel('Simpan')
|
->modalSubmitActionLabel('Simpan')
|
||||||
->visible(function (Cooperation $record): bool {
|
->visible(function (Cooperation $record): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
|
|
||||||
return $user && ! $user->hasRole('Perusahaan')
|
return $user && ! $user->hasRole('Perusahaan')
|
||||||
|
|||||||
@ -9,7 +9,6 @@
|
|||||||
use App\Notifications\BroadcastNotification;
|
use App\Notifications\BroadcastNotification;
|
||||||
use Filament\Actions\Action;
|
use Filament\Actions\Action;
|
||||||
use Filament\Support\Icons\Heroicon;
|
use Filament\Support\Icons\Heroicon;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class RejectAction extends Action
|
class RejectAction extends Action
|
||||||
{
|
{
|
||||||
@ -24,7 +23,7 @@ protected function setUp(): void
|
|||||||
$cooperationMedia = $record->cooperationMedia()
|
$cooperationMedia = $record->cooperationMedia()
|
||||||
->whereHas('partnerMedia', function ($query) {
|
->whereHas('partnerMedia', function ($query) {
|
||||||
$query->whereHas('company', function ($subQuery) {
|
$query->whereHas('company', function ($subQuery) {
|
||||||
$subQuery->where('user_id', Auth::id());
|
$subQuery->where('user_id', auth()->id());
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
->first();
|
->first();
|
||||||
@ -49,8 +48,8 @@ protected function setUp(): void
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
->visible(function (Cooperation $record): bool {
|
->visible(function (Cooperation $record): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = auth()->user();
|
||||||
|
|
||||||
if (! $user || ! $user->hasRole('Perusahaan')) {
|
if (! $user || ! $user->hasRole('Perusahaan')) {
|
||||||
return false;
|
return false;
|
||||||
@ -59,7 +58,7 @@ protected function setUp(): void
|
|||||||
$cooperationMedia = $record->cooperationMedia()
|
$cooperationMedia = $record->cooperationMedia()
|
||||||
->whereHas('partnerMedia', function ($query) {
|
->whereHas('partnerMedia', function ($query) {
|
||||||
$query->whereHas('company', function ($subQuery) {
|
$query->whereHas('company', function ($subQuery) {
|
||||||
$subQuery->where('user_id', Auth::id());
|
$subQuery->where('user_id', auth()->id());
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
->first();
|
->first();
|
||||||
|
|||||||
@ -99,7 +99,7 @@ protected function setUp(): void
|
|||||||
User::superAdmin()
|
User::superAdmin()
|
||||||
->get()
|
->get()
|
||||||
->each(function ($admin) use ($isRevision, $record, $cooperationMedia): void {
|
->each(function ($admin) use ($isRevision, $record, $cooperationMedia): void {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
$admin->notify(new BroadcastNotification([
|
$admin->notify(new BroadcastNotification([
|
||||||
'title' => $isRevision ? 'Pembaruan Proposal Kerja Sama ✨' : 'Ada Proposal Kerja Sama Baru! 🚀',
|
'title' => $isRevision ? 'Pembaruan Proposal Kerja Sama ✨' : 'Ada Proposal Kerja Sama Baru! 🚀',
|
||||||
@ -118,7 +118,7 @@ protected function setUp(): void
|
|||||||
->modalHeading('Proposal Kerja Sama')
|
->modalHeading('Proposal Kerja Sama')
|
||||||
->modalSubmitActionLabel('Kirim Proposal')
|
->modalSubmitActionLabel('Kirim Proposal')
|
||||||
->visible(function (Cooperation $record): bool {
|
->visible(function (Cooperation $record): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
|
|
||||||
if (! $user->hasRole('Perusahaan')) {
|
if (! $user->hasRole('Perusahaan')) {
|
||||||
|
|||||||
@ -5,7 +5,6 @@
|
|||||||
use App\Filament\Resources\Manage\Cooperations\CooperationResource;
|
use App\Filament\Resources\Manage\Cooperations\CooperationResource;
|
||||||
use Filament\Actions\CreateAction;
|
use Filament\Actions\CreateAction;
|
||||||
use Filament\Resources\Pages\ListRecords;
|
use Filament\Resources\Pages\ListRecords;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class ListCooperations extends ListRecords
|
class ListCooperations extends ListRecords
|
||||||
{
|
{
|
||||||
@ -17,7 +16,7 @@ protected function getHeaderActions(): array
|
|||||||
{
|
{
|
||||||
$actions = [];
|
$actions = [];
|
||||||
|
|
||||||
if (! Auth::user()->hasRole('Perusahaan')) {
|
if (! auth()->user()->hasRole('Perusahaan')) {
|
||||||
$actions[] = CreateAction::make()
|
$actions[] = CreateAction::make()
|
||||||
->label('Tambah');
|
->label('Tambah');
|
||||||
}
|
}
|
||||||
|
|||||||
@ -137,7 +137,7 @@ public function table(Table $table): Table
|
|||||||
User::superAdmin()
|
User::superAdmin()
|
||||||
->get()
|
->get()
|
||||||
->each(function ($admin) use ($record): void {
|
->each(function ($admin) use ($record): void {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
$admin->notify(new BroadcastNotification([
|
$admin->notify(new BroadcastNotification([
|
||||||
'title' => 'Ada Laporan Baru! 📝✨',
|
'title' => 'Ada Laporan Baru! 📝✨',
|
||||||
@ -151,7 +151,7 @@ public function table(Table $table): Table
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
->visible(function (): bool {
|
->visible(function (): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = Auth::user();
|
||||||
|
|
||||||
if (! $user || ! $user->hasRole('Perusahaan')) {
|
if (! $user || ! $user->hasRole('Perusahaan')) {
|
||||||
|
|||||||
@ -5,7 +5,6 @@
|
|||||||
use App\Enums\VerificationStatus;
|
use App\Enums\VerificationStatus;
|
||||||
use App\Filament\Support\CheerfulNotification;
|
use App\Filament\Support\CheerfulNotification;
|
||||||
use Filament\Actions\DeleteAction;
|
use Filament\Actions\DeleteAction;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class DeleteJournalistAction extends DeleteAction
|
class DeleteJournalistAction extends DeleteAction
|
||||||
{
|
{
|
||||||
@ -18,8 +17,8 @@ protected function setUp(): void
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->visible(function (): bool {
|
$this->visible(function (): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = auth()->user();
|
||||||
|
|
||||||
if (! $user->hasRole('Perusahaan')) {
|
if (! $user->hasRole('Perusahaan')) {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
use Filament\Actions\EditAction;
|
use Filament\Actions\EditAction;
|
||||||
use Filament\Support\Enums\Width;
|
use Filament\Support\Enums\Width;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
|
||||||
class EditJournalistAction extends EditAction
|
class EditJournalistAction extends EditAction
|
||||||
@ -94,8 +93,8 @@ protected function setUp(): void
|
|||||||
return $record;
|
return $record;
|
||||||
})
|
})
|
||||||
->visible(function (): bool {
|
->visible(function (): bool {
|
||||||
/** @var \App\Models\User $user */
|
|
||||||
$user = Auth::user();
|
$user = auth()->user();
|
||||||
|
|
||||||
if (! $user->hasRole('Perusahaan')) {
|
if (! $user->hasRole('Perusahaan')) {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
use Filament\Notifications\Notification;
|
use Filament\Notifications\Notification;
|
||||||
use Filament\Resources\Pages\CreateRecord;
|
use Filament\Resources\Pages\CreateRecord;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class CreateNews extends CreateRecord
|
class CreateNews extends CreateRecord
|
||||||
{
|
{
|
||||||
@ -39,7 +38,7 @@ protected function getRedirectUrl(): string
|
|||||||
|
|
||||||
protected function handleRecordCreation(array $data): Model
|
protected function handleRecordCreation(array $data): Model
|
||||||
{
|
{
|
||||||
$data['author_id'] = Auth::id();
|
$data['author_id'] = auth()->id();
|
||||||
|
|
||||||
return static::getModel()::create($data);
|
return static::getModel()::create($data);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,7 +11,6 @@
|
|||||||
use App\Models\VerificationRequest;
|
use App\Models\VerificationRequest;
|
||||||
use App\Models\VerificationReview;
|
use App\Models\VerificationReview;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class VerificationService
|
class VerificationService
|
||||||
@ -207,7 +206,7 @@ public function submitVerification(Company $company, ?VerificationRequest $exist
|
|||||||
// New submission
|
// New submission
|
||||||
return VerificationRequest::create([
|
return VerificationRequest::create([
|
||||||
'company_id' => $company->id,
|
'company_id' => $company->id,
|
||||||
'submitted_by' => Auth::id(),
|
'submitted_by' => auth()->id(),
|
||||||
'status' => VerificationStatus::PENDING,
|
'status' => VerificationStatus::PENDING,
|
||||||
])->load(['reviews.reviewer']);
|
])->load(['reviews.reviewer']);
|
||||||
}
|
}
|
||||||
@ -225,7 +224,7 @@ public function processReview(VerificationRequest $verificationRequest, Decision
|
|||||||
// Create review record
|
// Create review record
|
||||||
VerificationReview::create([
|
VerificationReview::create([
|
||||||
'verification_request_id' => $verificationRequest->id,
|
'verification_request_id' => $verificationRequest->id,
|
||||||
'reviewer_id' => Auth::id(),
|
'reviewer_id' => auth()->id(),
|
||||||
'decision' => $decision,
|
'decision' => $decision,
|
||||||
'note' => $note,
|
'note' => $note,
|
||||||
]);
|
]);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user