forge-joniko/ldc-supportweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: deleted user management for estimation

Browse source
This commit is contained in:
Nicolas Demangeat 2024-07-31 12:02:15 +02:00
parent 889ee1e7f4
commit 6ae38392ea
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Bo/TicketController.php
View file

@ -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
]);
}
/**

8
resources/views/estimations/pendingCard.blade.php
View file

@ -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>
</div>