+ Update Transmitter network requests

app/Exceptions/Handler.php

@@ -81,8 +81,14 @@ class Handler extends ExceptionHandler
         if($exception instanceof ValidationException)
         {
             $errors = $exception->validator->errors()->getMessages();
-
+            $message = '';
-            return $this->errorResponse($errors, Response::HTTP_UNPROCESSABLE_ENTITY);
+            foreach ($errors as $key => $val) {
+                foreach ($val as $validation) {
+                    $message .= trans('errors.validation_error', ['field' => $key, 'validation' => $validation]);
+                }
+                $message .= "\n";
+            }
+            return $this->errorResponse($message, Response::HTTP_UNPROCESSABLE_ENTITY);
         }
 
 

app/Http/Controllers/TransmittingNetworksController.php

@@ -179,7 +179,9 @@ class TransmittingNetworksController extends Controller
                 $transaction->save();
 
                 $message = trans('messages.wallet_incoming_payment_message',
-                    ['amount' => $this->toMoneyWithNetwork($request->montant, $request->id), 'transmitter' => $request->nom_emetteur . ' ' . $request->prenom_emetteur]);
+                    ['id_transaction' => $transaction->id_transaction, 'amount' => $this->toMoneyWithNetwork($request->montant, $request->id),
+                        'sender_name' => $request->nom_emetteur . ' ' . $request->prenom_emetteur, 'init_country' => $initNetwork->country->name, 'sender_code' => $request->id_emetteur,
+                        'final_country' => $finalNetwork->country->name, 'network' => $initNetwork->name, 'receiver_code' => $request->id_destinataire]);
 
                 $this->sendMail($destinataire->email, trans('messages.wallet_incoming_payment'), $message);
                 return $this->successResponse(trans('messages.success_treated_demand'));
@@ -196,7 +198,7 @@ class TransmittingNetworksController extends Controller
                     'type_document_destinataire' => 'required',
                     'id_document_destinataire' => 'required',
                     'email_destinataire' => 'required',
-                    'code_retrait' => 'required'
+                    'code_retrait' => 'required|size:16'
                 ]);
 
                 $hash = $this->hashSSHA($request->code_retrait);
@@ -214,7 +216,7 @@ class TransmittingNetworksController extends Controller
                     ['amount' => $this->toMoneyWithNetwork($request->montant, $request->id), 'id_transaction' => $transaction->id_transaction,
                         'sender_name' => $request->nom_emetteur . ' ' . $request->prenom_emetteur, 'receiver_name' => $request->nom_destinataire . ' ' . $request->prenom_destinataire,
                         'code' => wordwrap($request->code_retrait, 4, ' ', true), 'init_country' => $initNetwork->country->name,
-                        'final_country' => $finalNetwork->country->name]);
+                        'final_country' => $finalNetwork->country->name, 'network' => $initNetwork->name]);
 
                 $this->sendMail($request->email_destinataire, trans('messages.cash_incoming_payment'), $message);
                 return $this->successResponse(trans('messages.success_treated_demand'));

app/Http/Controllers/iLinkTransactionController.php

@@ -616,13 +616,17 @@ class iLinkTransactionController extends Controller
                                     $transaction->status_retrait = 1;
                                     $transaction->date_retrait = new \DateTime();
                                     $transactionRetrait->date = new \DateTime();
+                                    //Si la transaction provient du reseau emetteur
+                                    if ($transaction->from_network_emetteur) {
+                                        $transaction->status_reseau_payeur = 'TRAITEE';
+                                    }
                                     $walletAgent->save();
                                     $walletSuperviseur->save();
                                     $walletHyperviseur->save();
                                     $transaction->save();
                                     $transactionRetrait->save();
                                     $message = trans('messages.successful_agent_remove_cash',
-                                        ['id_transaction' => $transactionRetrait->id_transaction, 'amount' => $this->toMoney($request->montant, $init_country),'init_country' => $this->getCountryName($transaction->init_country),
+                                        ['id_transaction' => $transactionRetrait->id_transaction, 'amount' => $this->toMoney($request->montant, $init_country), 'init_country' => $this->getCountryName($transaction->init_country),
                                             'code' => wordwrap($request->code_retrait, 4, ' ', true), 'final_country' => $this->getCountryName($transaction->final_country),
                                             'sender_name' => $emetteur, 'receiver_name' => $destinataire, 'id_transaction_retrait' => $transaction->id_transaction]);
                                     $this->sendMail($emailEmetteur, trans('messages.successful_transaction'), $message);

resources/lang/en/errors.php

@@ -1,16 +1,17 @@
 <?php
 return [
     'model_not_found' => 'Does not exist any instance of :model with given id',
-    'unexpected_error'=> 'Unexpected error. Try later',
+    'unexpected_error' => 'Unexpected error. Try later',
+    'validation_error' => 'The field :field has :validation',
     'service_unavailable' => 'Service unavailable',
     'invalid_cvv' => 'Invalid CVV',
     'compression_failed' => 'Image compression failed!',
     'identification_carried_out' => 'Identification already carried out',
-    'visa_api_failed'=> 'Request to API visa failed',
+    'visa_api_failed' => 'Request to API visa failed',
     'failed_transaction' => 'Failed transaction',
     'user_phone_not_exist' => 'This customer number does not exist',
     'wallet_not_defined' => 'This recipient wallet code does not exist',
-    'insufficient_balance'=> 'The balance is insufficient to complete this transaction',
+    'insufficient_balance' => 'The balance is insufficient to complete this transaction',
     'no_ilink_network' => 'Sorry, there is no iLink World network in your country',
     'wallet_country_not_match' => 'This recipient wallet code is not registered in the country :country',
     'no_bank_card_attached' => 'No bank card is attached to your account',

resources/lang/en/messages.php

@@ -248,13 +248,24 @@ Savings Information :
     "your_new_password" => "Your new password is: password.",
     "password_update" => "Update your password",
     "wallet_incoming_payment" => "Payment entering your wallet",
-    "wallet_incoming_payment_message" => "You have received a payment of :amount, coming from :transmitter",
+    "wallet_incoming_payment_message" => "
+You have received a payment entering your wallet
+Transaction Information:
+   - Number: :id_transaction
+   - Amount: :amount
+   - Country of departure: :init_country
+   - Transmitter network: :network: final_country
+   - Issuer account: :sender_code
+   - Name of the sender: :sender_name
+   - Country of destination: :final_country
+   - Recipient account: :receiver_code",
     "cash_incoming_payment" => "Incoming payment in cash.",
     "cash_incoming_payment_message" => "You have received a cash payment.
 Transaction Information:
    - Transaction ID: :id_transaction
    - Amount: :amount
    - Country of departure: :init_country
+   - Transmitter network: :network: final_country
    - Name of the sender: :sender_name
    - Country of destination: :final_country
    - Recipient's names: :receiver_name

resources/lang/fr/errors.php

@@ -1,16 +1,17 @@
 <?php
 return [
     'model_not_found' => 'Il n\'existe aucune instance de :model avec l\'id donné',
-    'unexpected_error'=> 'Erreur inattendue. Essayer plus tard',
+    'unexpected_error' => 'Erreur inattendue. Essayer plus tard',
+    'validation_error' => 'Le champ :field a :validation',
     'service_unavailable' => 'Service non disponible',
     'invalid_cvv' => 'CVV invalide',
     'compression_failed' => 'Échec de la compression d\'image',
     'identification_carried_out' => 'Identification déjà éffectuée',
-    'visa_api_failed'=> 'La requete vers l\'api visa a échouée',
+    'visa_api_failed' => 'La requete vers l\'api visa a échouée',
     'failed_transaction' => 'Transaction échouée',
     'user_phone_not_exist' => 'Ce numéro client n\'existe pas',
     'wallet_not_defined' => 'Ce code wallet destinataire n\'existe pas',
-    'insufficient_balance'=> 'Le solde est insuffisant pour effectuer cette transaction',
+    'insufficient_balance' => 'Le solde est insuffisant pour effectuer cette transaction',
     'no_ilink_network' => 'Désolé , il n\'existe pas de reseau iLink World dans votre pays',
     'wallet_country_not_match' => 'Ce code wallet destinataire n\'est pas enregistré dans le pays :country',
     'no_bank_card_attached' => 'Aucune carte bancaire n\'est rattachée à votre compte',

resources/lang/fr/messages.php

@@ -250,13 +250,23 @@ Informations sur l'epargne :
     "your_new_password" => "Votre nouveau mot de passe est :password.",
     "password_update" => "Mise à jour de votre mot de passe",
     "wallet_incoming_payment" => "Paiement entrant dans votre portefeuille",
-    "wallet_incoming_payment_message" => "Vous avez recu un paiement de :amount , venant de :transmitter",
+    "wallet_incoming_payment_message" => "Vous avez recu un paiement entrant dans votre portefeuille
+Informations de la transaction :
+  - Numéro : :id_transaction
+  - Montant : :amount
+  - Pays de départ : :init_country
+  - Réseau emetteur : :network :final_country
+  - Compte émetteur : :sender_code
+  - Noms de l'emetteur : :sender_name
+  - Pays de destination : :final_country
+  - Compte destinataire : :receiver_code",
     "cash_incoming_payment" => "Paiement entrant en cash.",
     "cash_incoming_payment_message" => "Vous avez recu un paiement en cash.
 Informations de la transaction :
   - Transaction ID : :id_transaction
   - Montant : :amount
   - Pays de départ : :init_country
+  - Réseau emetteur : :network :final_country
   - Noms de l'emetteur : :sender_name
   - Pays de destination : :final_country
   - Noms du destinataire : :receiver_name