diff --git a/app/Http/Controllers/Bo/TicketController.php b/app/Http/Controllers/Bo/TicketController.php index 26ee400..8894d6d 100644 --- a/app/Http/Controllers/Bo/TicketController.php +++ b/app/Http/Controllers/Bo/TicketController.php @@ -135,7 +135,11 @@ class TicketController extends Controller $messages = $ticket->messages()->orderBy('created_at', 'DESC')->get(); $isSubscribed = (bool)$ticket->subscriptions()->where('user_id', $user->id)->count(); - return view('bo.pages.tickets.show', compact('ticket', 'messages', 'isSubscribed')); + return view('bo.pages.tickets.show', [ + 'ticket' => $ticket, + 'messages' => $messages, + 'isSubscribed' => $isSubscribed + ]); } /** diff --git a/resources/views/estimations/pendingCard.blade.php b/resources/views/estimations/pendingCard.blade.php index dda168e..d0688df 100644 --- a/resources/views/estimations/pendingCard.blade.php +++ b/resources/views/estimations/pendingCard.blade.php @@ -1,6 +1,6 @@
- {{ __('Estimation faite par :user', ['user' => $estimation->estimator->name]) }} + {{ __('Estimation faite par :user', ['user' => optional($estimation->estimator)->name ?? 'utilisateur supprimé']) }}
@@ -15,12 +15,12 @@ @endif @if($estimation->status->equals(App\Enums\Credit\EstimationStatusEnum::accepted))
- {{ __('Validé par :user', ['user' => optional($estimation->validator)->name ?? 'personne supprimée']) }} + {{ __('Validé par :user', ['user' => optional($estimation->validator)->name ?? 'utilisateur supprimé']) }}
@endif @if($estimation->status->equals(App\Enums\Credit\EstimationStatusEnum::refused))
- {{ __('Refusé par :user', ['user' => optional($estimation->validator)->name ?? 'personne supprimée']) }} + {{ __('Refusé par :user', ['user' => optional($estimation->validator)->name ?? 'utilisateur supprimé']) }}
@endif @can('validateEstimate', $ticket) @@ -55,4 +55,4 @@
- \ No newline at end of file +