From f9be26c76bebbb0df0235ed3617d09cbe8d14f65 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Thu, 2 Jul 2020 21:57:18 +0100
Subject: [PATCH] + Fix bug on Agent - Retrait en cash v4

---
 app/Http/Controllers/iLinkTransactionController.php |  8 ++++----
 resources/lang/fr/messages.php                      | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php
index b970cb2..52248b2 100755
--- a/app/Http/Controllers/iLinkTransactionController.php
+++ b/app/Http/Controllers/iLinkTransactionController.php
@@ -614,7 +614,7 @@ class iLinkTransactionController extends Controller
                     $commisionAgent = floatval($frais * $config->taux_com_ag_envoi_cash / 100);
                     $commisionSuper = floatval($frais * $config->taux_com_sup_envoi_cash / 100);
                     $commisionHyper = floatval($frais * $config->taux_com_hyp_envoi_cash / 100);
-                    $walletAgent->balance_princ -= $transaction->montant;
+
                     $walletAgent->balance_com += $commisionAgent;
                     $transaction->commission_ag = $commisionAgent;
                     $walletSuperviseur->balance_com += $commisionSuper;
@@ -635,9 +635,9 @@ class iLinkTransactionController extends Controller
                     $transaction->id_transaction = $this->getTransactionID();
                     $transaction->save();
                     $message = trans('messages.successful_deposit_ilink',
-                        ['id_transaction' => $transaction->id, 'amount' => $this->toMoney($transaction->montant, $init_country), 'net_init' => $this->toMoney($montantDepot, $init_country),
-                            'net_final' => $this->toMoneyWithCurrency($montantDepot, $init_country, $final_country), 'fees' => $this->toMoney($frais, $init_country), 'tax' => $this->toMoney($taxe, $init_country),
-                            'user_code' => $request->user_code]);
+                        ['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, $final_country), 'fees' => $this->toMoney($frais + $taxe, $init_country), 'init_country' => $this->getCountryName($init_country),
+                            'final_country' => $this->getCountryName($final_country), 'user_code' => $request->user_code]);
                     $this->sendMail($user->email, trans('messages.successful_transaction'), $message);
                     return $this->successResponse($message . trans('messages.sent_by_mail'));
                 } else {
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index 6a811eb..2478078 100755
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -32,11 +32,13 @@ Equipe iLinkWorld.',
     'successful_deposit_ilink' => 'Dépot vers un wallet iLink. Code de l\'utilisateur : :user_code
 Informations de la transaction :
   - Transaction ID : :id_transaction
-  - Montant de la transaction : :amount
-  - Montant net du pays de départ : :net_init
-  - Montant net du pays de destination : :net_final
-  - Frais : :fees
-  - Taxe : :tax',
+  - Montant : :amount
+  - Frais et Taxes : :fees
+  - Pays de départ : :init_country
+  - Montant net : :net_init
+  - Montant net : :net_final
+  - Pays de destination : :final_country
+  - Compte destinataire : :user_code',
     'successful_send_cash' => 'Envoi d\'argent effectué par :sender_name à :receiver_name.
 Informations de la transaction :
   - Transaction ID : :id_transaction