From 99add796e4a08880522283cec5f299ebf59964e5 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Wed, 8 Jul 2020 19:34:09 +0100 Subject: [PATCH] + Add paying network in messages --- app/Http/Controllers/iLinkTransactionController.php | 9 +++++---- resources/lang/en/messages.php | 6 +++++- resources/lang/fr/messages.php | 6 +++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php index 5d9164b..ee608e8 100755 --- a/app/Http/Controllers/iLinkTransactionController.php +++ b/app/Http/Controllers/iLinkTransactionController.php @@ -191,7 +191,7 @@ class iLinkTransactionController extends Controller ['id_transaction' => $transaction->id_transaction, 'amount' => $this->toMoney($transaction->montant, $init_country), 'net_init' => $this->toMoney($montantDepot, $init_country), 'net_final' => $this->toMoneyWithCurrency($montantDepot, $init_country, $request->final_country), 'fees' => $this->toMoney($frais + $taxe, $init_country), 'init_country' => $this->getCountryName($init_country), 'final_country' => $this->getCountryName($request->final_country), - 'sender_code' => $user->user_code, 'receiver_code' => $transaction->id_destinataire]); + 'sender_code' => $user->user_code, 'receiver_code' => $transaction->id_destinataire,'network'=> $this->getNetworkName($transaction->network_destinataire)]); $this->sendMail($user->email, trans('messages.successful_transaction'), $message); return $this->successResponse($message . trans('messages.sent_by_mail')); } @@ -318,7 +318,7 @@ class iLinkTransactionController extends Controller 'net_final' => $this->toMoneyWithCurrency($montantRetrait, $init_country, $request->final_country), 'fees' => $this->toMoney($frais + $taxe, $init_country), 'init_country' => $this->getCountryName($init_country), 'final_country' => $this->getCountryName($request->final_country), 'code' => wordwrap($code_retrait, 4, ' ', true), 'sender_code' => $user->user_code, 'receiver_code' => $transaction->id_destinataire, 'receiver_name' => $request->prenom_destinataire . ' ' . $request->nom_destinataire, - 'sender_name'=> $user->lastname.' '.$user->firstname]); + 'sender_name'=> $user->lastname.' '.$user->firstname,'network'=> $this->getNetworkName($transaction->network_destinataire)]); $this->sendMail($user->email, trans('messages.successful_transaction'), $message); return $this->successResponse($message . trans('messages.sent_by_mail')); } @@ -725,7 +725,7 @@ class iLinkTransactionController extends Controller $message = trans('messages.successful_agent_deposit_other_wallet', ['id_transaction' => $transaction->id_transaction, 'amount' => $this->toMoney($transaction->montant, $init_country), 'net_init' => $this->toMoney($montantDepot, $init_country), 'net_final' => $this->toMoneyWithCurrency($montantDepot, $init_country, $request->final_country), 'fees' => $this->toMoney($frais + $taxe, $init_country), 'init_country' => $this->getCountryName($init_country), - 'final_country' => $this->getCountryName($request->final_country), 'receiver_code' => $request->id_destinataire, + 'final_country' => $this->getCountryName($request->final_country), 'receiver_code' => $request->id_destinataire,'network'=> $this->getNetworkName($transaction->network_destinataire), 'sender_name' => $request->prenom_emetteur . ' ' . $request->nom_emetteur, 'receiver_name' => $request->prenom_destinataire . ' ' . $request->nom_destinataire,]); $this->sendMail($request->email_emetteur, trans('messages.successful_transaction'), $message); return $this->successResponse($message . trans('messages.sent_by_mail')); @@ -877,7 +877,8 @@ class iLinkTransactionController extends Controller ['sender_name' => $request->prenom_emetteur . ' ' . $request->nom_emetteur, 'receiver_name' => $request->prenom_destinataire . ' ' . $request->nom_destinataire, 'id_transaction' => $transaction->id_transaction, 'amount' => $this->toMoney($transaction->montant, $init_country), 'net_init' => $this->toMoney($montantRetrait, $init_country), 'net_final' => $this->toMoneyWithCurrency($montantRetrait, $init_country, $request->final_country), 'fees' => $this->toMoney($frais + $taxe, $init_country), 'init_country' => $this->getCountryName($init_country), - 'final_country' => $this->getCountryName($request->final_country), 'code' => wordwrap($code_retrait, 4, ' ', true)]); + 'final_country' => $this->getCountryName($request->final_country), 'code' => wordwrap($code_retrait, 4, ' ', true), + 'network'=> $this->getNetworkName($transaction->network_destinataire)]); $this->sendMail($request->email_emetteur, trans('messages.successful_transaction'), $message); return $this->successResponse($message . trans('messages.sent_by_mail')); } else { diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 4ebc755..ee7ee81 100755 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -29,7 +29,7 @@ Welcome to the iLink World family !!! Regards, ILinkWorld team.', - 'successful_agent_deposit_wallet_ilink' => 'Depositing money to an iLink account + 'successful_agent_deposit_wallet_ilink' => 'Depositing money to an iLink World account Transaction information : - Transaction ID : :id_transaction - Amount : :amount @@ -48,6 +48,7 @@ Transaction information : - Issuer names : :sender_name - Net amount : :net_init - Country of destination : :final_country + - Paying network : :network :final_country - Recipient names : :receiver_name - Net amount : :net_final - Recipient account : :receiver_code', @@ -60,6 +61,7 @@ Transaction information: - Issuer names : :sender_name - Net amount : :net_init - Country of destination : :final_country + - Paying network : :network :final_country - Recipient names : :receiver_name - Net amount : :net_final - Withdrawal code : :code', @@ -72,6 +74,7 @@ Transaction information : - Issuer account : :sender_code - Net amount : :net_init - Country of destination : :final_country + - Paying network : :network :final_country - Recipient account : :receiver_code - Net amount : :net_final', 'sent_by_mail' => ' @@ -95,6 +98,7 @@ Transaction information : - Issuer names : :sender_name - Net amount: :net_init - Country of destination: :final_country + - Paying network : :network :final_country - Recipient names: :receiver_name - Net amount: :net_final - Withdrawal code: :code ', diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php index 85d39b0..6d62486 100755 --- a/resources/lang/fr/messages.php +++ b/resources/lang/fr/messages.php @@ -29,7 +29,7 @@ Bienvenue dans la famille iLink World !!! Cordialement, Equipe iLinkWorld.', - 'successful_agent_deposit_wallet_ilink' => 'Dépot d\'argent vers un compte iLink + 'successful_agent_deposit_wallet_ilink' => 'Dépot d\'argent vers un compte iLink World Informations de la transaction : - Transaction ID : :id_transaction - Montant : :amount @@ -48,6 +48,7 @@ Informations de la transaction : - Noms de l\'emetteur : :sender_name - Montant net : :net_init - Pays de destination : :final_country + - Réseau payeur : :network :final_country - Noms du destinataire : :receiver_name - Montant net : :net_final - Compte destinataire : :receiver_code', @@ -60,6 +61,7 @@ Informations de la transaction : - Noms de l\'emetteur : :sender_name - Montant net : :net_init - Pays de destination : :final_country + - Réseau payeur : :network :final_country - Noms du destinataire : :receiver_name - Montant net : :net_final - Code de retrait : :code', @@ -72,6 +74,7 @@ Informations de la transaction : - Compte émetteur : :sender_code - Montant net : :net_init - Pays de destination : :final_country + - Réseau payeur : :network :final_country - Compte destinataire : :receiver_code - Montant net : :net_final', 'sent_by_mail' => ' @@ -95,6 +98,7 @@ Informations de la transaction : - Noms de l\'emetteur : :sender_name - Montant net : :net_init - Pays de destination : :final_country + - Réseau payeur : :network :final_country - Noms du destinataire : :receiver_name - Montant net : :net_final - Code de retrait : :code',