From c376748298cbf793f4867b696ff19ecf4bcb85c8 Mon Sep 17 00:00:00 2001 From: DJERY-TOM Date: Tue, 5 May 2020 23:29:26 +0100 Subject: [PATCH] + Fix bug --- app/Http/Controllers/WalletController.php | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/WalletController.php b/app/Http/Controllers/WalletController.php index 935d3c1..023d2af 100644 --- a/app/Http/Controllers/WalletController.php +++ b/app/Http/Controllers/WalletController.php @@ -24,7 +24,7 @@ class WalletController extends Controller public function activated($id_agent) { - $networks = DB::select('SELECT ne.name as network , countries.name AS country, w.id, na.id AS id_networkAgent , cg.category FROM agents ag + $networks = DB::select('SELECT ne.name as network , countries.name AS country, w.id, w.balance_princ , w.balance_com, w.created_date, na.id AS id_networkAgent , cw.taux_com_client_depot , na.id AS id_networkAgent , cg.category FROM agents ag INNER JOIN networks_agents na ON ag.id=na.agent_id INNER JOIN codeGenerer cg ON cg.id=na.codeGenerer_id INNER JOIN networks ne ON ne.id=na.network_id INNER JOIN configWallet cw ON ne.id = cw.id_network INNER JOIN countries ON ne.country_id=countries.id LEFT JOIN wallets w ON na.id = w.id_networkAgent WHERE ag.id= :id AND network_id IN ( SELECT networks.id FROM networks LEFT JOIN configWallet ON configWallet.id_network = networks.id WHERE status = 1 AND id_network IS NOT NULL)', ['id' => $id_agent]); @@ -46,11 +46,27 @@ class WalletController extends Controller return $this->activated($id); } + // Return only single wallet if it is hypervisor or supervisor - if(in_array( $category , ['hyper','super'])) + if(in_array( $category , ['hyper','super'])){ + // Remove unnecessary fields + $networks = $this->array_except($networks,['id_networkAgent','category']); return $this->successResponse(collect($networks)->first()); - else + }else{ + // Remove unnecessary fields + $networks = $this->array_except($networks,['id_networkAgent','category','balance_princ','balance_com','created_date','taux_com_client_depot']); return $this->successResponse($networks); + } + + } + + private function array_except($array, $keys){ + foreach ($array as $row){ + foreach($keys as $key){ + unset($row->$key); + } + } + return $array; } public function show($id_wallet)