diff --git a/app/Http/Controllers/WalletController.php b/app/Http/Controllers/WalletController.php index 59d7bcd..7f0a5fa 100644 --- a/app/Http/Controllers/WalletController.php +++ b/app/Http/Controllers/WalletController.php @@ -24,8 +24,7 @@ class WalletController extends Controller public function activated($id_agent) { - - $networks = DB::select('SELECT na.network_id ,ne.name as network , countries.name AS country,ne.country_id , w.id, w.balance_princ , w.balance_com, w.created_date, na.id AS id_networkAgent ,cw.taux_com_client_retrait, cw.taux_com_client_depot , cw.frais_min_banque_depot FROM agents ag + $networks = DB::select('SELECT ne.name as network , countries.name AS country, w.id, na.id AS id_networkAgent 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]); @@ -48,8 +47,15 @@ class WalletController extends Controller public function show($id_wallet) { - $wallet = Wallet::findOrFail($id_wallet); - return $this->successResponse($$wallet); +// $wallet = Wallet::findOrFail($id_wallet); + $wallet = collect(DB::select('SELECT wa.wallet_id AS id, wa.balance_princ, wa.balance_com, wa.created_date, wa.network , cw.taux_com_client_depot, c.name AS country + FROM wallet_agent wa INNER JOIN configWallet cw ON wa.network_id = cw.id_network INNER JOIN networks n ON n.id = wa.network_id + INNER JOIN countries c ON c.id = n.country_id + WHERE wa.wallet_id = :id',['id' => $id_wallet]))->first(); + if($wallet) + return $this->successResponse($wallet); + else + return $this->errorResponse(trans('errors.model_not_found',['model'=>'wallet']),Response::HTTP_BAD_REQUEST); } public function create(Request $request)