+ Fix bugs due on responsive and add calculator

application/controllers/Gestion.php

@@ -1838,7 +1838,7 @@ class Gestion extends CI_Controller
 					$data['currency_name_fr'] =  $networkDetails->first_row()->currency_name_fr;
 					$data['currency_name_en'] =  $networkDetails->first_row()->currency_name_en;
 
-				$data['currencies'] = $this->user_model->getCurrencies($data['currency_code']);
+				$data['currencies'] = $this->user_model->getWalletsCountriesCurrencies($data['currency_code']);
 				$this->load->view('header_gestion', $data);
 				$this->load->view('gestion_monnaie');
 				$this->load->view('footer');
@@ -1853,5 +1853,31 @@ class Gestion extends CI_Controller
 		}
 	}
 
+	public function fetchExchangeRates(){
+		if ($this->isLogged()) {
+
+				$api="c4e31fe540cd49c98abffc06cc5948c8";   ///// Provide your openexchangerates.org api key here
+				$string = file_get_contents("https://openexchangerates.org/api/latest.json?app_id=$api");
+				$json = json_decode($string, true);
+
+				$res= false;
+
+				foreach ($json['rates'] as $key => $value) {
+					if($this->user_model->getExchangeRate($key))
+						$this->user_model->updateExchangeRate($key , $value);
+					else
+						$this->user_model->insertExchangeRate($key , $value);
+				}
+				$res = true;
+				if ($res) {
+					echo json_encode("200");
+				} else {
+					echo json_encode("500");
+				}
+
+
+		}
+	}
+
 }
 

application/controllers/Hyperviseur_dash.php

@@ -321,7 +321,7 @@ class Hyperviseur_dash extends CI_Controller
 
 					$taux = $data['hasWallet']->first_row();
 					$data['idConfig'] = $taux->id;
-					if ($data['hasWallet']->first_row()->type == 'uba'){
+					if ($data['hasWallet']->first_row()->type == 'visa'){
 						$data['taux_client_r'] = $taux->taux_com_client_retrait;
 						$data['taux_client_d'] = $taux->taux_com_client_depot;
 						$data['taux_ag_r'] = $taux->taux_com_ag_retrait;
@@ -424,7 +424,7 @@ class Hyperviseur_dash extends CI_Controller
 					$data['networks'] = $this->user_model->getActiveNetwork();
 					$data['agentWalletInfos'] = $this->user_model->getInfosWalletAgentForHyper($id_network);
 					$this->load->view('header_hyp', $data);
-					if ($data['hasWallet']->first_row()->type == 'uba')
+					if ($data['hasWallet']->first_row()->type == 'visa')
 						$this->load->view('gestion_wallet_hyp');
 					elseif ($data['hasWallet']->first_row()->type == 'ilink')
 						$this->load->view('gestion_wallet_ilink_hyp');
@@ -627,4 +627,49 @@ class Hyperviseur_dash extends CI_Controller
 		}
 	}
 
+	public function calculator(){
+		if($this->isLogged()){
+			$data['active'] = "calculator";
+			$data['alert'] = "";
+			$data['firstname'] = $this->session->userdata('firstname');
+			$data['lastname'] = $this->session->userdata('lastname');
+			$data['email'] = $this->session->userdata('email');
+			$data['network'] = $this->session->userdata('network');
+			$data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays'));
+			$data['networks'] = $this->user_model->getActiveNetwork();
+			$data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code'));
+			$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
+			$data['idConfig'] = $data['hasWallet']->first_row()->id;
+			$data['country'] =  $this->session->userdata('current_pays');
+			$data['network_id'] = $this->session->userdata('network_id');
+			$data['countries'] = $this->user_model->getWalletsCountries();
+			$data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet" , $data['idConfig'])->result();
+			$data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash" , $data['idConfig']);
+			$data['plr_agent_depot_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet" , $data['idConfig']);
+			$data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash" , $data['idConfig']);
+			$operations = [
+				new Operation(1,$this->lang->line('op1')),
+				new Operation(2,"Retrait d'argent")
+			];
+			$data['operations'] = $operations;
+//			if (isset($_POST)) {
+//				$data['montant'] = isset($_POST['montant']) ? $_POST['montant'] : 0 ;
+//			}
+			$data['montant'] = $this->input->post('montant');
+			$this->load->view('header_hyp', $data);
+			$this->load->view('calculator');
+			$this->load->view('footer');
+		}
+	}
+}
+
+class Operation {
+	public $name ;
+	public $id;
+
+	public function __construct($id , $name)
+	{
+		$this->name = $name;
+		$this->id = $id;
+	}
 }

application/language/english/message_lang.php

@@ -343,5 +343,6 @@ $lang ['show_currency_rate_conversion'] = 'Show conversion rates';
 $lang ['conversion_rate'] = 'Conversion rate';
 $lang ['new_rate'] = 'New rate';
 $lang ['save'] = 'Save';
+$lang['agent_name'] = 'Agent name';
 
 ?>

application/language/french/message_lang.php

@@ -355,4 +355,16 @@ $lang['show_currency_rate_conversion'] = 'Afficher les taux de conversions';
 $lang['conversion_rate'] =  'Taux de conversion';
 $lang['new_rate'] = 'Nouveau taux';
 $lang['save'] = 'Enregistrer';
+$lang['update_rate'] = 'Mettre à jour les taux';
+$lang['rates_update'] = 'Taux de conversion mis à jour';
+$lang['calculator'] = 'Calculatrice';
+$lang['calculate'] = 'Calculer';
+$lang['no_country'] = 'Aucun pays';
+$lang['departure_country'] = 'Pays de départ';
+$lang['country_of_destination'] = 'Pays de destination';
+$lang['amount_departure_country'] = 'Montant du pays de départ';
+$lang['amount_country_of_destination'] = 'Montant du pays de destination';
+$lang['no_operation'] = 'Aucune opération';
+$lang['agent_name'] = 'Nom de l\'agent';
+$lang['op1'] = 'Envoi de wallet à wallet';
 ?>

application/models/User_model.php

@@ -2159,7 +2159,7 @@ class User_model extends CI_Model
 
 	// Mot de passe du wallet
 	public function getAllActivatedWalletNetworks(){
-		$query = $this->db->query("SELECT n.id AS id_network , n.name AS network,n.status AS status,c.name AS country,c.currency_name_fr,c.currency_code, wp.id AS wallet_password FROM networks n
+		$query = $this->db->query("SELECT n.id AS id_network , n.name AS network,n.status AS status,c.name AS country,c.currency_name_fr, c.currency_name_en , c.currency_code, wp.id AS wallet_password FROM networks n
  												INNER JOIN countries_currencies c ON n.country_id=c.id INNER JOIN configWallet cw ON cw.id_network = n.id
                                                 LEFT JOIN walletsPassword wp ON wp.network_id = n.id WHERE status = 1;");
 		if($query->num_rows()>0){
@@ -2268,10 +2268,11 @@ class User_model extends CI_Model
 		return $query;
 	}
 
+	// La liste des monnaies pour les pays actifs
 	public function getCurrencies($code){
 		$sql= "SELECT * FROM currencies WHERE id IN(
 					SELECT idCurrency FROM countries WHERE id IN (
-					 SELECT country_id FROM networks WHERE status = 1
+					 SELECT distinct country_id FROM networks WHERE status = 1
 					)
 					) AND code <> ? ;";
 		$query = $this->db->query($sql, array($code));
@@ -2282,5 +2283,54 @@ class User_model extends CI_Model
 		}
 	}
 
+	//Liste des monnaies pour les pays dont un wallet est actif
+	public function getWalletsCountriesCurrencies($code){
+		$sql= "SELECT * FROM currencies WHERE id IN(
+					SELECT idCurrency FROM countries WHERE id IN (
+					 SELECT distinct c.id FROM networks n INNER JOIN countries_currencies c ON n.country_id=c.id INNER JOIN configWallet cw ON cw.id_network = n.id WHERE status = 1
+					)
+					) AND code <> ? ;";
+		$query = $this->db->query($sql, array($code));
+		if($query->num_rows()>0){
+			return $query;
+		}else{
+			return false;
+		}
+	}
+
+	public function insertExchangeRate($currency ,$rate){
+		$sql = "INSERT INTO `exchange_rate` (`target_currency`, `exchange_rate`) VALUES ( ?, ?);";
+		$query = $this->db->query($sql , array($currency,$rate));
+		return $query;
+	}
+
+	public function getExchangeRate($currency){
+		$sql = "SELECT *  FROM `exchange_rate` WHERE `target_currency` =  ?;";
+		$query = $this->db->query($sql , array($currency));
+		if($query->num_rows()>0){
+			return $query;
+		}else{
+			return false;
+		}
+	}
+
+	public function updateExchangeRate($currency,$rate){
+		$sql = "UPDATE `exchange_rate` SET `exchange_rate` = ? WHERE (`target_currency` = ?);";
+		$query = $this->db->query($sql , array($currency,$rate));
+		return $query;
+	}
+
+	//Liste des pays dont un wallet est actif
+	public function getWalletsCountries(){
+		$sql= "SELECT id , name , currency_code FROM countries_currencies WHERE id IN (
+					 SELECT distinct c.id FROM networks n INNER JOIN countries_currencies c ON n.country_id=c.id INNER JOIN configWallet cw ON cw.id_network = n.id WHERE status = 1
+					);";
+		$query = $this->db->query($sql);
+		if($query->num_rows()>0){
+			return $query;
+		}else{
+			return false;
+		}
+	}
 
 }

application/views/calculator.php

@@ -0,0 +1,297 @@
+<link rel="stylesheet"
+	  href="<?php echo base_url('bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css') ?>">
+<link rel="stylesheet"
+	  href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.15/css/bootstrap-multiselect.css">
+<link rel="stylesheet" href="<?php echo base_url('bower_components/toastr/toastr.css') ?>">
+<?php
+use Brick\Money\CurrencyConverter;
+use Brick\Money\ExchangeRateProvider\PDOProvider;
+use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration;
+use Brick\Money\ExchangeRateProvider\BaseCurrencyProvider;
+use Brick\Math\RoundingMode;
+use Brick\Money\Money;
+extract($_POST);
+
+$showResult = false;
+$frais = 0;
+$config = $hasWallet->first_row();
+if(isset($save))
+{
+	$showResult = true;
+	switch($operation) {
+			case 1: //Envoi wallet à wallet
+				$frais = ($init_country != $final_country) ? calculateFees1($plr_user_wallet_wallet, $montant) : calculateFees2($config->taux_com_user_wallet_wallet_min , $config->taux_com_user_wallet_wallet_max, $config->taux_com_user_wallet_wallet, $montant);
+				break;
+			case '-':
+				$res=$fn-$sn;
+				break;
+	}
+}
+
+function calculateFees1(array $paliers , $montant){
+	$size = sizeof($paliers);
+	$min = $paliers[0]->min ;
+	$max= $size > 0 ? $paliers[$size-1]->max : 0;
+	$palier = null;
+	foreach ($paliers as $p){
+		if($montant >= $p->min && $montant <= $p->max){
+			$palier = $p;
+			break;
+		}
+	}
+
+	if($palier){
+		return (($palier->min * $palier->taux /100 ) + ($palier->max * $palier->taux /100 ))/2;
+	}else{
+		if($montant < $min)
+			return $min* $paliers[0]->taux /100;
+		else if ($montant > $max)
+			return $max* $paliers[$size-1]->taux /100;
+	}
+}
+
+function calculateFees2($min , $max , $taux , $montant){
+	if($montant < $min)
+		return $min* $taux /100;
+	else if ($montant > $max)
+		return $max*$taux /100;
+	else
+		return $montant * $taux /100;
+}
+
+// set to whatever your rates are relative to
+$baseCurrency = 'USD';
+
+// use your own credentials, or re-use your existing PDO connection
+$pdo = new PDO('mysql:host='.$this->db->hostname.';dbname='.$this->db->database, $this->db->username, $this->db->password);
+
+$configuration = new PDOProviderConfiguration();
+
+$configuration->tableName                = 'exchange_rate';
+$configuration->exchangeRateColumnName   = 'exchange_rate';
+$configuration->targetCurrencyColumnName = 'target_currency';
+$configuration->sourceCurrencyCode       = $baseCurrency;
+
+// this provider loads exchange rates from your database
+$provider = new PDOProvider($pdo, $configuration);
+
+// this provider calculates exchange rates relative to the base currency
+$provider = new BaseCurrencyProvider($provider, $baseCurrency);
+
+// this currency converter can now handle any currency pair
+$converter = new CurrencyConverter($provider);
+
+//$money = Money::of('1', 'USD');
+//$mone2  = $converter->convert($money, 'XAF', RoundingMode::DOWN);
+?>
+
+<div class="content-wrapper">
+	<!-- Content Header (Page header) -->
+	<section class="content-header">
+
+		<h1>
+			<?php echo $this->lang->line('calculator'); ?>
+		</h1>
+		<?php
+		$site_url = base_url();
+
+		if ($alert == "ok") {
+
+			if (!$success == "ok") {
+				?>
+				<div class='alert alert-danger alert-dismissible col-xs-6'>
+					<button type='button' class='close' data-dismiss='alert' aria-hidden='true'>×</button>
+					<h4><i class='icon fa fa-ban'></i> Erreur!</h4>
+					<?php echo $message; ?>
+				</div>
+
+				<?php
+			} else {
+				?>
+				<div class="alert alert-success alert-dismissible col-xs-6">
+					<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+					<h4><i class="icon fa fa-check"></i> Success!</h4>
+					<?php echo $message; ?>
+				</div>
+
+				<?php
+			}
+		}
+		?>
+	</section>
+
+	<section class="content">
+		<div class="row">
+			<div class="col-xs-12">
+				<div class="box">
+					<!--					<div class="box-header">-->
+					<!---->
+					<!--					</div>-->
+					<div class="box-body">
+						<form id="calculatorForm" class="form-content" method="post">
+							<div class="form-group">
+								<div class="row">
+									<div class="col-lg-3">
+										<label for="montant" > <?php echo $this->lang->line('Montant') ?></label>
+										<input type="text" required class="form-control" id="montant"
+											   name="montant" value="<?php  echo @$montant;?>">
+									</div>
+									<div class="col-lg-3">
+										<?php
+										$result=$countries;
+										if($result){
+											$numrows=$result->num_rows();
+
+											if ($numrows > 0) { ?>
+												<label for="init_country"><?php echo $this->lang->line('departure_country') ?></label>
+												<select class="form-control" name="init_country" id="init_country"  required>
+													<?php foreach($result->result() as $row) {
+
+														echo "<option value='".$row->id."'>".$row->name."</option>";
+													} ?>
+												</select>
+											<?php }else{
+												echo $this->lang->line('no_country');
+											}
+											?>
+										<?php } else {
+											echo $this->lang->line('no_country');
+										} ?>
+									</div>
+
+									<div class="col-lg-3">
+										<?php
+										$result=$operations;
+										if($result){
+											$numrows= sizeof($result);
+											if ($numrows > 0) { ?>
+												<label for="operation">Operation</label>
+												<select class="form-control" name="operation" id="operation" <?php  echo @$operation;?> required>
+													<?php foreach($result as $row) {
+														echo "<option value='".$row->id."'>".$row->name."</option>";
+													} ?>
+												</select>
+											<?php }else{
+												echo $this->lang->line('no_operation');
+											}
+											?>
+										<?php } else {
+											echo $this->lang->line('no_operation');
+										} ?>
+									</div>
+									<div class="col-lg-3">
+										<?php
+										$result=$countries;
+										if($result){
+											$numrows=$result->num_rows();
+
+											if ($numrows > 0) { ?>
+												<label for="final_country"><?php echo $this->lang->line('country_of_destination') ?></label>
+												<select class="form-control" name="final_country" id="final_country" required>
+													<?php foreach($result->result() as $row) {
+
+														echo "<option value='".$row->id."'>".$row->name."</option>";
+													} ?>
+												</select>
+											<?php }else{
+												echo $this->lang->line('no_country');
+											}
+											?>
+										<?php } else {
+											echo $this->lang->line('no_country');
+										} ?>
+									</div>
+								</div>
+							</div>
+							<?php if($showResult) {
+								$r1 = array_filter($operations , function ($op) use ($operation){
+									return $op->id == $operation;
+								});
+								$r2 = array_filter($countries->result() , function ($c) use ($init_country){
+									return $c->id == $init_country;
+								});
+								$r3 = array_filter($countries->result() , function ($c) use ($final_country){
+									return $c->id == $final_country;
+								});
+								$op = reset($r1);
+								$d = reset($r2);
+								$f = reset($r3);
+								?>
+								<div class="login-box" style="width: 600px;">
+									<h5 ><strong style="text-decoration: underline;" >Resultat</strong> : <?=@$op->name.' du '.$d->name.' vers '.$f->name?></h5>
+									<div class="login-box-body">
+										<div class="row">
+											<?php
+											$money = Money::of(@$montant, @$d->currency_code);
+											$money2 = Money::of(round(@$montant - @$frais,0), @$d->currency_code);
+											$money2 = $converter->convert($money2, @$f->currency_code, RoundingMode::DOWN);
+											$moneyFrais = Money::of(round(@$frais,0), @$d->currency_code);
+											?>
+											<div class="col-lg-6 col-md-6">
+											<div>
+												<label> <?php echo $this->lang->line('amount_departure_country') ?></label>
+												<h4><?= $money->formatTo('fr_FR') ?></h4>
+											</div>
+											<div>
+												<label> Frais de la transaction</label>
+												<h4><?= $moneyFrais->formatTo('fr_FR') ?></h4>
+											</div>
+											</div>
+										<div class="col-lg-6 col-md-6">
+											<div>
+												<label> <?php echo $this->lang->line('amount_country_of_destination') ?></label>
+												<h4><?= $money2->formatTo('fr_FR') ?></h4>
+											</div>
+											</div>
+
+										</div>
+									</div>
+								</div>
+							<?php }?>
+							<button type="submit"
+									name="save"
+									class="btn btn-warning btn-block openModal"><?php echo $this->lang->line('calculate'); ?></button>
+						</form>
+
+					</div>
+				</div>
+			</div>
+		</div>
+	</section>
+</div>
+
+<!-- jQuery 3 -->
+<script src="<?php echo base_url('bower_components/jquery/dist/jquery.min.js') ?>"></script>
+<!-- Bootstrap 3.3.7 -->
+<script src="<?php echo base_url('bower_components/bootstrap/dist/js/bootstrap.min.js') ?>"></script>
+<!-- DataTables -->
+<script src="<?php echo base_url('bower_components/datatables.net/js/jquery.dataTables.min.js') ?>"></script>
+<script src="<?php echo base_url('bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js') ?>"></script>
+<!-- Slimscroll -->
+<script src="<?php echo base_url('bower_components/jquery-slimscroll/jquery.slimscroll.min.js') ?>"></script>
+<!-- FastClick -->
+<script src="<?php echo base_url('bower_components/fastclick/lib/fastclick.js') ?>"></script>
+<!-- AdminLTE App -->
+<script src="<?php echo base_url('dist/js/adminlte.min.js') ?>"></script>
+<!-- AdminLTE for demo purposes -->
+<script src="<?php echo base_url('dist/js/demo.js') ?>"></script>
+<script src="<?php echo base_url('bower_components/toastr/toastr.js') ?>"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.15/js/bootstrap-multiselect.js"></script>
+<script src="<?php echo base_url('dist/js/sweetalert2.js') ?>"></script>
+<script src="<?php echo base_url('bower_components/bootstrap-daterangepicker/daterangepicker.js') ?>"></script>
+<script src="<?php echo base_url('bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js') ?>"></script>
+<script src="https://cdn.jsdelivr.net/npm/autonumeric@4.5.4"></script>
+
+<script>
+	$(function () {
+		anElement = new AutoNumeric('#montant', '', {digitGroupSeparator: ' ', decimalPlaces:'0', minimumValue : '0' , maximumValue: '99999999999999999999999999'});
+
+		$("#calculatorForm").submit( function(eventObj) {
+			var txt = document.getElementById('montant');
+			const montant = anElement.getNumber();
+			txt.value = montant;
+			return true;
+		});
+		//onLoad="document.getElementById('leave').options[0].selected = 'selected';"
+	})
+</script>

application/views/codeg.php

@@ -64,7 +64,7 @@
           <div class="box-header">
               <h3 class="box-title"><?php echo $this->lang->line('Tous les codes générés'); ?></h3>
           </div>
-      <div class="box-body">
+      <div class="box-body" style="overflow-x:auto;">
 
   <?php
 

application/views/demande.php

@@ -166,7 +166,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> </h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -313,7 +313,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -455,7 +455,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -590,7 +590,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -722,7 +722,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -851,7 +851,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -983,7 +983,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -1131,7 +1131,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -1261,7 +1261,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 

application/views/demande_adhesion.php

@@ -123,7 +123,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -203,7 +203,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -278,7 +278,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 

application/views/demande_credit.php

@@ -189,7 +189,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> </h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -278,7 +278,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -367,7 +367,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -447,7 +447,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -530,7 +530,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -610,7 +610,7 @@
 						<div class="box-header with-border">
 							<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 						</div>
-						<div class="box-body">
+						<div class="box-body" style="overflow-x:auto;">
 
 							<?php
 
@@ -704,7 +704,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -795,7 +795,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -874,7 +874,7 @@
 					<div class="box-header with-border">
 						<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 

application/views/game.php

@@ -9,7 +9,7 @@
                     <div class="box-header">
                         <h3 class="box-title"><?php echo $this->lang->line('Activer/Désactiver'); ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
 
                         <?php
 
@@ -197,7 +197,7 @@
 
             </div>
             <!-- /.box-header -->
-            <div class="box-body table-responsive no-padding">
+            <div class="box-body table-responsive no-padding" style="overflow-x:auto;">
               <table class="table table-hover">
                 
                 <?php

application/views/gestion_admin.php

@@ -47,7 +47,7 @@
                     <div class="box-header">
                         <h3 class="box-title"><?php echo $this->lang->line('Administrateurs'); ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
 
                         <?php
 

application/views/gestion_monnaie.php

@@ -4,12 +4,10 @@
 <link rel="stylesheet" href="<?php echo base_url('bower_components/bootstrap-daterangepicker/daterangepicker.css') ?>">
 <link rel="stylesheet" href="<?php echo base_url('plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css') ?>">
 <link rel="stylesheet" href="<?php echo base_url('bower_components/toastr/toastr.css') ?>">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto|Varela+Round|Open+Sans">
+<link rel="stylesheet" href="<?php echo base_url('bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css') ?>">
-<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
 <style type="text/css">
 	.table-wrapper {
-		width: 700px;
+		width: 500px;
 		margin: 30px auto;
 		background: #fff;
 		padding: 20px;
@@ -90,6 +88,41 @@
 		display: none;
 	}
 </style>
+<?php
+use Brick\Money\CurrencyConverter;
+use Brick\Money\ExchangeRateProvider\PDOProvider;
+use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration;
+use Brick\Money\ExchangeRateProvider\BaseCurrencyProvider;
+use Brick\Math\RoundingMode;
+use Brick\Money\Money;
+
+// set to whatever your rates are relative to
+$baseCurrency = 'USD';
+
+// use your own credentials, or re-use your existing PDO connection
+$pdo = new PDO('mysql:host='.$this->db->hostname.';dbname='.$this->db->database, $this->db->username, $this->db->password);
+
+$configuration = new PDOProviderConfiguration();
+
+$configuration->tableName                = 'exchange_rate';
+$configuration->exchangeRateColumnName   = 'exchange_rate';
+$configuration->targetCurrencyColumnName = 'target_currency';
+$configuration->sourceCurrencyCode       = $baseCurrency;
+
+// this provider loads exchange rates from your database
+$provider = new PDOProvider($pdo, $configuration);
+
+// this provider calculates exchange rates relative to the base currency
+$provider = new BaseCurrencyProvider($provider, $baseCurrency);
+
+// this currency converter can now handle any currency pair
+$converter = new CurrencyConverter($provider);
+
+//$money = Money::of('1', 'USD');
+//$mone2  = $converter->convert($money, 'XAF', RoundingMode::DOWN);
+
+?>
+
 <div class="content-wrapper">
 	<!-- Content Header (Page header) -->
 	<section class="content-header">
@@ -137,56 +170,53 @@
 					</div>
 			</div>
 		</div>
-		<div class="table-wrapper">
+		<div class="row">
+			<div class="table-wrapper" style="overflow-x:auto;">
 							<div class="table-title">
 								<div class="row">
 									<div class="col-sm-8">
-						<label for="nom"
+										<label class="col-form-label"><?php echo $this->lang->line('conversion_rate') ; ?></label>
-							   class="col-form-label"><?php echo $this->lang->line('conversion_rate') ; ?></label>
-					</div>
-					<div class="col-sm-4">
-						<button type="button" class="btn btn-info add-new new1"><i class="fa fa-plus"></i> <?php echo $this->lang->line('new_rate') ; ?></button>
 									</div>
 								</div>
 							</div>
-			<table id="taux_conversion" class="table table-bordered">
+				<table id="taux_conversion" class="table table-bordered table-striped" >
 					<thead>
 					<tr>
-					<th><?php echo $this->lang->line('currency') ; ?> </th>
+						<th width="60%"><?php echo $this->lang->line('currency') ; ?> </th>
 						<th><?php echo $this->lang->line('rate') ; ?> (%) </th>
-					<th>Actions</th>
 					</tr>
 					</thead>
 					<tbody>
-<!--				--><?php
+					<?php
-//				if($plr_user_wallet_wallet!=false){
+					if($currencies!=false){
-//					foreach($plr_user_wallet_wallet->result() as $row) {
+						foreach($currencies->result() as $row) {
-//						echo "<tr>
+							$name = $this->session->userdata('site_lang') === 'french' ? $row->name_fr : $row->name_en;
-//																	<td>".$row->min."</td>
+							echo "<tr>
-//																	<td>".$row->max."</td>
+																	<td>".$row->code.' - '.$name."</td>
-//																	  <td>".$row->taux."</td>".'
+																	  <td>".round($provider->getExchangeRate($currency_code ,$row->code)->toFloat(),3)."</td>".'
-//																	  <td>
+																	 </tr>';
-//																		<a class="add add1" title="Add" data-toggle="tooltip"><i class="material-icons">&#xE03B;</i></a>
+						}
-//																		<a class="edit edit1" title="Edit" data-toggle="tooltip"><i class="material-icons">&#xE254;</i></a>
+					}
-//																		<a class="delete delete1" title="Delete" data-toggle="tooltip"><i class="material-icons">&#xE872;</i></a>
+					?>
-//																	</td>
-//																	 </tr>';
-//					}
-//				}
-//				?>
 					</tbody>
 				</table>
+
 				<button type="button" id="save" class="btn btn-primary btn-block" >
-				<b><?php echo $this->lang->line('save'); ?></b>
+					<b><?php echo $this->lang->line('update_rate'); ?></b>
 				</button>
 			</div>
+		</div>
 
 	</section>
 </div>
+
 <!-- jQuery 3 -->
 <script src="<?php echo base_url('bower_components/jquery/dist/jquery.min.js') ?>"></script>
 <!-- Bootstrap 3.3.7 -->
 <script src="<?php echo base_url('bower_components/bootstrap/dist/js/bootstrap.min.js') ?>"></script>
+<!-- DataTables -->
+<script src="<?php echo base_url('bower_components/datatables.net/js/jquery.dataTables.min.js') ?>"></script>
+<script src="<?php echo base_url('bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js') ?>"></script>
 <!-- Slimscroll -->
 <script src="<?php echo base_url('bower_components/jquery-slimscroll/jquery.slimscroll.min.js') ?>"></script>
 <!-- FastClick -->
@@ -195,11 +225,17 @@
 <script src="<?php echo base_url('dist/js/adminlte.min.js') ?>"></script>
 <!-- AdminLTE for demo purposes -->
 <script src="<?php echo base_url('dist/js/demo.js') ?>"></script>
-
-<script src="<?php echo base_url('dist/js/sweetalert2.js') ?>"></script>
 <script src="<?php echo base_url('bower_components/toastr/toastr.js') ?>"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.15/js/bootstrap-multiselect.js"></script>
+<script src="<?php echo base_url('dist/js/sweetalert2.js') ?>"></script>
 
 
+<script>
+	$(function() {
+		$('#taux_conversion').DataTable();
+	})
+</script>
+
 <script>
 	toastr.options.closeButton = true;
 	toastr.options.closeMethod = 'fadeOut';
@@ -207,147 +243,33 @@
 	toastr.options.closeEasing = 'swing';
 
 	$('#save').click(function () {
-		// const network_id = $(this).data('network-id');
+		$.ajax({
-		// const id_config = $(this).data('id-config');
+			url: '<?php echo base_url('index.php/Gestion/fetchExchangeRates')?>',
-
+			type: 'GET',
-		var taux_conversion = [];
+			dataType: 'json',
-
+			success: function (data) {
-		$('#taux_conversion tr').has('td').each(function() {
+				if(data=='200'){
-			var arrayItem = {};
+					Swal.fire({
-			$('td', $(this)).each(function(index, item) {
+						icon: 'success',
-				if(index < 3)
+						title: "<?php echo $this->lang->line('rates_update')?>",
-					arrayItem[index] = $(item).html();
+						text:"<?php echo $this->lang->line('informations_updated')?>",
+						timer: 3000
+					}).then(()=>{
+						location.reload();
 					});
-			taux_conversion.push(arrayItem);
-		});
-
-		console.log(taux_conversion)
-
-				//$.ajax({
-				//	url: '<?php //echo base_url('index.php/Gestion/taux_converison')?>//',
-				//	type: 'POST',
-				//	dataType: 'json',
-				//	data: {
-				//		"type" : "ilink",
-				//		"network_id": network_id,"id_config" : id_config,
-				//		"taux_conversion" :taux_conversion
-				//	},
-				//	success: function (data) {
-				//		if(data=='200'){
-				//			Swal.fire({
-				//				icon: 'success',
-				//				title: "<?php //echo $this->lang->line('wallet_update')?>//",
-				//				text:"<?php //echo $this->lang->line('informations_updated')?>//",
-				//				timer: 3000
-				//			}).then(()=>{
-				//				location.reload();
-				//			});
-				//			// alert("Les informations ont été mises à jour.") ? "" :
-				//		}else{
-				//			toastr.error("<?php //echo $this->lang->line('error_message')?>//" , "<?php //echo $this->lang->line('request_error')?>//");
-				//		}
-				//	},
-				//
-				//	error: function (resultat, statut, error) {
-				//		console.log(resultat + " " + error);
-				//		toastr.error("<?php //echo $this->lang->line('error_message')?>//" , "<?php //echo $this->lang->line('request_error')?>//");
-				//	}
-				//});
-
-
-	});
-</script>
-
-<script>
-	// Paliers scripts
-	$(document).ready(function() {
-		$('[data-toggle="tooltip"]').tooltip();
-		var actions1 = $("#taux_conversion td:last-child").html();
-		// Append table with add row form on add new button click
-		$(".new1").click(function(){
-			if(!actions1){
-				actions1 = '<a class="add add1" title="Add" data-toggle="tooltip"><i class="material-icons">&#xE03B;</i></a>\n' +
-						'                            <a class="edit edit1" title="Edit" data-toggle="tooltip"><i class="material-icons">&#xE254;</i></a>\n' +
-						'                            <a class="delete delete1" title="Delete" data-toggle="tooltip"><i class="material-icons">&#xE872;</i></a>';
-			}
-			$(this).attr("disabled", "disabled");
-			var index = $("#taux_conversion tbody tr:last-child").index();
-			var row = "<tr> <td>"+
-							<?php
-							$result=$currencies;
-
-							$numrows=$result->num_rows();
-									if ($numrows > 0) {
-									echo '"<select  class='.'form-control input-lg'.' id='.'currency'.' required>';
-							foreach($result->result() as $row) {
-								echo "<option value=".$row->code.">".$row->code.' - '.$row->name_fr."</option>";
-							}
-							echo '</select>"';
-							 }
-							?>
-					+"</td>" +
-					"<td><input type='number' required class='form-control' min='0' name='taux' id='taux'></td>" +
-					"<td>" + actions1 + "</td>" +
-					"</tr>";
-			$("#taux_conversion").append(row);
-			$("#taux_conversion tbody tr").eq(index + 1).find(".add, .edit").toggle();
-			$('[data-toggle="tooltip"]').tooltip();
-		});
-		// Add row on add button click
-		$(document).on("click", ".add1", function(){
-			var empty = false;
-			var input = $(this).parents("tr").find('input[type="number"]');
-			var select = $(this).parents("tr").find('select[id="currency"]');
-			input.each(function(){
-					if(!$(this)[0].checkValidity()){
-						$(this).addClass("error");
-						$(this)[0].reportValidity();
-						empty = true;
 				}else{
-						$(this).removeClass("error");
+					toastr.error("<?php echo $this->lang->line('error_message')?>" , "<?php echo $this->lang->line('request_error')?>");
 				}
+			},
 
-			});
+			error: function (resultat, statut, error) {
-			$(this).parents("tr").find(".error").first().focus();
+				console.log(resultat + " " + error);
-			if(!empty){
+				toastr.error("<?php echo $this->lang->line('error_message')?>" , "<?php echo $this->lang->line('request_error')?>");
-				select.each(function(){
-					$(this).parent("td").html($(this).val());
-				});
-				input.each(function(){
-					$(this).parent("td").html($(this).val());
-				});
-				$(this).parents("tr").find(".add, .edit").toggle();
-				$(".new1").removeAttr("disabled");
 			}
 		});
-		// Edit row on edit button click
-		$(document).on("click", ".edit1", function(){
-			$(this).parents("tr").find("td:not(:last-child)").each(function(index){
-				if(index == 0)
-					$(this).html("<?php
-									$result=$currencies;
-							$numrows=$result->num_rows();
-							if ($numrows > 0) {
-						echo "<select  class='form-control' id='currency' value='".'EUR'."'  required>";
-					 foreach($result->result() as $row) {
-						echo "<option value=".$row->code.">".$row->code.' - '.$row->name_fr."</option>";
-					 }
-					echo '</select>';
-					}
-  					?>");
-				if(index == 1)
-					$(this).html('<input type="number" required class="form-control"  min="0" value="' + $(this).text() + '">');
-			});
-			$(this).parents("tr").find(".add, .edit").toggle();
-			$(".new1").attr("disabled", "disabled");
-		});
-		// Delete row on delete button click
-		$(document).on("click", ".delete1", function(){
-			$(this).parents("tr").remove();
-			$(".new1").removeAttr("disabled");
-		});
 	});
 </script>
 
+
 <!-- Page script -->
 <script src="<?php echo base_url('dist/js/custom.js') ?>"></script>

application/views/gestion_monnaies.php

@@ -44,7 +44,7 @@
 					<div class="box-header">
 						<h3 class="box-title"><?php echo $this->lang->line('activated_wallets'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 
@@ -77,7 +77,7 @@
 										?>
 										<?php
 											?>
-											<td><?php echo $row->currency_name_fr; ?></td>
+											<td><?php echo $this->session->userdata('site_lang') === 'french' ? $row->currency_name_fr : $row->currency_name_en ?></td>
 											<td><?php echo $row->currency_code; ?></td>
 											<?php
 

application/views/gestion_networks.php

@@ -43,7 +43,7 @@
                     <div class="box-header">
                         <h3 class="box-title"><?php echo $this->lang->line('Réseaux assignés'); ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
 
                         <?php
 

application/views/gestion_publicite.php

@@ -40,7 +40,7 @@
                             <div class="box-header">
                                 <h3 class="box-title">Publicité interstitielle</h3>
                             </div>
-                            <div class="box-body table-responsive no-padding">
+                            <div class="box-body table-responsive no-padding" style="overflow-x:auto;">
                                 <table class="table table-hover">
                                     <tbody>
                                     <tr>

application/views/gestion_villes.php

@@ -41,7 +41,7 @@
                     <div class="box-header">
                         <h3 class="box-title"><?php echo $this->lang->line('Activer/Désactiver'); ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
 
                         <?php
 

application/views/gestion_wallet.php

@@ -329,7 +329,7 @@ if ($transactions != false) {
 					<div class="box-header">
 						<h3 class="box-title"><?php echo $this->lang->line('Commission Hyperviseur') ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 						<table id="example1" class="table table-bordered table-hover">
 							<thead>
 							<tr>

application/views/gestion_wallet_hyp.php

@@ -375,7 +375,7 @@
                     <div class="box-header">
                         <h3 class="box-title"><?php echo  $this->lang->line('Commissions Superviseurs') ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
                         <table id="example1" class="table table-bordered table-hover">
                             <thead>
                             <tr>

application/views/gestion_wallet_ilink.php

@@ -435,7 +435,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_wallet_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -464,7 +464,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_wallet_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -493,7 +493,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_cash_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -522,7 +522,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_cash_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -551,7 +551,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_depot_wallet_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -580,7 +580,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_depot_wallet_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -609,7 +609,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_cash_cash_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -638,7 +638,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_cash_cash_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -700,7 +700,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
 					<div class="box-header">
 						<h3 class="box-title"><?php echo $this->lang->line('Commission Hyperviseur') ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 						<table id="example1" class="table table-bordered table-hover">
 							<thead>
 							<tr>

application/views/gestion_wallet_ilink_hyp.php

@@ -568,7 +568,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_wallet_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -597,7 +597,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_wallet_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -626,7 +626,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_cash_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -655,7 +655,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_user_wallet_cash_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -684,7 +684,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_depot_wallet_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -713,7 +713,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_depot_wallet_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -742,7 +742,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_cash_cash_international'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -771,7 +771,7 @@
 						<h3 class="box-title"><?php echo $this->lang->line('rate_com_agent_cash_cash_national'); ?></h3>
 					</div>
 					<!-- /.box-header -->
-					<div class="box-body table-responsive">
+					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<tbody>
 							<tr>
@@ -832,7 +832,7 @@
                     <div class="box-header">
                         <h3 class="box-title"><?php echo  $this->lang->line('Commissions Superviseurs') ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
                         <table id="example1" class="table table-bordered table-hover">
                             <thead>
                             <tr>
@@ -909,7 +909,7 @@
 							<form id="walletForm">
 							<div class="row">
 								<div class="col-lg-4">
-										<div class="form-group">
+										<div class="form-group" style="overflow-x:auto;">
 											<div class="table-title">
 												<div class="row">
 													<div class="col-sm-8">
@@ -973,7 +973,7 @@
 												</div>
 											</div>
 										</div>
-										<div class="form-group">
+										<div class="form-group" style="overflow-x:auto;">
 											<div class="table-title">
 												<div class="row">
 													<div class="col-sm-8">
@@ -1084,7 +1084,7 @@
 												</div>
 											</div>
 										</div>
-									<div class="form-group">
+									<div class="form-group" style="overflow-x:auto;">
 										<div class="table-title">
 											<div class="row">
 												<div class="col-sm-8">
@@ -1155,7 +1155,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="form-group">
+									<div class="form-group" style="overflow-x:auto;">
 										<div class="table-title">
 											<div class="row">
 												<div class="col-sm-8">

application/views/gestion_wallet_sup.php

@@ -225,7 +225,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
                     <div class="box-header">
                         <h3 class="box-title"><?php echo  $this->lang->line('Commissions Agents') ?></h3>
                     </div>
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
                         <table id="example1" class="table table-bordered table-hover">
                             <thead>
                             <tr>

application/views/gestion_wallets.php

@@ -44,7 +44,7 @@
 					<div class="box-header">
 						<h3 class="box-title"><?php echo $this->lang->line('Réseaux activés'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 
 						<?php
 

application/views/header_hyp.php

@@ -154,6 +154,13 @@
 							<i class="glyphicon glyphicon-lock"></i> <span><?php echo $this->lang->line('menu_wallet_password'); ?></span>
 						</a>
 					</li>
+					<?php if($hasWallet->first_row()->type == 'ilink'){ ?>
+						<li class="<?php if($active=="calculator"){echo "active";}  ?>">
+							<a href="<?php echo base_url('index.php/Hyperviseur_dash/calculator') ?>">
+								<i class="glyphicon glyphicon-adjust"></i> <span><?php echo $this->lang->line('calculator'); ?></span>
+							</a>
+						</li>
+					<?php }?>
                 <?php } ?>
             </ul>
 

application/views/historique_recharges.php

@@ -76,7 +76,7 @@
 					<div class="box-header">
 						<h3 class="box-title"><?php echo $this->lang->line('recharge_historic'); ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 						<?php
 						if($transactions){
 							$numrows = $transactions->num_rows();

application/views/historique_transactions.php

@@ -76,7 +76,7 @@
 					<div class="box-header">
 						<h3 class="box-title"><?php echo $this->lang->line('Historique des transactions') ?></h3>
 					</div>
-					<div class="box-body">
+					<div class="box-body" style="overflow-x:auto;">
 						<?php
 						if($transactions){
 							$numrows = $transactions->num_rows();
@@ -97,6 +97,7 @@
 									<th><?php echo $this->lang->line('Commission de l\'hyperviseur') ?></th>
 									<th><?php echo $this->lang->line('Commission du superviseur') ?></th>
 									<th><?php echo $this->lang->line('Commission de l\'agent') ?></th>
+									<th><?php echo $this->lang->line('agent_name') ?></th>
 									<th align='center'>Date</th>
 								</tr>
 								</thead>
@@ -127,6 +128,7 @@
 											<td>".$fmt->format( $row->commission_hyp)."</td>
 											<td>".$fmt->format( $row->commission_sup)."</td>
 											<td>".$fmt->format( $row->commission_ag)."</td>
+											<td>".$row->agent."</td>
 											<td>".toLocateDate($row->date_created,$this->session->userdata('timezone'))."</td>
 											 </tr>";
 
@@ -183,7 +185,7 @@
 		$('#transactions').DataTable({
 			"aaSorting": [[ 0, "desc" ]],
 			"columnDefs": [ {
-				targets: 9,
+				targets: 10,
 				render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
 			}]
 		});

application/views/hyperviseur_dash.php

@@ -172,9 +172,8 @@ if($users_geolocated_query!=false){
     <section class="content">
         <!-- Small boxes (Stat box) -->
         <div class="row">
-
             <!-- ./col -->
-            <div class="col-lg-2 col-xs-2">
+            <div class="col-lg-2 col-md-4 col-xs-6">
                 <!-- small box -->
                 <div class="small-box bg-yellow">
                     <div class="inner">
@@ -189,7 +188,7 @@ if($users_geolocated_query!=false){
                 </div>
             </div>
             <!-- ./col -->
-            <div class="col-lg-2 col-xs-2">
+            <div class="col-lg-2 col-md-4 col-xs-6">
                 <!-- small box -->
                 <div class="small-box bg-aqua">
                     <div class="inner">
@@ -203,7 +202,7 @@ if($users_geolocated_query!=false){
                     <a href="<?php echo base_url('index.php/Hyperviseur_dash/getAllSupervisor') ?>" class="small-box-footer"><?php echo $this->lang->line("Plus d'informations"); ?> <i class="fa fa-arrow-circle-right"></i></a>
                 </div>
             </div>
-            <div class="col-lg-2 col-xs-2">
+            <div class="col-lg-2 col-md-4 col-xs-6">
                 <!-- small box -->
                 <div class="small-box bg-green">
                     <div class="inner">
@@ -217,7 +216,7 @@ if($users_geolocated_query!=false){
                     <a href="#" data-toggle="modal" data-target="#modal-default2" class="small-box-footer"><?php echo $this->lang->line("Plus d'informations"); ?> <i class="fa fa-arrow-circle-right"></i></a>
                 </div>
             </div>
-            <div class="col-lg-2 col-xs-2">
+            <div class="col-lg-2 col-md-4 col-xs-6">
                 <!-- small box -->
                 <div class="small-box bg-green">
                     <div class="inner">
@@ -231,7 +230,7 @@ if($users_geolocated_query!=false){
                     <a href="#" data-toggle="modal" data-target="#modal-default2" class="small-box-footer"><?php echo $this->lang->line("Plus d'informations"); ?> <i class="fa fa-arrow-circle-right"></i></a>
                 </div>
             </div>
-            <div class="col-lg-2 col-xs-2">
+            <div class="col-lg-2 col-md-4 col-xs-6">
                 <!-- small box -->
                 <div class="small-box bg-red">
                     <div class="inner">
@@ -245,7 +244,9 @@ if($users_geolocated_query!=false){
                     <a href="#" data-toggle="modal" data-target="#modal-default2" class="small-box-footer"><?php echo $this->lang->line("Plus d'informations"); ?> <i class="fa fa-arrow-circle-right"></i></a>
                 </div>
             </div>
-
+            <!-- /.col -->
+        </div>
+		<div class="row">
 			<div class="col-xs-12">
 				<!-- BAR CHART -->
 				<div class="box box-success">
@@ -261,7 +262,8 @@ if($users_geolocated_query!=false){
 				</div>
 				<!-- /.box -->
 			</div>
-            <!-- /.col -->
+		</div>
+		<div class="row">
 			<div class="col-xs-6">
 				<!-- DONUT CHART -->
 				<div class="box box-danger">

application/views/list_user_s.php

@@ -39,7 +39,7 @@
                         <h3 class="box-title">Liste des utilisateurs de votre zone</h3>
                     </div>
                     <!-- /.box-header -->
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
 
                         <?php
                         $this->db->select('*');

application/views/listeAdmin_save.php

@@ -311,7 +311,7 @@ function randomString($length=10 )
                 
 
                 <div class="container-fluid">
-                    <div class="row-fluid">
+                    <div class="row-fluid" style="overflow-x:auto;">
                         <?php
 
 $result=$this->db->get('users');

application/views/listeAdmin_save2.php

@@ -311,7 +311,7 @@ function randomString($length=10 )
 
 
             <div class="container-fluid">
-                <div class="row-fluid">
+                <div class="row-fluid" style="overflow-x:auto;">
                     <?php
 
 $result=$this->db->get('users');

application/views/listeUsers.php

@@ -158,7 +158,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
         </ul>
 
         <div class="container-fluid">
-            <div class="row-fluid">
+            <div class="row-fluid" style="overflow-x:auto;">
                     
 
     

application/views/listeadmin.php

@@ -70,7 +70,7 @@
                             <h3 class="box-title"><?php echo $this->lang->line('Tous les'); ?> <?php echo $map_title ?> <?php //if($this->session->userdata('category')=='super'){ echo  "(".$numberGeo." ".$this->lang->line('Restant').")";} ?></h3>
                         </div>
                         <!-- /.box-header -->
-                        <div class="box-body">
+                        <div class="box-body" style="overflow-x:auto;">
 
                             <?php
 

application/views/listemembers.php

@@ -46,7 +46,7 @@
           <h3 class="box-title"><?php echo $this->lang->line('Utilisateurs simples'); ?></h3>
         </div>
         <!-- /.box-header -->
-        <div class="box-body">
+        <div class="box-body" style="overflow-x:auto;">
 
           <?php
 

application/views/membreCode.php

@@ -250,7 +250,7 @@ function randomString1($length=10 )
     <div class="row-fluid">
     <div class="block span6">
         <a href="#tablewidget" class="block-heading" data-toggle="collapse">Demandes<span class="label label-warning"><?php echo $this->db->count_all('demande_superviseur');?></span></a>
-        <div id="tablewidget" class="block-body collapse in">
+        <div id="tablewidget" class="block-body collapse in" style="overflow-x:auto;">
            <?php
 
 $sql2 = $this->db->get('demande_superviseur');
@@ -402,7 +402,7 @@ else {
     </div>
     <div class="block span6">
         <a href="#widget1container" class="block-heading" data-toggle="collapse">Codes' Table </a>
-        <div id="widget1container" class="block-body collapse in">
+        <div id="widget1container" class="block-body collapse in" style="overflow-x:auto;">
           <?php
 
 $sql1 = $this->db->query('SELECT * FROM codemembre');

application/views/membreCodeAdmin.php

@@ -57,7 +57,7 @@
                         <h3 class="box-title"><?php echo $this->lang->line("Demandes adhésion"); ?></h3>
                     </div>
                     <!-- /.box-header -->
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
                         <?php
 
  $sql2 = $list_dem;
@@ -160,7 +160,7 @@
                         <h3 class="box-title"><?php echo $this->lang->line("Codes valides"); ?></h3>
                     </div>
                     <!-- /.box-header -->
-                    <div class="box-body">
+                    <div class="box-body" style="overflow-x:auto;">
                         <?php
 
   $sql1 = $list_codes;

application/views/membreCodeAdmin_save.php

@@ -307,7 +307,7 @@ function randomString1($length=10 )
     <div class="row-fluid">
     <div class="block span6">
         <a href="#tablewidget" class="block-heading" data-toggle="collapse">Demandes<span class="label label-warning"><?php echo $this->db->count_all('demande_superviseur');?></span></a>
-        <div id="tablewidget" class="block-body collapse in">
+        <div id="tablewidget" class="block-body collapse in" style="overflow-x:auto;">
            <?php
 
 $sql2 = $this->db->get('demande_superviseur');
@@ -456,7 +456,7 @@ else {
     
     <div class="block span6">
         <a href="#widget1container" class="block-heading" data-toggle="collapse">Codes' Table </a>
-      <div id="widget1container" class="block-body collapse in">
+      <div id="widget1container" class="block-body collapse in" style="overflow-x:auto;">
           <?php
 
 $sql1 = $this->db->query('SELECT * FROM codemembre');

application/views/search.php

@@ -338,7 +338,7 @@ echo "You have selected :" .$selected_val;  // Displaying Selected Value
         
 
         <div class="container-fluid">
-            <div class="row-fluid">
+            <div class="row-fluid" style="overflow-x:auto;">
  <?php
 if($this->input->post('cherch'))
               {

application/views/test.php

@@ -5,7 +5,7 @@
 <div class="content-wrapper">
     <section class="content">
         <div class="row">
-            <div class="col-md-4 col-sm-6 col-xs-12">
+            <div class="col-md-4 col-sm-6 col-xs-12" style="overflow-x:auto;">
                 <table id="example" class="display" style="width:100%">
         <thead>
         <tr>

application/views/wallet_password.php

@@ -9,8 +9,6 @@
 
 		<h1>
 			<?php echo $this->lang->line('header_wallet_password'); ?>
-			<input type="button" class="btn btn-primary pull-right" id="Bactiver"
-				   value="Activer/Désactiver le(s) réseau(x)" style="display: none;"/>
 		</h1>
 		<?php
 		$site_url = base_url();

bower.json

@@ -57,6 +57,7 @@
     "jquery-sparkline": "^2.1.3",
     "font-awesome": "^4.7.0",
     "Ionicons": "ionicons#^2.0.1",
-    "jquery-ui": "1.11.4"
+    "jquery-ui": "1.11.4",
+	"toastr": "^2.1.3"
   }
 }

composer.json

@@ -13,7 +13,8 @@
 	"require": {
 		"php": ">=5.4",
 		"spatie/async": "^1.4",
-		"nesbot/carbon": "^2.33"
+		"nesbot/carbon": "^2.33",
+		"brick/money": "^0.4.5"
 	},
 	"suggest": {
 		"paragonie/random_compat": "Provides better randomness in PHP 5.x"

dist/js/money.js

@@ -0,0 +1,166 @@
+/*!
+ * money.js / fx() v0.2
+ * Copyright 2014 Open Exchange Rates
+ *
+ * JavaScript library for realtime currency conversion and exchange rate calculation.
+ *
+ * Freely distributable under the MIT license.
+ * Portions of money.js are inspired by or borrowed from underscore.js
+ *
+ * For details, examples and documentation:
+ * http://openexchangerates.github.io/money.js/
+ */
+(function(root, undefined) {
+
+	// Create a safe reference to the money.js object for use below.
+	var fx = function(obj) {
+		return new fxWrapper(obj);
+	};
+
+	// Current version.
+	fx.version = '0.2';
+
+
+	/* --- Setup --- */
+
+	// fxSetup can be defined before loading money.js, to set the exchange rates and the base
+	// (and default from/to) currencies - or the rates can be loaded in later if needed.
+	var fxSetup = root.fxSetup || {
+		rates : {},
+		base : ""
+	};
+
+	// Object containing exchange rates relative to the fx.base currency, eg { "GBP" : "0.64" }
+	fx.rates = fxSetup.rates;
+
+	// Default exchange rate base currency (eg "USD"), which all the exchange rates are relative to
+	fx.base = fxSetup.base;
+
+	// Default from / to currencies for conversion via fx.convert():
+	fx.settings = {
+		from : fxSetup.from || fx.base,
+		to : fxSetup.to || fx.base
+	};
+
+
+	/* --- Conversion --- */
+
+	// The base function of the library: converts a value from one currency to another
+	var convert = fx.convert = function(val, opts) {
+		// Convert arrays recursively
+		if (typeof val === 'object' && val.length) {
+			for (var i = 0; i< val.length; i++ ) {
+				val[i] = convert(val[i], opts);
+			}
+			return val;
+		}
+
+		// Make sure we gots some opts
+		opts = opts || {};
+
+		// We need to know the `from` and `to` currencies
+		if( !opts.from ) opts.from = fx.settings.from;
+		if( !opts.to ) opts.to = fx.settings.to;
+
+		// Multiple the value by the exchange rate
+		return val * getRate( opts.to, opts.from );
+	};
+
+	// Returns the exchange rate to `target` currency from `base` currency
+	var getRate = function(to, from) {
+		// Save bytes in minified version
+		var rates = fx.rates;
+
+		// Make sure the base rate is in the rates object:
+		rates[fx.base] = 1;
+
+		// Throw an error if either rate isn't in the rates array
+		if ( !rates[to] || !rates[from] ) throw "fx error";
+
+		// If `from` currency === fx.base, return the basic exchange rate for the `to` currency
+		if ( from === fx.base ) {
+			return rates[to];
+		}
+
+		// If `to` currency === fx.base, return the basic inverse rate of the `from` currency
+		if ( to === fx.base ) {
+			return 1 / rates[from];
+		}
+
+		// Otherwise, return the `to` rate multipled by the inverse of the `from` rate to get the
+		// relative exchange rate between the two currencies
+		return rates[to] * (1 / rates[from]);
+	};
+
+
+	/* --- OOP wrapper and chaining --- */
+
+	// If fx(val) is called as a function, it returns a wrapped object that can be used OO-style
+	var fxWrapper = function(val) {
+		// Experimental: parse strings to pull out currency code and value:
+		if ( typeof	val === "string" ) {
+			this._v = parseFloat(val.replace(/[^0-9-.]/g, ""));
+			this._fx = val.replace(/([^A-Za-z])/g, "");
+		} else {
+			this._v = val;
+		}
+	};
+
+	// Expose `wrapper.prototype` as `fx.prototype`
+	var fxProto = fx.prototype = fxWrapper.prototype;
+
+	// fx(val).convert(opts) does the same thing as fx.convert(val, opts)
+	fxProto.convert = function() {
+		var args = Array.prototype.slice.call(arguments);
+		args.unshift(this._v);
+		return convert.apply(fx, args);
+	};
+
+	// fx(val).from(currency) returns a wrapped `fx` where the value has been converted from
+	// `currency` to the `fx.base` currency. Should be followed by `.to(otherCurrency)`
+	fxProto.from = function(currency) {
+		var wrapped = fx(convert(this._v, {from: currency, to: fx.base}));
+		wrapped._fx = fx.base;
+		return wrapped;
+	};
+
+	// fx(val).to(currency) returns the value, converted from `fx.base` to `currency`
+	fxProto.to = function(currency) {
+		return convert(this._v, {from: this._fx ? this._fx : fx.settings.from, to: currency});
+	};
+
+
+	/* --- Module Definition --- */
+
+	// Export the fx object for CommonJS. If being loaded as an AMD module, define it as such.
+	// Otherwise, just add `fx` to the global object
+	if (typeof exports !== 'undefined') {
+		if (typeof module !== 'undefined' && module.exports) {
+			exports = module.exports = fx;
+		}
+		exports.fx = fx;
+	} else if (typeof define === 'function' && define.amd) {
+		// Return the library as an AMD module:
+		define([], function() {
+			return fx;
+		});
+	} else {
+		// Use fx.noConflict to restore `fx` back to its original value before money.js loaded.
+		// Returns a reference to the library's `fx` object; e.g. `var money = fx.noConflict();`
+		fx.noConflict = (function(previousFx) {
+			return function() {
+				// Reset the value of the root's `fx` variable:
+				root.fx = previousFx;
+				// Delete the noConflict function:
+				fx.noConflict = undefined;
+				// Return reference to the library to re-assign it:
+				return fx;
+			};
+		})(root.fx);
+
+		// Declare `fx` on the root (global/window) object:
+		root['fx'] = fx;
+	}
+
+	// Root will be `window` in browser or `global` on the server:
+}(this));