From 6413707377eae3ed8486d10c412136b7466ea820 Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Sat, 4 Jul 2020 15:51:59 +0100
Subject: [PATCH] + Update method for checking Retrait

---
 .../iLinkTransactionController.php            | 19 +++++++++++--------
 resources/lang/en/errors.php                  |  2 ++
 resources/lang/fr/errors.php                  |  2 ++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php
index 88f8980..1950c77 100755
--- a/app/Http/Controllers/iLinkTransactionController.php
+++ b/app/Http/Controllers/iLinkTransactionController.php
@@ -1078,7 +1078,7 @@ class iLinkTransactionController extends Controller
             'id_wallet_agent' => 'required|integer|min:0|not_in:0',
         ]);
         $transaction = WalletIlinkTransaction::select('nom_destinataire', 'prenom_destinataire', 'type_document_destinataire', 'id_document_destinataire', 'type',
-            'id_wallet_user', 'init_country', 'final_country', 'network_destinataire')->where('id_transaction', $request->id_transaction)->first();
+            'id_wallet_user', 'init_country', 'final_country', 'network_destinataire' ,'id_transaction')->where('id_transaction', $request->id_transaction)->first();
 
         if (!$transaction)
             return $this->errorResponse(trans('errors.transaction_not_exist'), Response::HTTP_NOT_FOUND);
@@ -1101,16 +1101,19 @@ class iLinkTransactionController extends Controller
 
         $data = $transaction->replicate();
         if (in_array($transaction->type, [9, 11])) {
+            $identification = $identification = Identification::where('id_user', $transaction->wallet_user->user->id)->first();
+            if (!$identification)
+                return $this->errorResponse(trans('errors.user_identification_required'));
+            if ($identification->status != 1)
+                return $this->errorResponse(trans('errors.validation_user_identification_required'));
+
             $data->nom_destinataire = $transaction->wallet_user->user->lastname;
             $data->prenom_destinataire = $transaction->wallet_user->user->firstname;
-            $identification = $identification = Identification::where('id_user', $transaction->wallet_user->user->id)->first();
-            if($identification){
-              $data->type_document_destinataire =  $identification->identity_document;
-              $data->id_document_destinataire =  $identification->id_identity_document;
-            }
-            $data->user_code = $transaction->wallet_user->user->user_code;
+            $data->type_document_destinataire = $identification->identity_document;
+            $data->id_document_destinataire = $identification->id_identity_document;
+//            $data->user_code = $transaction->wallet_user->user->user_code;
         }
-        unset($data->type, $data->init_country, $data->final_country, $data->id_wallet_user , $data->network_destinataire);
+        unset($data->type, $data->init_country, $data->final_country, $data->id_wallet_user, $data->network_destinataire);
 
         return $this->successResponse($data);
     }
diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index 4184d47..a1ba32b 100755
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -20,4 +20,6 @@ return [
     'incorrect_withdrawal_amount'=> 'Incorrect withdrawal amount',
     'operation_cannot_performed_in_country' => 'This operation cannot be performed in this country',
     'withdrawal_network_unauthorized' => 'This withdrawal cannot be made at an iLink agent',
+    'user_identification_required' => 'User identification is required to continue the operation',
+    'validation_user_identification_required' => 'Validation of user identification is required to continue the operation',
 ];
diff --git a/resources/lang/fr/errors.php b/resources/lang/fr/errors.php
index ce66fec..3c2a7d8 100755
--- a/resources/lang/fr/errors.php
+++ b/resources/lang/fr/errors.php
@@ -20,4 +20,6 @@ return [
     'incorrect_withdrawal_amount'=> 'Montant de retrait incorrect',
     'operation_cannot_performed_in_country' => 'Cette operation ne peut pas etre effectuée dans ce pays',
     'withdrawal_network_unauthorized' => 'Ce retrait ne peut pas etre effectué chez un agent iLink',
+    'user_identification_required' => 'L\'identification de l\'utilisateur est requise pour continuer l\'operation',
+    'validation_user_identification_required' => 'La validation de l\'identification de l\'utilisateur est requise pour continuer l\'operation',
 ];