From 6ae38392ea6e4fa2225de46898a5f82873cca2e0 Mon Sep 17 00:00:00 2001
From: Nicolas Demangeat <nicolas.demangeat@ldc.fr>
Date: Wed, 31 Jul 2024 12:02:15 +0200
Subject: [PATCH] fix: deleted user management for estimation

---
 app/Http/Controllers/Bo/TicketController.php      | 6 +++++-
 resources/views/estimations/pendingCard.blade.php | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

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 @@
 <div class="card">
     <div class="card-header">
-        <span class="h5">{{ __('Estimation faite par :user', ['user' => $estimation->estimator->name]) }}</span>
+        <span class="h5">{{ __('Estimation faite par :user', ['user' => optional($estimation->estimator)->name ?? 'utilisateur supprimé']) }}</span>
     </div>
     <div class="card-body">
         <div class="container">
@@ -15,12 +15,12 @@
                 @endif
                 @if($estimation->status->equals(App\Enums\Credit\EstimationStatusEnum::accepted))
                 <div class="col d-flex justify-content-end">
-                    <span class="h4 text-success">{{ __('Validé par :user', ['user' => optional($estimation->validator)->name ?? 'personne supprimée']) }}</span>
+                    <span class="h4 text-success">{{ __('Validé par :user', ['user' => optional($estimation->validator)->name ?? 'utilisateur supprimé']) }}</span>
                 </div>
                 @endif
                 @if($estimation->status->equals(App\Enums\Credit\EstimationStatusEnum::refused))
                 <div class="col d-flex justify-content-end">
-                    <span class="h4 text-danger">{{ __('Refusé par :user', ['user' => optional($estimation->validator)->name ?? 'personne supprimée']) }}</span>
+                    <span class="h4 text-danger">{{ __('Refusé par :user', ['user' => optional($estimation->validator)->name ?? 'utilisateur supprimé']) }}</span>
                 </div>
                 @endif
                 @can('validateEstimate', $ticket)
@@ -55,4 +55,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>