diff --git a/app/Http/Controllers/HealthCareSheetController.php b/app/Http/Controllers/HealthCareSheetController.php index 61fdd91..53e070c 100755 --- a/app/Http/Controllers/HealthCareSheetController.php +++ b/app/Http/Controllers/HealthCareSheetController.php @@ -307,13 +307,13 @@ class HealthCareSheetController extends Controller * enum={"CURRENT_AFFECTION","LONG_TERM_AFFECTION","EXONERATION"}, * example= "CURRENT_AFFECTION" * ), - * @OA\Property( - * property="performances", - * description="Listes des montants des prestations", - * example = {{"amount":20000}} + * @OA\Property(property="amount", + * type="integer", + * example = 20000, + * description="Montant de la prestation" * ), * ), - * example = {"network_id":250,"care_condition":"CURRENT_AFFECTION","performances":{{"amount":20000}}} + * example = {"network_id":250,"care_condition":"CURRENT_AFFECTION","amount":20000 } * ) * ), * @OA\Response( @@ -321,8 +321,7 @@ class HealthCareSheetController extends Controller * description="OK", * @OA\JsonContent( * ref="#/components/schemas/ApiResponse", - * example = {"status":200,"response":{{"moderator_ticket":4000,"moderator_ticket_formatted":"4\u202f000 FCFA","insurance_amount":16000, - * "insurance_amount_formatted":"16\u202f000 FCFA"}},"error":null}, + * example = {"status":200,"response":{"moderator_ticket":"4\u202f000 FCFA","insurance_amount":"16\u202f000 FCFA"},"error":null}, * ) * ) * ) @@ -332,8 +331,7 @@ class HealthCareSheetController extends Controller $this->validate($request, [ 'network_id' => 'required|integer|exists:networks,id', 'care_condition' => 'required|in:CURRENT_AFFECTION,LONG_TERM_AFFECTION,EXONERATION', - 'performances' => 'required|array', - 'performances.*.amount' => 'required|numeric', + 'amount' => 'required|numeric', ]); $nhConfig = NhNetworksConfig::where('network_id', $request->input('network_id'))->first(); @@ -343,15 +341,9 @@ class HealthCareSheetController extends Controller $currency_code = $this->getNetworkCurrency($request->input('network_id')); $parts = $this->getConfigInsuranceParts($nhConfig, $request->input('care_condition')); - $result = []; - foreach ($request->input('performances') as $p) { - array_push($result, [ - 'moderator_ticket' => $parts->insured_part * $p['amount'], - 'moderator_ticket_formatted' => $this->toMoneyWithCurrencyCode($parts->insured_part * $p['amount'], $currency_code), - 'insurance_amount' => $parts->insurer_part * $p['amount'], - 'insurance_amount_formatted' => $this->toMoneyWithCurrencyCode($parts->insurer_part * $p['amount'], $currency_code), // - ]); - } + $result = new stdClass(); + $result->moderator_ticket = $this->toMoneyWithCurrencyCode($parts->insured_part * $request->input('amount'), $currency_code); + $result->insurance_amount = $this->toMoneyWithCurrencyCode($parts->insurer_part * $request->input('amount'), $currency_code); // return $this->successResponse($result); } @@ -686,7 +678,7 @@ class HealthCareSheetController extends Controller 'exams.*.unit_price' => 'required|numeric', ]); - $insurance = NhHealthCareSheet::where('id', $request->input('health_care_sheet_id'))->where('state', InsuranceState::PAID)->first(); + $sheet = NhHealthCareSheet::where('id', $request->input('health_care_sheet_id'))->where('state', InsuranceState::PAID)->first(); if (!isset($insurance)) { return $this->errorResponse(trans('errors.not_insured')); } diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index ae4122f..fe67fc8 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -94,7 +94,7 @@ Your request to add a beneficiary to your insurance is being validated. 'consultation_or_prescription_carried_out' => "Consultation or prescription carried out", 'consultation_or_prescription_carried_out_mail' => ":gender :name , -A new consultation or prescription has been made with your insurance company. +A new consultation or prescription has been made with your insurance. Information about the consultation or prescription: - Insured number: :insured_id - Name of the insurance company: :insurance_name @@ -108,7 +108,7 @@ A new consultation or prescription has been made with your insurance company. Log in to the application to have more details and validate this operation. ", - 'consultation_or_prescription_carried_out_notification' => "A new consultation or prescription has just been made with your insurance company", + 'consultation_or_prescription_carried_out_notification' => "A new consultation or prescription has just been made with your insurance", "care_sheet_accepted" => "The care sheet has been accepted", "care_sheet_rejected" => "The care sheet has been rejected", "care_sheet_resubmitted" => "The care sheet has been resubmitted" diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index 3bc0dea..66112a8 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -94,8 +94,8 @@ Votre demande d'ajout d'ayant droit à votre assurance est en cours de validatio 'consultation_or_prescription_carried_out' => "Consultation ou prescription effectuée", 'consultation_or_prescription_carried_out_mail' => ":gender :name , -Une nouvelle consultation ou prescription vient d'etre effectuée auprès de votre assurance. - Informations de la consultation ou prescriptions : +Une nouvelle consultation ou prescription vient d'etre effectuée sur votre assurance. + Informations de la consultation ou prescription : - Numéro d'assuré : :insured_id - Nom de l'assurance : :insurance_name @@ -108,7 +108,7 @@ Une nouvelle consultation ou prescription vient d'etre effectuée auprès de vot Connectez-vous à l'application pour avoir plus de details et valider cette opération. ", - 'consultation_or_prescription_carried_out_notification' => "Une nouvelle consultation ou prescription vient d'etre effectuée auprès de votre assurance", + 'consultation_or_prescription_carried_out_notification' => "Une nouvelle consultation ou prescription vient d'etre effectuée sur votre assurance", "care_sheet_accepted" => "La feuille de soins a été acceptée", "care_sheet_rejected" => "La feuille de soins a été rejetée", "care_sheet_resubmitted" => "La feuille de soins a été re-soumise"