diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 24a31d5e..234f6366 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -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; diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php index 657866eb..f07c4602 100755 --- a/application/views/demande_credit.php +++ b/application/views/demande_credit.php @@ -370,7 +370,7 @@
-

lang->line('incoming_credits_requests'); ?>lang->line('les plus rapidement traitées'); ?>

+

lang->line('incoming_credits_requests').' '.$this->lang->line('les plus rapidement traitées'); ?>

@@ -452,7 +452,7 @@
-

lang->line('outgoing_credits_requests'); ?>lang->line('les plus rapidement traitées'); ?>

+

lang->line('outgoing_credits_requests').' '.$this->lang->line('les plus rapidement traitées'); ?>

@@ -534,7 +534,7 @@
-

lang->line('incoming_credits_requests'); ?>lang->line('les plus tardivement traitées'); ?>

+

lang->line('incoming_credits_requests').' '.$this->lang->line('les plus tardivement traitées'); ?>

@@ -616,7 +616,7 @@
-

lang->line('outgoing_credits_requests'); ?>lang->line('les plus tardivement traitées'); ?>

+

lang->line('outgoing_credits_requests').' '.$this->lang->line('les plus tardivement traitées'); ?>

@@ -791,7 +791,7 @@
-

lang->line('incoming_credits_requests'); ?>lang->line('les plus rapidement traitées'); ?>

+

lang->line('incoming_credits_requests').' '.$this->lang->line('les plus rapidement traitées'); ?>

@@ -872,7 +872,7 @@
-

lang->line('incoming_credits_requests'); ?>lang->line('les plus tardivement traitées'); ?>

+

lang->line('incoming_credits_requests').' '.$this->lang->line('les plus tardivement traitées'); ?>

diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php index 7339dd87..7a71a6ac 100755 --- a/application/views/historique_transactions_ilink.php +++ b/application/views/historique_transactions_ilink.php @@ -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){ ".Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')." ".Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 2),$row->init_currency,$context)->formatTo('fr_FR')." ".Money::of(round($row->commission_ag ? $row->commission_ag : 0, 2),$row->init_currency,$context)->formatTo('fr_FR')." - ".$row->agent." + ".$agent." ".$emetteur." ".$destinataire." ".toLocateDate($row->date,$this->session->userdata('timezone'))."";