From a75b0d434de730e6a03ec4374bf11159c770a625 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Wed, 9 Feb 2022 11:39:36 +0100
Subject: [PATCH] Fix some bugs

---
 app/Http/Controllers/HealthCareSheetController.php | 8 ++++----
 resources/lang/en/states.php                       | 2 +-
 resources/lang/fr/states.php                       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php
index 5a852c2..851da69 100755
--- a/app/Http/Controllers/HealthCareSheetController.php
+++ b/app/Http/Controllers/HealthCareSheetController.php
@@ -602,8 +602,8 @@ class HealthCareSheetController extends Controller
             'network_agent_id' => 'required|integer|exists:networks_agents,id',
             'password' => 'required|string',
             'beneficiary_id' => 'nullable|int|exists:nh_having_rights,id',
-            'patient_lastname' => 'required|string',
-            'patient_firstname' => 'nullable|string',
+//            'patient_lastname' => 'required|string',
+//            'patient_firstname' => 'nullable|string',
             'practitioner_lastname' => 'required|string',
             'practitioner_firstname' => 'nullable|string',
             'practitioner_provider_class_id' => 'required|integer',
@@ -666,8 +666,8 @@ class HealthCareSheetController extends Controller
                 'practitioner_firstname' => $request->input('practitioner_firstname'),
                 'practitioner_provider_class_id' => $request->input('practitioner_provider_class_id'),
                 'insurance_id' => $insurance->id,
-                'patient_lastname' => $request->input('patient_lastname'),
-                'patient_firstname' => $request->input('patient_firstname'),
+                'patient_lastname' => isset($beneficiary) ? $beneficiary->lastname : $insurance->user->lastname,
+                'patient_firstname' => isset($beneficiary) ? $beneficiary->firstname : $insurance->user->firstname,
                 'patient_situation' => isset($beneficiary) ? 'HAVING_RIGHT' : 'INSURED',
                 'type' => HealthCareSheetType::CONSULTATION,
                 'state' => InsuranceSubscriptionState::UNDER_VALIDATION,
diff --git a/resources/lang/en/states.php b/resources/lang/en/states.php
index 46cb9ca..e21c78c 100755
--- a/resources/lang/en/states.php
+++ b/resources/lang/en/states.php
@@ -24,7 +24,7 @@ return [
     'LONG_TERM_AFFECTION' => "LONG TERM AFFECTION",
     'EXONERATION' => "EXONERATION",
     'HAVING_RIGHT' => "HAVING RIGHT",
-    'INSURED' => 'INSURED',
+    'INSURED' => 'PRINCIPAL INSURED',
     'INVOICE_ISSUED' => 'INVOICE ISSUED',
     'STOP_INSURANCE' => "STOP INSURANCE",
     'USED' => 'USED'
diff --git a/resources/lang/fr/states.php b/resources/lang/fr/states.php
index 0bbfa7c..bea38d1 100755
--- a/resources/lang/fr/states.php
+++ b/resources/lang/fr/states.php
@@ -24,7 +24,7 @@ return [
     'LONG_TERM_AFFECTION' => "AFFECTION LONGUE DURÉE",
     'EXONERATION' => "EXONERATION",
     'HAVING_RIGHT' => "AYANT DROIT",
-    'INSURED' => 'ASSURÉ',
+    'INSURED' => 'ASSURÉ PRINCIPAL',
     'INVOICE_ISSUED' => 'FACTURE ÉMISE',
     'STOP_INSURANCE' => "ARRÊT DE L'ASSURANCE",
     'USED' => 'UTILISÉE'