From f276bba89906a4682b2d293ef6990ad130d79f12 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Fri, 30 Oct 2020 13:26:26 +0100
Subject: [PATCH] + Update receive payment from transmitter network v1

---
 .../Controllers/TransmittingNetworksController.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/TransmittingNetworksController.php b/app/Http/Controllers/TransmittingNetworksController.php
index ee255e2..6dc0170 100755
--- a/app/Http/Controllers/TransmittingNetworksController.php
+++ b/app/Http/Controllers/TransmittingNetworksController.php
@@ -93,6 +93,10 @@ class TransmittingNetworksController extends Controller
         $this->validate($request, [
             'type' => 'required|integer|in:1,17', // Les types de transactions possibles à recevoir [1,3,17]
             'montant' => 'required|numeric|min:0|not_in:0',
+            'frais' => 'required|numeric|min:0|not_in:0',
+            'taxe' => 'required|numeric|min:0|not_in:0',
+            'part_reseau_emetteur' => 'required|numeric|min:0|not_in:0',
+            'part_reseau_payeur' => 'required|numeric|min:0|not_in:0',
             'montant_commission' => 'required|numeric|min:0|not_in:0',
             'network_emetteur' => 'required|numeric|min:0|not_in:0',
             'network_destinataire' => 'required|numeric|min:0|not_in:0',
@@ -123,7 +127,6 @@ class TransmittingNetworksController extends Controller
         $transaction->fill($request->all());
         $transaction->id_transaction = $this->getTransactionID();
         $transaction->from_network_emetteur = true;
-        $transaction->frais = 0;
 
         //Hyperviseur destinataire
         $hyperviseurDestinataire = WalletAgent::where('category', 'hyper')->where('network_id', $request->network_destinataire)->firstOrFail();
@@ -133,7 +136,9 @@ class TransmittingNetworksController extends Controller
         $transaction->final_country = $finalNetwork->country->id;
         $initNetwork = Network::findOrFail($request->network_emetteur);
         $transaction->init_country = $initNetwork->country->id;
-        $transaction->montant_net = $request->montant;
+        $transaction->montant_net = $transaction->montant_net_final_country = $request->montant;
+        $transaction->part_reseau_payeur_final_country = $transaction->part_reseau_payeur;
+        $transaction->status_reseau_payeur = 'EN_COURS';
 
         switch ($request->type) {
             case 1:
@@ -169,7 +174,8 @@ class TransmittingNetworksController extends Controller
                 $transmittingNetwork->balance_com += $request->montant_commission;
                 $transmittingNetwork->save();
 
-                $transaction->commission_hyp = $request->montant_commission;
+                $transaction->commission_hyp = $transaction->commission_hyp_final_country = $request->montant_commission;
+                $transaction->status_reseau_payeur = 'TRAITEE';
                 $transaction->save();
 
                 $message = trans('messages.wallet_incoming_payment_message',
@@ -200,7 +206,7 @@ class TransmittingNetworksController extends Controller
 
                 $transaction->commission_ag = floatval($request->montant_commission * $configRecipient->taux_com_ag_envoi_cash / 100);
                 $transaction->commission_sup = floatval($request->montant_commission * $configRecipient->taux_com_sup_envoi_cash / 100);
-                $transaction->commission_hyp = floatval($request->montant_commission * $configRecipient->taux_com_hyp_envoi_cash / 100);
+                $transaction->commission_hyp = $transaction->commission_hyp_final_country = floatval($request->montant_commission * $configRecipient->taux_com_hyp_envoi_cash / 100);
 
                 $transaction->save();