diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php index ddf658c..837a827 100755 --- a/app/Http/Controllers/iLinkTransactionController.php +++ b/app/Http/Controllers/iLinkTransactionController.php @@ -906,7 +906,7 @@ class iLinkTransactionController extends Controller $transactions = DB::select('SELECT id_wallet_user , operation , id_transaction ,network_destinataire, init_country , final_country, date , id , montant , frais , taxe , pays_init , pays_final, destinataire_phone , destinataire_name , nom_destinataire, prenom_destinataire, montant_net ,montant_net_final_country FROM infos_ilink_transaction WHERE id_wallet_user = :id_wallet AND type <> 12 AND type <> 14 - ORDER BY date DESC LIMIT 10;', ['id_wallet' => $wallet_user->id])->paginate(15); + ORDER BY date DESC LIMIT 10;', ['id_wallet' => $wallet_user->id]); foreach ($transactions as $data){ $date = $data->date; @@ -1033,14 +1033,14 @@ class iLinkTransactionController extends Controller $taxe = ($init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais); $destinataire = User::where('user_code', $request->id_destinataire)->first(); $data['destinataire'] = $destinataire ? $destinataire->lastname . ' ' . $destinataire->firstname : $request->id_destinataire; - $data['frais'] = $frais + $taxe; - $data['montant_net_init'] = $request->montant - $frais - $taxe; + $data['frais'] = round($frais + $taxe,2); + $data['montant_net_init'] = round($request->montant - $data['frais'] , 2); $data['montant_net_final'] = $this->toMoneyWithCurrency($data['montant_net_init'], $init_country, $request->final_country); break; case 2: //User - Envoi de wallet à carte $frais = $request->montant * $config->taux_com_user_wallet_carte / 100; - $data['frais'] = $frais; - $data['montant_net'] = $request->montant - $frais; + $data['frais'] = round($frais,2); + $data['montant_net'] = round($request->montant - $data['frais'],2); break; case 3: // User - Envoi wallet à cash $this->validate($request, [ @@ -1048,30 +1048,30 @@ class iLinkTransactionController extends Controller ]); $frais = ($init_country != $request->final_country) ? $this->calculateFees($plr_user_wallet_cash, $request->montant) : $this->calculateFees($plr_user_wallet_cash_national, $request->montant); $taxe = ($init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais); - $data['frais'] = $frais + $taxe; - $data['montant_net_init'] = $request->montant - $frais - $taxe; + $data['frais'] = round($frais + $taxe,2); + $data['montant_net_init'] = round($request->montant - $data['frais'],2); $data['montant_net_final'] = $this->toMoneyWithCurrency($data['montant_net_init'], $init_country, $request->final_country); break; case 9: // User - Retrait de wallet en cash $frais = $this->calculateFees($plr_user_wallet_cash_national, $request->montant); $taxe = $this->calculateTax($taxesNationales, $frais); - $data['frais'] = $frais + $taxe; - $data['montant_net'] = $request->montant - $frais - $taxe; + $data['frais'] = round($frais + $taxe,2); + $data['montant_net'] = round($request->montant - $data['frais'], 2); break; case 10: //User - Retrait de carte vers wallet $frais = $request->montant * $config->taux_com_user_carte_wallet / 100;; - $data['frais'] = $frais; - $data['montant_net'] = $request->montant - $frais; + $data['frais'] = round($frais,2); + $data['montant_net'] = round($request->montant - $data['frais'],2); break; case 11: // User - Retrait de carte vers cash $frais = $request->montant * $config->taux_com_user_carte_cash / 100; - $data['frais'] = $frais; - $data['montant_net'] = $request->montant - $frais; + $data['frais'] = round($frais,2); + $data['montant_net'] = round($request->montant - $data['frais'],2); break; case 13: // Agent - Retrait de la carte vers cash $frais = $request->montant * $config->taux_com_wallet_ag_carte_cash / 100; - $data['frais'] = $frais; - $data['montant_net'] = $request->montant - $frais; + $data['frais'] = round($frais,2); + $data['montant_net'] = round($request->montant - $data['frais'],2); break; case 14: // Agent - Envoi de cash vers wallet iLink $this->validate($request, [ @@ -1083,8 +1083,8 @@ class iLinkTransactionController extends Controller $final_country = $user->network->country->id; $frais = ($init_country != $final_country) ? $this->calculateFees($plr_agent_depot_wallet_ilink, $request->montant) : $this->calculateFees($plr_agent_depot_wallet_ilink_national, $request->montant); $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais); - $data['frais'] = $frais + $taxe; - $data['montant_net_init'] = $request->montant - $frais - $taxe; + $data['frais'] = round($frais + $taxe,2); + $data['montant_net_init'] = round($request->montant - $data['frais'],2); $data['montant_net_final'] = $this->toMoneyWithCurrency($data['montant_net_init'], $init_country, $final_country); break; case 15: // Agent - Envoi de cash vers autre wallet @@ -1093,14 +1093,14 @@ class iLinkTransactionController extends Controller ]); $frais = ($init_country != $request->final_country) ? $this->calculateFees($plr_agent_depot_autre_wallet, $request->montant) : $this->calculateFees($plr_agent_depot_autre_wallet_national, $request->montant); $taxe = ($init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais); - $data['frais'] = $frais + $taxe; - $data['montant_net_init'] = $request->montant - $frais - $taxe; + $data['frais'] = round($frais + $taxe,2); + $data['montant_net_init'] = round($request->montant - $data['frais'],2); $data['montant_net_final'] = $this->toMoneyWithCurrency($data['montant_net_init'], $init_country, $request->final_country); break; case 16: // Agent - Envoi de cash vers une carte visa $frais = $request->montant * $config->taux_com_wallet_ag_envoi_cash_carte / 100; - $data['frais'] = $frais; - $data['montant_net'] = $request->montant - $frais; + $data['frais'] = round($frais,2); + $data['montant_net'] = round($request->montant - $data['frais'],2); break; case 17: // Agent - Envoi de cash vers cash $this->validate($request, [ @@ -1108,8 +1108,8 @@ class iLinkTransactionController extends Controller ]); $frais = ($init_country != $request->final_country) ? $this->calculateFees($plr_agent_cash_cash, $request->montant) : $this->calculateFees($plr_agent_cash_cash_national, $request->montant); $taxe = ($init_country != $request->final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais); - $data['frais'] = $frais + $taxe; - $data['montant_net_init'] = $request->montant - $frais - $taxe; + $data['frais'] = round($frais + $taxe,2); + $data['montant_net_init'] = round($request->montant - $data['frais'],2); $data['montant_net_final'] = $this->toMoneyWithCurrency($data['montant_net_init'], $init_country, $request->final_country); break; }