From 316b56b0c4b8a334b14435ee4e039c5c5cc40425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 5 Sep 2023 13:05:39 +0200 Subject: [PATCH] Fixes #20 Contact.show fix show locked field --- app/Http/Controllers/Bo/ContactController.php | 7 ++++++- resources/views/bo/pages/contacts/show.blade.php | 10 +++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Bo/ContactController.php b/app/Http/Controllers/Bo/ContactController.php index 9c4f9de..99607b9 100644 --- a/app/Http/Controllers/Bo/ContactController.php +++ b/app/Http/Controllers/Bo/ContactController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Bo\FilterCustomerRequest; use App\Models\AppUser; use App\Models\Contact; +use App\Models\Formulary; use Illuminate\Database\Eloquent\Builder; class ContactController extends Controller @@ -61,6 +62,10 @@ class ContactController extends Controller public function show(Contact $contact) { $contact->load('appUser.directories'); - return \view('bo.pages.contacts.show', ['contactModel' => $contact]); + $fomularies = Formulary::all()->keyBy('name'); + return \view('bo.pages.contacts.show', [ + 'contactModel' => $contact, + 'fomularies' => $fomularies + ]); } } diff --git a/resources/views/bo/pages/contacts/show.blade.php b/resources/views/bo/pages/contacts/show.blade.php index 7706384..897d308 100644 --- a/resources/views/bo/pages/contacts/show.blade.php +++ b/resources/views/bo/pages/contacts/show.blade.php @@ -74,7 +74,8 @@ {{-- LASTNAME --}}
{{ __('Nom') }} ({{ __('obligatoire') }})
+ class="fw-bold"> {{ $fomularies->get('lastname')->required ? '(' . __('obligatoire') . ')' : '' }} +
{{ $contactModel->lastname }}
@@ -82,14 +83,17 @@ {{-- FIRSTNAME --}}
{{ __('Prénom') }} ({{ __('obligatoire') }})
+ class="fw-bold"> {{ $fomularies->get('firstname')->required ? '(' . __('obligatoire') . ')' : '' }} +
{{ $contactModel->firstname }}
{{-- PHONE --}}
-
{{ __('Téléphone') }}
+
{{ __('Téléphone') }} {{ $fomularies->get('phone')->required ? '(' . __('obligatoire') . ')' : '' }} +