adminnistrateur
/
walletservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Fix bug

This commit is contained in:
Djery-Tom 2020-07-03 19:24:41 +01:00
parent 0a10771c11
commit 6189c78de8
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/iLinkTransactionController.php
View File

@ -666,14 +666,10 @@ class iLinkTransactionController extends Controller
$transaction->montant_net = $montantDepot; $transaction->montant_net = $montantDepot;
$transaction->montant_net_final_country = $this->toMoneyAmount($montantDepot, $init_country, $request->final_country); $transaction->montant_net_final_country = $this->toMoneyAmount($montantDepot, $init_country, $request->final_country);
if ($init_country != $request->final_country) {
$reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail(); $reseauPayeur = PayingNetwork::where('id_network', $request->network_destinataire)->where('id_configWallet', $config->id)->firstOrFail();
$transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100; $transaction->part_reseau_payeur = $frais * $reseauPayeur->taux_partage / 100;
$transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur; $transaction->part_reseau_emetteur = $frais - $transaction->part_reseau_payeur;
} else {
$transaction->part_reseau_payeur = 0;
$transaction->part_reseau_emetteur = $frais;
}
$transaction->part_reseau_payeur_final_country = $this->toMoneyAmount($transaction->part_reseau_payeur, $init_country, $request->final_country); $transaction->part_reseau_payeur_final_country = $this->toMoneyAmount($transaction->part_reseau_payeur, $init_country, $request->final_country);
if (isset($reseauPayeur)) if (isset($reseauPayeur))
$reseauPayeur->balance_com += $transaction->part_reseau_payeur_final_country; $reseauPayeur->balance_com += $transaction->part_reseau_payeur_final_country;
@ -1023,7 +1019,8 @@ class iLinkTransactionController extends Controller
} }
public function getTransactionRetrait(Request $request){ public function getTransactionRetrait(Request $request)
{
$this->validate($request, [ $this->validate($request, [
'id_transaction' => 'required', 'id_transaction' => 'required',
'id_wallet_agent' => 'required|integer|min:0|not_in:0', 'id_wallet_agent' => 'required|integer|min:0|not_in:0',
@ -1046,11 +1043,12 @@ class iLinkTransactionController extends Controller
$data = $transaction->replicate(); $data = $transaction->replicate();
if($transaction->type == 9){ if (in_array($transaction->type, [9, 11])) {
$data->nom_destinataire = $transaction->wallet_user->user->lastname; $data->nom_destinataire = $transaction->wallet_user->user->lastname;
$data->prenom_destinataire = $transaction->wallet_user->user->firstname; $data->prenom_destinataire = $transaction->wallet_user->user->firstname;
$data->user_code = $transaction->wallet_user->user->user_code; $data->user_code = $transaction->wallet_user->user->user_code;
} }
unset($data->type, $data->init_country, $data->final_country, $data->id_wallet_user);
return $this->successResponse($data); return $this->successResponse($data);
} }