From 28cab4b3970b588d2081328954b2f967ff174c3c Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Fri, 3 Jul 2020 20:53:34 +0100
Subject: [PATCH] + Update method Agent - Envoi de cash vers cash

---
 .../iLinkTransactionController.php            | 43 +++++++------------
 app/Models/WalletIlinkTransaction.php         |  1 +
 resources/lang/fr/messages.php                |  2 +-
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php
index 2d6ccc3..f4cc0ed 100755
--- a/app/Http/Controllers/iLinkTransactionController.php
+++ b/app/Http/Controllers/iLinkTransactionController.php
@@ -130,14 +130,11 @@ class iLinkTransactionController extends Controller
                         $transaction->taxe = $taxe = ($init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
                         $transaction->montant_net = $montantDepot = $transaction->montant - $frais - $taxe;
                         $configPayeur = ConfigWallet::where('id_network', $request->network_destinataire)->firstOrFail();
-                        if ($init_country != $request->final_country) {
-                            $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
-                            $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
-                            $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
-                        } else {
-                            $transaction->part_reseau_payeur = 0;
-                            $transaction->part_reseau_emetteur = $frais;
-                        }
+
+                        $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
+                        $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
+                        $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
+
                         $transaction->montant_net_final_country = $this->toMoneyAmount($montantDepot, $init_country, $request->final_country);
                         $transaction->commission_hyp = $transaction->part_reseau_emetteur;
                         $transaction->part_reseau_payeur_final_country = $this->toMoneyAmount($transaction->part_reseau_payeur, $init_country, $request->final_country);
@@ -260,14 +257,11 @@ class iLinkTransactionController extends Controller
                         $transaction->taxe = $taxe = ($init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
                         $transaction->montant_net = $montantRetrait = $transaction->montant - $frais - $taxe;
                         $configPayeur = ConfigWallet::where('id_network', $request->network_destinataire)->firstOrFail();
-                        if ($init_country != $request->final_country) {
-                            $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
-                            $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
-                            $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
-                        } else {
-                            $transaction->part_reseau_payeur = 0;
-                            $transaction->part_reseau_emetteur = $frais;
-                        }
+
+                        $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
+                        $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
+                        $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
+
                         $transaction->montant_net_final_country = $this->toMoneyAmount($montantRetrait, $init_country, $request->final_country);
                         $transaction->commission_hyp = $transaction->part_reseau_emetteur;
                         $transaction->commission_hyp_final_country = $this->toMoneyAmount($transaction->commission_hyp, $init_country, $request->final_country);
@@ -653,9 +647,7 @@ class iLinkTransactionController extends Controller
                 }
                 break;
             case 15: // Agent - Envoi de cash vers autre wallet
-                $this->validate($request, array_merge($transaction->cash_cash_rules(), [
-                    'network_destinataire' => 'required|integer|min:0|not_in:0'
-                ]));
+                $this->validate($request, $transaction->cash_cash_rules());
                 $agent = AgentPlus::findOrFail($network_agent->agent_id);
                 if ($this->checkPassword($request->password, $agent->encrypted_password, $agent->salt)) {
                     if ($request->montant > $walletAgent->balance_princ)
@@ -787,14 +779,11 @@ class iLinkTransactionController extends Controller
                     $transaction->montant_net_final_country = $this->toMoneyAmount($transaction->montant_net, $init_country, $request->final_country);
 
                     $configPayeur = ConfigWallet::where('id_network', $request->network_destinataire)->firstOrFail();
-                    if ($init_country != $request->final_country) {
-                        $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
-                        $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
-                        $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
-                    } else {
-                        $transaction->part_reseau_payeur = 0;
-                        $transaction->part_reseau_emetteur = $frais;
-                    }
+
+                    $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
+                    $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
+                    $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
+
 
                     $transaction->part_reseau_payeur_final_country = $this->toMoneyAmount($transaction->part_reseau_payeur, $init_country, $request->final_country);
                     if (isset($reseauPayeur))
diff --git a/app/Models/WalletIlinkTransaction.php b/app/Models/WalletIlinkTransaction.php
index 19e16e5..3212e27 100644
--- a/app/Models/WalletIlinkTransaction.php
+++ b/app/Models/WalletIlinkTransaction.php
@@ -206,6 +206,7 @@ class WalletIlinkTransaction extends Model
     {
         return [
             'final_country' =>'required|integer|min:0|not_in:0',
+            'network_destinataire' => 'required|integer|min:0|not_in:0',
             'nom_emetteur'=>'required',
             'prenom_emetteur'=>'required',
             'type_document_emetteur'=>'required',
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index ad7d06f..cbdbbc7 100755
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -39,7 +39,7 @@ Informations de la transaction :
   - Pays de destination : :final_country
   - Montant net : :net_final
   - Compte destinataire : :user_code',
-    'successful_agent_deposit_other_wallet' => 'Dépot d\'argent vers un autre compte
+    'successful_agent_deposit_other_wallet' => 'Dépot d\'argent vers un compte autre réseau
 Informations de la transaction :
   - Transaction ID : :id_transaction
   - Montant : :amount