diff --git a/app/Http/Controllers/InsuranceController.php b/app/Http/Controllers/InsuranceController.php index 4fc785b..73f0014 100644 --- a/app/Http/Controllers/InsuranceController.php +++ b/app/Http/Controllers/InsuranceController.php @@ -128,7 +128,7 @@ class InsuranceController extends Controller * example = {{"birthdate":"1998-10-05","affiliation":"CHILD"}} * ), * ), - * example = {"network_id":250,"month_price_id":3,"beneficiaries":{{"birthdate":"1998-10-05","affiliation":"CHILD"}}} + * example = {"subscription_id":7,"network_id":250,"month_price_id":3,"beneficiaries":{{"birthdate":"1998-10-05","affiliation":"CHILD"}}} * ) * ), * @OA\Response( @@ -409,7 +409,8 @@ class InsuranceController extends Controller Event::dispatch(new InsuranceEvent($subscription, trans('messages.insurance_subscription'), trans('messages.insurance_subscription_mail', ['name' => $subscription->user->lastname, 'subscription_id' => $subscription->insurance_subscription_id, - 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'number_of_beneficiaries' => $subscription->number_of_beneficiaries]))); + 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'number_of_beneficiaries' => $subscription->number_of_beneficiaries, + 'gender' => trans('states.' . $identification->gender), 'insurance_name' => $networkConfig->network->name]))); DB::commit(); return $this->successResponse(trans('messages.insurance_subscription_successful')); @@ -491,8 +492,8 @@ class InsuranceController extends Controller ]); Event::dispatch(new InsuranceEvent($subscription, trans('messages.insurance_subscription_accepted'), trans('messages.insurance_subscription_accepted_mail', ['name' => $subscription->user->lastname, 'subscription_id' => $subscription->insurance_subscription_id, - 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'user_code' => $subscription->user->user_code, - 'number_of_beneficiaries' => $subscription->number_of_beneficiaries]), trans('messages.insurance_subscription_accepted_notification', ['subscription_id' => $subscription->insurance_subscription_id]))); + 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'user_code' => $subscription->user->user_code, 'number_of_beneficiaries' => $subscription->number_of_beneficiaries, + 'gender' => trans('states.' . $subscription->user->identification->gender), 'insurance_name' => $subscription->network->name]), trans('messages.insurance_subscription_accepted_notification', ['subscription_id' => $subscription->insurance_subscription_id]))); DB::commit(); return $this->successResponse(trans('messages.successful_transaction')); } catch (Throwable $e) { @@ -525,8 +526,8 @@ class InsuranceController extends Controller ]); Event::dispatch(new InsuranceEvent($subscription, trans('messages.insurance_subscription_rejected'), trans('messages.insurance_subscription_rejected_mail', ['name' => $subscription->user->lastname, 'subscription_id' => $subscription->insurance_subscription_id, - 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'reason' => $request->input('reason'), - 'number_of_beneficiaries' => $subscription->number_of_beneficiaries]), trans('messages.insurance_subscription_rejected_notification', ['subscription_id' => $subscription->insurance_subscription_id]))); + 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'reason' => $request->input('reason'), 'number_of_beneficiaries' => $subscription->number_of_beneficiaries, + 'gender' => trans('states.' . $subscription->user->identification->gender), 'insurance_name' => $subscription->network->name]), trans('messages.insurance_subscription_rejected_notification', ['subscription_id' => $subscription->insurance_subscription_id]))); DB::commit(); return $this->successResponse(trans('messages.successful_transaction')); } catch (Throwable $e) { @@ -734,7 +735,8 @@ class InsuranceController extends Controller ]); Event::dispatch(new InsuranceEvent($subscription, trans('messages.insurance_subscription_updated'), trans('messages.insurance_subscription_mail', ['name' => $subscription->user->lastname, 'subscription_id' => $subscription->insurance_subscription_id, - 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'number_of_beneficiaries' => $subscription->number_of_beneficiaries]))); + 'bonus_amount' => $this->toMoneyWithNetwork($subscription->total_bonus_amount, $subscription->network_id), 'number_of_beneficiaries' => $subscription->number_of_beneficiaries, + 'gender' => trans('states.' . $identification->gender), 'insurance_name' => $networkConfig->network->name]))); DB::commit(); return $this->successResponse(trans('messages.insurance_subscription_updated_successful')); diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 5e08532..3410a5e 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -17,20 +17,22 @@ return [ 'identification_already_validated' => 'Identification already validated', 'successful_card_attachment' => 'Attachment of your card made', 'insurance_subscription' => "Insurance subscription", - 'insurance_subscription_mail' => "Mr/Ms :name, + 'insurance_subscription_mail' => ":gender :name, Your subscription request is being validated. Request Information: - ID: :subscription_id + - Name of the insurance: :insurance_name - Bonus amount: :bonus_amount - Number of beneficiaries: :number_of_beneficiaries ", 'insurance_subscription_accepted' => "Insurance subscription accepted", - 'insurance_subscription_accepted_mail' => "Mr/Mrs :name , + 'insurance_subscription_accepted_mail' => ":gender :name , Your application has been accepted. Application information : - ID: :subscription_id + - Name of the insurance: :insurance_name - Policyholder number: :user_code - Amount to be paid: :bonus_amount - Number of beneficiaries : :number_of_beneficiaries @@ -40,11 +42,12 @@ Your application has been accepted. 'insurance_subscription_accepted_notification' => "Your :subscription_id application has been accepted. Please ensure that your wallet has sufficient credit to activate your insurance", 'insurance_subscription_rejected' => "Insurance subscription rejected", - 'insurance_subscription_rejected_mail' => "Mr/Mrs :name , + 'insurance_subscription_rejected_mail' => ":gender :name , Your application has been rejected. Application information : - ID: :subscription_id + - Name of the insurance: :insurance_name - Premium amount: :bonus_amount - Number of beneficiaries : :number_of_beneficiaries diff --git a/resources/lang/en/states.php b/resources/lang/en/states.php index 4675554..7218bbe 100755 --- a/resources/lang/en/states.php +++ b/resources/lang/en/states.php @@ -8,8 +8,8 @@ return [ "STOPPED" => "STOPPED", "CHILD" => "CHILD", "SPOUSE" => "SPOUSE", - "BLOQUE" => "BLOCKED", - "NON_TRAITEE" => "NOT TREATED", + "M" => "Mr", + "F" => "Mrs", "TRAITEE" => "TREATED", "groupe" => 'GROUP', "individuel" => "INDIVIDUAL" diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index 692c0f6..28f16ce 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -17,20 +17,22 @@ return [ 'identification_already_validated' => 'Identification deja validée', 'successful_card_attachment' => 'Rattachement de votre carte effectuée', 'insurance_subscription' => "Souscription à l'assurance", - 'insurance_subscription_mail' => "M/Mme :name , + 'insurance_subscription_mail' => ":gender :name , Votre demande de souscription est en cours de validation. Informations de la demande : - ID : :subscription_id + - Nom de l'assurance : :insurance_name - Montant de la prime : :bonus_amount - Nombre d'ayants droit : :number_of_beneficiaries ", 'insurance_subscription_accepted' => "Souscription à l'assurance acceptée", - 'insurance_subscription_accepted_mail' => "M/Mme :name , + 'insurance_subscription_accepted_mail' => ":gender :name , Votre demande de souscription a été acceptée. Informations de la demande : - ID : :subscription_id + - Nom de l'assurance : :insurance_name - Numéro d'assuré : :user_code - Montant à payer : :bonus_amount - Nombre d'ayants droit : :number_of_beneficiaries @@ -40,11 +42,12 @@ Votre demande de souscription a été acceptée. 'insurance_subscription_accepted_notification' => "Votre demande de souscription :subscription_id a été acceptée. Assurer-vous que votre wallet a le crédit suffisant pour activer votre assurance", 'insurance_subscription_rejected' => "Souscription à l'assurance rejetée", - 'insurance_subscription_rejected_mail' => "M/Mme :name , + 'insurance_subscription_rejected_mail' => ":gender :name , Votre demande de souscription a été rejetée. Informations de la demande : - ID : :subscription_id + - Nom de l'assurance : :insurance_name - Montant de la prime : :bonus_amount - Nombre d'ayants droit : :number_of_beneficiaries diff --git a/resources/lang/fr/states.php b/resources/lang/fr/states.php index 1c299bd..3fa8fe5 100755 --- a/resources/lang/fr/states.php +++ b/resources/lang/fr/states.php @@ -8,8 +8,8 @@ return [ "STOPPED" => "ARRÊTÉE", "CHILD" => "ENFANT", "SPOUSE" => "CONJOINT", - "BLOQUE" => "BLOQUÉE", - "NON_TRAITEE" => "NON_TRAITÉE", + "M" => "M", + "F" => "Mme", "TRAITEE" => "TRAITÉE", "groupe" => 'GROUPE', "individuel" => "INDIVIDUEL"