+ Fix bugs and update iLink transactions history
This commit is contained in:
parent
36ce2e3ac0
commit
86a4a55fae
|
@ -430,7 +430,7 @@ class Hyperviseur_dash extends CI_Controller
|
|||
|
||||
private function historique($network_id, $startDate, $endDate, $type)
|
||||
{
|
||||
// $data['configWallet'] = $this->wallet_model->getConfigWallet($network_id);
|
||||
$data['configWallet'] = $this->wallet_model->getConfigWallet($network_id);
|
||||
$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d';
|
||||
$data['startDate'] = $startDate ? date($format, strtotime($startDate)) : null;
|
||||
$data['endDate'] = $endDate ? date($format, strtotime($endDate)) : null;
|
||||
|
|
|
@ -370,7 +370,7 @@
|
|||
<div class="box">
|
||||
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests'); ?><?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests').' '.$this->lang->line('les plus rapidement traitées'); ?></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
@ -452,7 +452,7 @@
|
|||
<div class="col-md-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><?php echo $this->lang->line('outgoing_credits_requests'); ?><?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
|
||||
<h3 class="box-title"><?php echo $this->lang->line('outgoing_credits_requests').' '.$this->lang->line('les plus rapidement traitées'); ?></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
@ -534,7 +534,7 @@
|
|||
<div class="col-md-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests'); ?><?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests').' '.$this->lang->line('les plus tardivement traitées'); ?></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
@ -616,7 +616,7 @@
|
|||
<div class="col-md-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><?php echo $this->lang->line('outgoing_credits_requests'); ?><?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
|
||||
<h3 class="box-title"><?php echo $this->lang->line('outgoing_credits_requests').' '.$this->lang->line('les plus tardivement traitées'); ?></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
@ -791,7 +791,7 @@
|
|||
<div class="box">
|
||||
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests'); ?><?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests').' '.$this->lang->line('les plus rapidement traitées'); ?></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
@ -872,7 +872,7 @@
|
|||
<div class="col-md-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests'); ?><?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
|
||||
<h3 class="box-title"><?php echo $this->lang->line('incoming_credits_requests').' '.$this->lang->line('les plus tardivement traitées'); ?></h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
|
||||
|
|
|
@ -168,6 +168,7 @@ function toLocateDate($date , $timezone){
|
|||
$net = 0;
|
||||
$banque = 0;
|
||||
$moneyNetInit = Money::of(round($row->montant_net ,2), $row->init_currency,$context);
|
||||
$agent = $row->agent ? ( $row->agent." | ".$row->code_agent." | ".$row->phone_agent ) : "";
|
||||
if($row->destinataire_phone){
|
||||
$destinataire = $row->destinataire_phone.' | '.$row->destinataire_name;
|
||||
}else{
|
||||
|
@ -196,7 +197,7 @@ function toLocateDate($date , $timezone){
|
|||
<td>".Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')."</td>
|
||||
<td>".Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 2),$row->init_currency,$context)->formatTo('fr_FR')."</td>
|
||||
<td>".Money::of(round($row->commission_ag ? $row->commission_ag : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')."</td>
|
||||
<td>".$row->agent."</td>
|
||||
<td>".$agent."</td>
|
||||
<td>".$emetteur."</td>
|
||||
<td>".$destinataire."</td>
|
||||
<td>".toLocateDate($row->date,$this->session->userdata('timezone'))."</td>";
|
||||
|
|
Loading…
Reference in New Issue