From 3a22be7eed5b397fba9508fe23e5ff099952f90c Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Thu, 25 Jun 2020 10:02:41 +0100 Subject: [PATCH] + Fix bugs --- application/controllers/Hyperviseur_dash.php | 6 +++--- application/views/gestion_wallet_autre.php | 2 +- application/views/gestion_wallet_ilink.php | 6 +++--- application/views/gestion_wallet_ilink_hyp.php | 6 +++--- ...gestion_wallet_ilink_paying_network_account.php | 2 +- .../views/historique_transactions_ilink.php | 14 +++++++------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index a666c4ce..7f076d6d 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -412,7 +412,7 @@ class Hyperviseur_dash extends CI_Controller array_push($data['transactions'], $trans); } } - $data["totalCommissionBanque"] = Money::of($totalCommissionBanque, $this->session->userdata('currency_code'))->formatTo('fr_FR'); + $data["totalCommissionBanque"] = Money::of(round($totalCommissionBanque,0), $this->session->userdata('currency_code'))->formatTo('fr_FR'); } @@ -424,8 +424,8 @@ class Hyperviseur_dash extends CI_Controller } $row = $res->first_row(); - $data["commission"] = Money::of($row->balance_com, $this->session->userdata('currency_code'))->formatTo('fr_FR'); - $data["principal"] = Money::of($row->balance_princ, $this->session->userdata('currency_code'))->formatTo('fr_FR'); + $data["commission"] = Money::of(round($row->balance_com,0), $this->session->userdata('currency_code'))->formatTo('fr_FR'); + $data["principal"] = Money::of(round($row->balance_princ,0), $this->session->userdata('currency_code'))->formatTo('fr_FR'); $data['wallet_id'] = $row->wallet_id; $data['curreny_code'] = $this->session->userdata('currency_code'); diff --git a/application/views/gestion_wallet_autre.php b/application/views/gestion_wallet_autre.php index 0d6d5911..4c6a2c8e 100755 --- a/application/views/gestion_wallet_autre.php +++ b/application/views/gestion_wallet_autre.php @@ -175,7 +175,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
-

code : 'XAF')->formatTo('fr_FR'); ?>

+

code : 'XAF')->formatTo('fr_FR'); ?>

lang->line('Solde Commission') ?>

diff --git a/application/views/gestion_wallet_ilink.php b/application/views/gestion_wallet_ilink.php index 7f24b0ff..cae2fd1f 100755 --- a/application/views/gestion_wallet_ilink.php +++ b/application/views/gestion_wallet_ilink.php @@ -824,9 +824,9 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL ); $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL ); echo " " . $walletHyper->first_row()->lastname . " - " . Money::of($walletHyper->first_row()->balance_princ, $currency ? $currency->code : 'XAF')->formatTo('fr_FR'). " - " .Money::of($walletHyper->first_row()->balance_com, $currency ? $currency->code : 'XAF')->formatTo('fr_FR'). " - " .Money::of($totalCommissionBanque, $currency ? $currency->code : 'XAF')->formatTo('fr_FR') . ""; + " . Money::of(round($walletHyper->first_row()->balance_princ, 0),$currency ? $currency->code : 'XAF')->formatTo('fr_FR'). " + " .Money::of(round($walletHyper->first_row()->balance_com, 0), $currency ? $currency->code : 'XAF')->formatTo('fr_FR'). " + " .Money::of(round($totalCommissionBanque,0), $currency ? $currency->code : 'XAF')->formatTo('fr_FR') . ""; echo "" . $depots->num_rows() . " " . $retraits->num_rows() . " diff --git a/application/views/gestion_wallet_ilink_hyp.php b/application/views/gestion_wallet_ilink_hyp.php index 4bd84932..18d7b293 100755 --- a/application/views/gestion_wallet_ilink_hyp.php +++ b/application/views/gestion_wallet_ilink_hyp.php @@ -1011,8 +1011,8 @@ use Brick\Money\Money; } echo " ".$row->lastname." - ".Money::of($princ, $this->session->userdata('currency_code'))->formatTo('fr_FR')." - ".Money::of($com, $this->session->userdata('currency_code'))->formatTo('fr_FR').""; + ".Money::of(round($princ,0), $this->session->userdata('currency_code'))->formatTo('fr_FR')." + ".Money::of(round($com,0), $this->session->userdata('currency_code'))->formatTo('fr_FR').""; $nb_depots = 0; $nb_retraits = 0; $commission_banque = 0; @@ -1028,7 +1028,7 @@ use Brick\Money\Money; $commission_banque+= $retrait->commission_banque; } } - echo "".Money::of($commission_banque, $this->session->userdata('currency_code'))->formatTo('fr_FR')." + echo "".Money::of(round($commission_banque,0), $this->session->userdata('currency_code'))->formatTo('fr_FR')." ".$nb_depots." ".$nb_retraits." "; diff --git a/application/views/gestion_wallet_ilink_paying_network_account.php b/application/views/gestion_wallet_ilink_paying_network_account.php index 7afb9672..2c949c3f 100755 --- a/application/views/gestion_wallet_ilink_paying_network_account.php +++ b/application/views/gestion_wallet_ilink_paying_network_account.php @@ -95,7 +95,7 @@ } ?> - balance_com, $row->currency_code ? $row->currency_code : 'XAF')->formatTo('fr_FR')?> + balance_com, 0),$row->currency_code ? $row->currency_code : 'XAF')->formatTo('fr_FR')?> montant_retrait ; } - $moneyNetInit = Money::of($net, $row->init_currency ); + $moneyNetInit = Money::of(round($net, $row->init_currency,0)); $moneyNetFinal = $converter->convert($moneyNetInit, $row->final_currency ? $row->final_currency : 'XAF', RoundingMode::DOWN); echo " $row->id @@ -162,12 +162,12 @@ use Brick\Money\Money; ".join(" ", str_split($row->numero_carte, 4))." ".$moneyNetInit->formatTo('fr_FR')." ".$moneyNetFinal->formatTo('fr_FR')." - ".Money::of($row->frais, $row->init_currency)->formatTo('fr_FR')." - ".Money::of($row->taxe, $row->init_currency)->formatTo('fr_FR')." - ".Money::of($row->commission_banque ? $row->commission_banque : 0, $row->init_currency)->formatTo('fr_FR')." - ".Money::of($row->commission_hyp ? $row->commission_hyp : 0, $row->init_currency)->formatTo('fr_FR')." - ".Money::of($row->commission_sup ? $row->commission_sup : 0 , $row->init_currency)->formatTo('fr_FR')." - ".Money::of($row->commission_ag ? $row->commission_ag : 0, $row->init_currency)->formatTo('fr_FR')." + ".Money::of(round($row->frais,0), $row->init_currency)->formatTo('fr_FR')." + ".Money::of(round($row->taxe, 0),$row->init_currency)->formatTo('fr_FR')." + ".Money::of(round($row->commission_banque ? $row->commission_banque : 0, 0),$row->init_currency)->formatTo('fr_FR')." + ".Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 0),$row->init_currency)->formatTo('fr_FR')." + ".Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 0),$row->init_currency)->formatTo('fr_FR')." + ".Money::of(round($row->commission_ag ? $row->commission_ag : 0, 0),$row->init_currency)->formatTo('fr_FR')." ".$row->agent." ".$row->user." ".toLocateDate($row->date,$this->session->userdata('timezone'))."";