From 9da81a64919df78b8732556cd7208cb8b2341f05 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Wed, 9 Feb 2022 13:35:23 +0100
Subject: [PATCH] Improve some routes

---
 .../AuthorizationCareRequestController.php    |  2 +-
 .../Controllers/HealthCareSheetController.php | 22 ++++++++++---------
 app/Http/Controllers/InsuranceController.php  |  2 +-
 resources/lang/en/messages.php                |  1 +
 resources/lang/fr/messages.php                |  1 +
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/AuthorizationCareRequestController.php b/app/Http/Controllers/AuthorizationCareRequestController.php
index dcb4326..a1f6ec6 100755
--- a/app/Http/Controllers/AuthorizationCareRequestController.php
+++ b/app/Http/Controllers/AuthorizationCareRequestController.php
@@ -281,7 +281,7 @@ class AuthorizationCareRequestController extends Controller
         ]);
 
         $requests = NhInfosAuthorizationOfCareRequest::with(['network:id,name'])->where('user_id', $request->input('user_id'))
-            ->paginate($request->input('perPage', 10));
+            ->orderBy('created_at', 'DESC')->paginate($request->input('perPage', 10));
         foreach ($requests->items() as $r) {
             $r->state = trans('states.' . $r->state);
             if ($r->to == 'HAVING_RIGHT') {
diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php
index fa9b2a9..fa86781 100755
--- a/app/Http/Controllers/HealthCareSheetController.php
+++ b/app/Http/Controllers/HealthCareSheetController.php
@@ -669,7 +669,6 @@ class HealthCareSheetController extends Controller
                 'pregnancy_start_at' => (!empty($pregnancy_start_at)) ? $pregnancy_start_at : null,
                 'pregnancy_end_at' => (!empty($pregnancy_end_at)) ? $pregnancy_end_at : null,
             ]);
-
             $healthCareSheet->created_at = $healthCareSheet->udpated_at = $datetime;
             $healthCareSheet->save();
 
@@ -681,28 +680,31 @@ class HealthCareSheetController extends Controller
                     'home_visit_fees' => $fees != 0 ? $fees : null,
                     'moderator_ticket' => $parts->insured_part * ($p['amount'] + $fees), // to calculate,
                     'insurance_amount' => $parts->insurer_part * ($p['amount'] + $fees), // to calculate, montant de l'assurance
-                    'created_at' => $datetime, 'updated_at' => $datetime,
                 ]);
+                $performance->created_at = $performance->updated_at = $datetime;
+                $performance->save();
 
-                NhHealthCareSheetsPerformance::create([
+                $nhp = NhHealthCareSheetsPerformance::create([
                     'sheet_id' => $healthCareSheet->id,
                     'performance_id' => $performance->id,
-                    'created_at' => $datetime, 'updated_at' => $datetime,
                 ]);
+                $nhp->created_at = $nhp->updated_at = $datetime;
+                $nhp->save();
 
                 $this->useAuthorizationRequest($p['act_id'], $insurance->id, $beneficiary_id, $healthCareSheet->id, $datetime);
             }
 
             foreach ($request->input('prescriptions', []) as $p) {
-                $prescription = NhMedicalPrescription::create(array_merge($p, [
-                    'created_at' => $datetime, 'updated_at' => $datetime,
-                ]));
+                $prescription = NhMedicalPrescription::create($p);
+                $prescription->created_at = $prescription->updated_at = $datetime;
+                $prescription->save();
 
-                NhHealthCareSheetsPrescription::create([
+                $nhp = NhHealthCareSheetsPrescription::create([
                     'sheet_id' => $healthCareSheet->id,
-                    'prescription_id' => $prescription->id,
-                    'created_at' => $datetime, 'updated_at' => $datetime,
+                    'prescription_id' => $prescription->id
                 ]);
+                $nhp->created_at = $nhp->updated_at = $datetime;
+                $nhp->save();
             }
 
             foreach ($request->input('exams', []) as $e) {
diff --git a/app/Http/Controllers/InsuranceController.php b/app/Http/Controllers/InsuranceController.php
index d723494..dbf66a8 100644
--- a/app/Http/Controllers/InsuranceController.php
+++ b/app/Http/Controllers/InsuranceController.php
@@ -671,7 +671,7 @@ class InsuranceController extends Controller
                 'bonus_amount' => $this->toMoneyWithCurrencyCode($bonus_amount, $currency), 'total_bonus_amount' => $this->toMoneyWithCurrencyCode($amountToPaid, $currency), 'number_of_beneficiaries' => $insurance->number_of_beneficiaries,
                 'gender' => trans('states.' . $user->identification->gender), 'insurance_name' => $insurance->network->name, 'months' => $insurance->number_of_months])));
             DB::commit();
-            return $this->successResponse(trans('messages.insurance_subscription_paid'));
+            return $this->successResponse(trans('messages.insurance_renew_paid'));
         } catch (Throwable $e) {
             Log::error($e->getMessage() . '\n' . $e->getTraceAsString());
             DB::rollBack();
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 2711178..4a47431 100755
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -172,4 +172,5 @@ Your insurance has been renewed.
       - Number of beneficiaries : :number_of_beneficiaries
       - Number of months: :months
     ",
+    'insurance_renew_paid' => "Insurance renewal paid",
 ];
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index bd56fd8..d61ee42 100755
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -189,4 +189,5 @@ Votre assurance a été renouvelée.
       - Nombre d'ayants droit : :number_of_beneficiaries
       - Nombre de mois : :months
     ",
+    'insurance_renew_paid' => "Renouvellement de l'assurance payée",
 ];