From f351fe5adab84dad5e9e80fc0e2fd0929d940c14 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Mon, 14 Feb 2022 16:08:54 +0100 Subject: [PATCH] Improve GET /generate-invoice --- app/Http/Controllers/InvoiceController.php | 36 ++++++++++++++++++++-- resources/lang/en/errors.php | 3 +- resources/lang/en/messages.php | 1 + resources/lang/fr/errors.php | 3 +- resources/lang/fr/messages.php | 1 + 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 1cab77b..36c14ae 100755 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -19,6 +19,36 @@ use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; class InvoiceController extends Controller { + /** + * @OA\Get( + * path="/generate-invoice", + * summary="Facturer les feuilles de soins", + * tags={"Factures"}, + * security={{"api_key":{}}}, + * @OA\Parameter( + * parameter="network_agent_id", + * name="network_agent_id", + * description="ID de l'agent dans le reseau", + * @OA\Schema( + * type="integer" + * ), + * in="query", + * required=true + * ), + * @OA\Response( + * response=200, + * description="OK", + * @OA\JsonContent( + * ref="#/components/schemas/ApiResponse", + * example = { + * "status" : 200, + * "response" : "La facture a été générée", + * "error":null + * } + * ) + * ) + * ) + */ // Generer les factures periodiquement pour chaque agent public function generateInvoice(Request $request) { @@ -30,7 +60,7 @@ class InvoiceController extends Controller $hyper = AgentPlus::where('network_id', $agent->network_id)->where('category', 'hyper')->first(); $config = NhNetworksConfig::where('network_id', $agent->network_id)->first(); if (!isset($config)) { - return $this->errorResponse("Le nano sante n'est pas actif pour ce reseau"); + return $this->errorResponse(__('errors.nano_health_not_activated')); } // executer le script chaque Dimanche a minuit @@ -62,7 +92,7 @@ class InvoiceController extends Controller ->where('created_at', '>=', $start_at)->where('created_at', '<=', $end_at)->orderBy('created_at', 'DESC')->get(); if (sizeof($sheets) == 0) { - return $this->errorResponse("Aucune feuille de soins acceptée"); + return $this->errorResponse(__('errors.no_sheet_accepted')); } foreach ($sheets as $sheet) { @@ -135,7 +165,7 @@ class InvoiceController extends Controller Log::error($t->getMessage() . " :\n" . $t->getTraceAsString()); } - return $this->successResponse("Invoice generated"); + return $this->successResponse(__('messages.invoice_generated')); } /** diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php index 77a6b21..28a0c25 100755 --- a/resources/lang/en/errors.php +++ b/resources/lang/en/errors.php @@ -48,5 +48,6 @@ return [ 'insurance_not_in_order' => "This insurance is not in order", "insurance_expired" => "Your insurance is :state. You cannot perform this operation", 'cannot_renew_insurance' => "Your insurance is not stopped, you cannot renew it", - 'already_insured' => "Vous avez deja souscrit à cette assurance" + 'already_insured' => "Vous avez deja souscrit à cette assurance", + 'no_sheet_accepted' => "No care sheet accepted" ]; diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 4a47431..bd1b684 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -173,4 +173,5 @@ Your insurance has been renewed. - Number of months: :months ", 'insurance_renew_paid' => "Insurance renewal paid", + "invoice_generated" => "Invoice has been generated" ]; diff --git a/resources/lang/fr/errors.php b/resources/lang/fr/errors.php index 5bf3437..8e08cc2 100755 --- a/resources/lang/fr/errors.php +++ b/resources/lang/fr/errors.php @@ -48,5 +48,6 @@ return [ 'insurance_not_in_order' => "Cette assurance n'est pas en règle", "insurance_expired" => "Votre assurance est :state. Vous ne pouvez pas effectuer cette opération", 'cannot_renew_insurance' => "Votre assurance n'est pas en arrêt , vous ne pouvez pas la renouveler", - 'already_insured' => "Vous avez deja souscrit à cette assurance" + 'already_insured' => "Vous avez deja souscrit à cette assurance", + 'no_sheet_accepted' => "Aucune feuille de soins acceptée" ]; diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index d61ee42..55bc497 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -190,4 +190,5 @@ Votre assurance a été renouvelée. - Nombre de mois : :months ", 'insurance_renew_paid' => "Renouvellement de l'assurance payée", + "invoice_generated" => "La facture a été générée" ];