+ Fix bugs
This commit is contained in:
parent
e0cf7cd903
commit
3a22be7eed
|
@ -412,7 +412,7 @@ class Hyperviseur_dash extends CI_Controller
|
||||||
array_push($data['transactions'], $trans);
|
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();
|
$row = $res->first_row();
|
||||||
$data["commission"] = Money::of($row->balance_com, $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($row->balance_princ, $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['wallet_id'] = $row->wallet_id;
|
||||||
$data['curreny_code'] = $this->session->userdata('currency_code');
|
$data['curreny_code'] = $this->session->userdata('currency_code');
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
|
||||||
<div class="col-lg-4 col-xs-6">
|
<div class="col-lg-4 col-xs-6">
|
||||||
<div class="small-box bg-green">
|
<div class="small-box bg-green">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<h3><?php echo Money::of($commission, $currency ? $currency->code : 'XAF')->formatTo('fr_FR'); ?></h3>
|
<h3><?php echo Money::of(round($commission,0), $currency ? $currency->code : 'XAF')->formatTo('fr_FR'); ?></h3>
|
||||||
<p><?php echo $this->lang->line('Solde Commission') ?></p>
|
<p><?php echo $this->lang->line('Solde Commission') ?></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="icon">
|
<div class="icon">
|
||||||
|
|
|
@ -824,9 +824,9 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
|
||||||
$fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
|
$fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
|
||||||
echo "<tr>
|
echo "<tr>
|
||||||
<td>" . $walletHyper->first_row()->lastname . "</td>
|
<td>" . $walletHyper->first_row()->lastname . "</td>
|
||||||
<td>" . Money::of($walletHyper->first_row()->balance_princ, $currency ? $currency->code : 'XAF')->formatTo('fr_FR'). "</td>
|
<td>" . Money::of(round($walletHyper->first_row()->balance_princ, 0),$currency ? $currency->code : 'XAF')->formatTo('fr_FR'). "</td>
|
||||||
<td>" .Money::of($walletHyper->first_row()->balance_com, $currency ? $currency->code : 'XAF')->formatTo('fr_FR'). "</td>
|
<td>" .Money::of(round($walletHyper->first_row()->balance_com, 0), $currency ? $currency->code : 'XAF')->formatTo('fr_FR'). "</td>
|
||||||
<td>" .Money::of($totalCommissionBanque, $currency ? $currency->code : 'XAF')->formatTo('fr_FR') . "</td>";
|
<td>" .Money::of(round($totalCommissionBanque,0), $currency ? $currency->code : 'XAF')->formatTo('fr_FR') . "</td>";
|
||||||
|
|
||||||
echo "<td>" . $depots->num_rows() . "</td>
|
echo "<td>" . $depots->num_rows() . "</td>
|
||||||
<td>" . $retraits->num_rows() . "</td>
|
<td>" . $retraits->num_rows() . "</td>
|
||||||
|
|
|
@ -1011,8 +1011,8 @@ use Brick\Money\Money;
|
||||||
}
|
}
|
||||||
echo "<tr>
|
echo "<tr>
|
||||||
<td>".$row->lastname."</td>
|
<td>".$row->lastname."</td>
|
||||||
<td>".Money::of($princ, $this->session->userdata('currency_code'))->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($princ,0), $this->session->userdata('currency_code'))->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($com, $this->session->userdata('currency_code'))->formatTo('fr_FR')."</td>";
|
<td>".Money::of(round($com,0), $this->session->userdata('currency_code'))->formatTo('fr_FR')."</td>";
|
||||||
$nb_depots = 0;
|
$nb_depots = 0;
|
||||||
$nb_retraits = 0;
|
$nb_retraits = 0;
|
||||||
$commission_banque = 0;
|
$commission_banque = 0;
|
||||||
|
@ -1028,7 +1028,7 @@ use Brick\Money\Money;
|
||||||
$commission_banque+= $retrait->commission_banque;
|
$commission_banque+= $retrait->commission_banque;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
echo "<td>".Money::of($commission_banque, $this->session->userdata('currency_code'))->formatTo('fr_FR')."</td>
|
echo "<td>".Money::of(round($commission_banque,0), $this->session->userdata('currency_code'))->formatTo('fr_FR')."</td>
|
||||||
<td>".$nb_depots."</td>
|
<td>".$nb_depots."</td>
|
||||||
<td>".$nb_retraits."</td>
|
<td>".$nb_retraits."</td>
|
||||||
</tr>";
|
</tr>";
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td>
|
<td>
|
||||||
<?= Money::of($row->balance_com, $row->currency_code ? $row->currency_code : 'XAF')->formatTo('fr_FR')?>
|
<?= Money::of(round($row->balance_com, 0),$row->currency_code ? $row->currency_code : 'XAF')->formatTo('fr_FR')?>
|
||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ use Brick\Money\Money;
|
||||||
}else{
|
}else{
|
||||||
$net = $row->montant_retrait ;
|
$net = $row->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);
|
$moneyNetFinal = $converter->convert($moneyNetInit, $row->final_currency ? $row->final_currency : 'XAF', RoundingMode::DOWN);
|
||||||
echo "<tr>
|
echo "<tr>
|
||||||
<td align='center' >$row->id</td>
|
<td align='center' >$row->id</td>
|
||||||
|
@ -162,12 +162,12 @@ use Brick\Money\Money;
|
||||||
<td>".join(" ", str_split($row->numero_carte, 4))."</td>
|
<td>".join(" ", str_split($row->numero_carte, 4))."</td>
|
||||||
<td>".$moneyNetInit->formatTo('fr_FR')."</td>
|
<td>".$moneyNetInit->formatTo('fr_FR')."</td>
|
||||||
<td>".$moneyNetFinal->formatTo('fr_FR')."</td>
|
<td>".$moneyNetFinal->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($row->frais, $row->init_currency)->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($row->frais,0), $row->init_currency)->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($row->taxe, $row->init_currency)->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($row->taxe, 0),$row->init_currency)->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($row->commission_banque ? $row->commission_banque : 0, $row->init_currency)->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($row->commission_banque ? $row->commission_banque : 0, 0),$row->init_currency)->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($row->commission_hyp ? $row->commission_hyp : 0, $row->init_currency)->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 0),$row->init_currency)->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($row->commission_sup ? $row->commission_sup : 0 , $row->init_currency)->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 0),$row->init_currency)->formatTo('fr_FR')."</td>
|
||||||
<td>".Money::of($row->commission_ag ? $row->commission_ag : 0, $row->init_currency)->formatTo('fr_FR')."</td>
|
<td>".Money::of(round($row->commission_ag ? $row->commission_ag : 0, 0),$row->init_currency)->formatTo('fr_FR')."</td>
|
||||||
<td>".$row->agent."</td>
|
<td>".$row->agent."</td>
|
||||||
<td>".$row->user."</td>
|
<td>".$row->user."</td>
|
||||||
<td>".toLocateDate($row->date,$this->session->userdata('timezone'))."</td>";
|
<td>".toLocateDate($row->date,$this->session->userdata('timezone'))."</td>";
|
||||||
|
|
Loading…
Reference in New Issue