diff --git a/app/Http/Controllers/AuthorizationCareRequestController.php b/app/Http/Controllers/AuthorizationCareRequestController.php index acb45a6..3273e0b 100755 --- a/app/Http/Controllers/AuthorizationCareRequestController.php +++ b/app/Http/Controllers/AuthorizationCareRequestController.php @@ -108,7 +108,6 @@ class AuthorizationCareRequestController extends Controller ]); $act_id = $request->input('act_id'); - $password = $request->input('password'); $insurance = NhInsurance::find($request->input('insurance_id')); if ($insurance->state != InsuranceState::PAID) { return $this->errorResponse(__('errors.insurance_not_in_order')); @@ -285,6 +284,12 @@ class AuthorizationCareRequestController extends Controller ->paginate($request->input('perPage', 10)); foreach ($requests->items() as $r) { $r->state = trans('states.' . $r->state); + if ($r->to == 'HAVING_RIGHT') { + $r->user_lastname = $r->beneficiary_lastname; + $r->user_firstname = $r->beneficiary_firstname; + } + $r->to = trans('states.' . $r->to); + unset($r->beneficiary_lastname, $r->beneficiary_firstname); } return $this->successResponse($requests); } diff --git a/app/Http/Controllers/InsuranceController.php b/app/Http/Controllers/InsuranceController.php index 0f57ac7..5ad9f51 100644 --- a/app/Http/Controllers/InsuranceController.php +++ b/app/Http/Controllers/InsuranceController.php @@ -141,6 +141,17 @@ class InsuranceController extends Controller * enum={"ALL","EDITABLE"} * ) * ), + * @OA\Parameter( + * parameter="state", + * name="state", + * description="Etat d'assurance", + * in="query", + * required=false, + * @OA\Schema( + * type="string", + * enum={"STOPPED","PAID"} + * ) + * ), * @OA\Response( * response=200, * description="OK", @@ -166,14 +177,20 @@ class InsuranceController extends Controller { $this->validate($request, [ 'user_id' => 'required|integer|exists:users,id', - 'type' => 'nullable|in:ALL,EDITABLE' + 'type' => 'nullable|in:ALL,EDITABLE', + 'state' => 'nullable|in:PAID,STOPPED' ]); $userId = $request->input('user_id'); $type = $request->input('type'); + $state = $request->input('state'); $query = NhInsurance::with(['network:id,name', 'beneficiaries'])->where('user_id', $userId); + if (!empty($state)) { + $query = $query->where('state', $state); + } + if ($request->has('type') && $type == 'EDITABLE') { $query = $query->whereIn('state', [InsuranceState::PAID]); } diff --git a/resources/lang/en/states.php b/resources/lang/en/states.php index ceb8b4a..46cb9ca 100755 --- a/resources/lang/en/states.php +++ b/resources/lang/en/states.php @@ -26,5 +26,6 @@ return [ 'HAVING_RIGHT' => "HAVING RIGHT", 'INSURED' => 'INSURED', 'INVOICE_ISSUED' => 'INVOICE ISSUED', - 'STOP_INSURANCE' => "STOP INSURANCE" + 'STOP_INSURANCE' => "STOP INSURANCE", + 'USED' => 'USED' ]; diff --git a/resources/lang/fr/states.php b/resources/lang/fr/states.php index 9fa75e0..0bbfa7c 100755 --- a/resources/lang/fr/states.php +++ b/resources/lang/fr/states.php @@ -26,5 +26,6 @@ return [ 'HAVING_RIGHT' => "AYANT DROIT", 'INSURED' => 'ASSURÉ', 'INVOICE_ISSUED' => 'FACTURE ÉMISE', - 'STOP_INSURANCE' => "ARRÊT DE L'ASSURANCE" + 'STOP_INSURANCE' => "ARRÊT DE L'ASSURANCE", + 'USED' => 'UTILISÉE' ];