From 00a7989d1c0a6079185e15bd761ce329d2456833 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Thu, 8 Oct 2020 12:51:23 +0100
Subject: [PATCH] + Fix iLinkTransactionController card transaction

---
 .../Controllers/iLinkTransactionController.php     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php
index b437ee0..30958cf 100755
--- a/app/Http/Controllers/iLinkTransactionController.php
+++ b/app/Http/Controllers/iLinkTransactionController.php
@@ -238,6 +238,7 @@ class iLinkTransactionController extends Controller
                         $body['amount'] = $montantDepot;
                         $identification = Identification::where('id_user', $user->id)->first();
                         $body['cardholder_name'] = $identification ? $identification->lastname . ' ' . $identification->firstname : $user->lastname . ' ' . $user->firstname; //"John Smith" ;
+                        dd($body['cardholder_name']);
                         $body['currency'] = $this->getCurrency($init_country);
                         $body['ref'] = date("Y-m-d H:i:s.u");
 
@@ -432,7 +433,7 @@ class iLinkTransactionController extends Controller
 
                     $frais = $request->montant * $config->taux_com_user_carte_wallet / 100;
 
-                    $transaction->montant_net = $montantRetrait = $transaction->montant - $frais;
+                    $transaction->montant_net = $montantRetrait = $transaction->montant + $frais;
 //                    $body['amount'] = $this->toUSDAmount($montantRetrait, $init_country);
                     $body['card_number'] = $user->numero_carte;
                     $body['cvv'] = $request->cvv;
@@ -455,7 +456,7 @@ class iLinkTransactionController extends Controller
                         $transaction->commission_banque = $commissionBanque = $frais * $config->taux_com_banque_retrait_carte_cash_ilink / 100;
                         //Emettre une trame SSL pour recharger le compte de la banque partenaire du montant de sa commission
 
-                        $walletUser->balance += $montantRetrait;
+                        $walletUser->balance += $transaction->montant;
                         $transaction->commission_hyp = $frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100;
                         $walletHyperviseur->balance_com += $transaction->commission_hyp;
                         $transaction->id_wallet_hyp = $walletHyperviseur->id;
@@ -496,7 +497,8 @@ class iLinkTransactionController extends Controller
                     $transaction->final_country = $init_country;
 
                     $frais = $request->montant * $config->taux_com_user_carte_cash / 100;
-                    $transaction->montant_net_final_country = $transaction->montant_net = $montantRetrait = $transaction->montant - $frais;
+                    $transaction->montant_net_final_country = $transaction->montant_net = $transaction->montant;
+                    $montantRetrait = $transaction->montant + $frais;
 //                    $body['amount'] = $this->toUSDAmount($montantRetrait, $init_country);
                     $body['card_number'] = $user->numero_carte;
                     $body['cvv'] = $request->cvv;
@@ -534,8 +536,8 @@ class iLinkTransactionController extends Controller
                         $transaction->save();
                         $message = trans('messages.successful_user_remove_from_cart_to_cash',
                             ['id_transaction' => $transaction->id_transaction, 'amount' => $this->toMoney($transaction->montant, $init_country),
-                                'final_country' => $this->getCountryName($init_country),'init_country' => $this->getCountryName($init_country),
-                                'net' => $this->toMoney($montantRetrait, $init_country), 'fees' => $this->toMoney($frais, $init_country), 'code' => wordwrap($code_retrait, 4, ' ', true),
+                                'final_country' => $this->getCountryName($init_country), 'init_country' => $this->getCountryName($init_country),
+                                'net' => $this->toMoney($transaction->montant, $init_country), 'fees' => $this->toMoney($frais, $init_country), 'code' => wordwrap($code_retrait, 4, ' ', true),
                                 'sender_code' => $user->user_code, 'cart_number' => wordwrap($transaction->numero_carte, 4, ' ', true)]);
                         $this->sendMail($user->email, trans('messages.successful_transaction'), $message);
                         return $this->successResponse($message . trans('messages.sent_by_mail'));
@@ -641,7 +643,7 @@ class iLinkTransactionController extends Controller
                     $transaction->final_country = $init_country;
 
                     $frais = floatval($request->montant * $config->taux_com_wallet_ag_carte_cash / 100);
-                    $montantRetrait = $transaction->montant - $frais;
+                    $montantRetrait = $transaction->montant + $frais;
                     $transaction->montant_net = $montantRetrait;
 //                    $body['amount'] = $this->toUSDAmount($montantRetrait, $init_country);
                     $body['card_number'] = $request->numero_carte;