From 60a1f1149dce6c43c0b4a6bc074b06f2c6276a4f Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Fri, 5 Jun 2020 17:53:04 +0100 Subject: [PATCH] + Fix bugs due on responsive and add calculator --- application/controllers/Gestion.php | 28 +- application/controllers/Hyperviseur_dash.php | 49 +- application/language/english/message_lang.php | 1 + application/language/french/message_lang.php | 12 + application/models/User_model.php | 54 +- application/views/calculator.php | 297 +++++ application/views/codeg.php | 2 +- application/views/demande.php | 18 +- application/views/demande_adhesion.php | 6 +- application/views/demande_credit.php | 18 +- application/views/game.php | 4 +- application/views/gestion_admin.php | 1024 ++++++++--------- application/views/gestion_monnaie.php | 288 ++--- application/views/gestion_monnaies.php | 4 +- application/views/gestion_networks.php | 970 ++++++++-------- application/views/gestion_publicite.php | 2 +- application/views/gestion_villes.php | 738 ++++++------ application/views/gestion_wallet.php | 2 +- application/views/gestion_wallet_hyp.php | 2 +- application/views/gestion_wallet_ilink.php | 18 +- .../views/gestion_wallet_ilink_hyp.php | 26 +- application/views/gestion_wallet_sup.php | 2 +- application/views/gestion_wallets.php | 2 +- application/views/header_hyp.php | 7 + application/views/historique_recharges.php | 2 +- application/views/historique_transactions.php | 6 +- application/views/hyperviseur_dash.php | 834 +++++++------- application/views/list_user_s.php | 582 +++++----- application/views/listeAdmin_save.php | 2 +- application/views/listeAdmin_save2.php | 2 +- application/views/listeUsers.php | 2 +- application/views/listeadmin.php | 2 +- application/views/listemembers.php | 748 ++++++------ application/views/membreCode.php | 6 +- application/views/membreCodeAdmin.php | 4 +- application/views/membreCodeAdmin_save.php | 6 +- application/views/search.php | 4 +- application/views/test.php | 158 +-- application/views/wallet_password.php | 2 - bower.json | 3 +- composer.json | 3 +- dist/js/money.js | 166 +++ 42 files changed, 3318 insertions(+), 2788 deletions(-) create mode 100755 application/views/calculator.php create mode 100644 dist/js/money.js diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index 6381a220..db73a35f 100755 --- a/application/controllers/Gestion.php +++ b/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"); + } + + + } + } + } diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 8cb337b0..a1ba6eba 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/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; + } } diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index b26c0321..b7f039f5 100755 --- a/application/language/english/message_lang.php +++ b/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'; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 0bf4cf18..4b5537a5 100755 --- a/application/language/french/message_lang.php +++ b/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'; ?> diff --git a/application/models/User_model.php b/application/models/User_model.php index ca479eca..8d3a0ed9 100755 --- a/application/models/User_model.php +++ b/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; + } + } } diff --git a/application/views/calculator.php b/application/views/calculator.php new file mode 100755 index 00000000..e1b48f09 --- /dev/null +++ b/application/views/calculator.php @@ -0,0 +1,297 @@ + + + +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); +?> + +
+ +
+ +

+ lang->line('calculator'); ?> +

+ +
+ +

Erreur!

+ +
+ + +
+ +

Success!

+ +
+ + +
+ +
+
+
+
+ + + +
+
+
+
+
+ + +
+
+ num_rows(); + + if ($numrows > 0) { ?> + + + lang->line('no_country'); + } + ?> + lang->line('no_country'); + } ?> +
+ +
+ 0) { ?> + + + lang->line('no_operation'); + } + ?> + lang->line('no_operation'); + } ?> +
+
+ num_rows(); + + if ($numrows > 0) { ?> + + + lang->line('no_country'); + } + ?> + lang->line('no_country'); + } ?> +
+
+
+ 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); + ?> + + + +
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/application/views/codeg.php b/application/views/codeg.php index f2b4f458..b6f8a549 100755 --- a/application/views/codeg.php +++ b/application/views/codeg.php @@ -64,7 +64,7 @@

lang->line('Tous les codes générés'); ?>

-
+

lang->line('Demandes'); ?> lang->line('entrantes'); ?>

-
+

lang->line('Demandes'); ?> lang->line('Sortantes'); ?>

-
+

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

-
+

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

-
+

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

-
+

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

-
+

lang->line('Demandes'); ?>

-
+

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

-
+

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

-
+

lang->line('Demandes'); ?>

-
+

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

-
+

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

-
+

lang->line('Demandes'); ?> lang->line('entrantes'); ?>

-
+

lang->line('Demandes'); ?> lang->line('Sortantes'); ?>

-
+

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

-
+

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

-
+

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

-
+

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

-
+

lang->line('Demandes'); ?>

-
+

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

-
+

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

-
+

lang->line('Activer/Désactiver'); ?>

-
+
-
+
"> -
- -
- -

- lang->line('Gestion des administrateurs'); ?> -

- -
- -

Erreur!

- -
- - -
- -

Success!

- -
- - -
- -
-
- session->userdata('category')==0){ - ?> -
- "; - } ?> -
-
-

lang->line('Administrateurs'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - ?> -
- - - - - - - - - - - - session->userdata('category')==0){ - ?> - - - - - - - result() as $row) { - $num ++; - $category = $this->lang->line('Administrateur'); - $statut = $this->lang->line('Non confirmé'); - if($row->category==0){ - $category = "Super Admin"; - } - if($row->salt!=''){ - $statut = $this->lang->line("Confirmé"); - } - - echo " - - - - - - - "; - if($row->email==$this->session->userdata('email')){ - echo ""; - }else{ - echo ""; - } - echo ""; - if($this->session->userdata('category')==0){ - echo ""; - - } - if ($row->category!=0){ - echo ""; - } - echo ""; - } - ?> - -
N°lang->line('Nom'); ?>lang->line('Prénom'); ?>lang->line('Contact'); ?>lang->line('Email'); ?>lang->line('Adresse'); ?>lang->line('Pays'); ?>lang->line('Catégorie'); ?>lang->line('Statut'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
$num$row->lastname$row->firstname$row->phone$row->email$row->adresse$row->country$category$statut - - - -
- lang->line("Aucun utilisateur trouvé"); - } - }else { - echo $this->lang->line("Aucun utilisateur trouvé"); - } - ?> -
-
-
- session->userdata('category')==0) { - ?> -
-
-
-

lang->line('Créer un compte administrateur'); ?>

-
-
-
-
- - num_rows(); - if ($numrows > 0) { ?> - - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
-
-
- -
- - - -
- - - - - - - - - - - - - - - - - - - \ No newline at end of file + +
+ +
+ +

+ lang->line('Gestion des administrateurs'); ?> +

+ +
+ +

Erreur!

+ +
+ + +
+ +

Success!

+ +
+ + +
+ +
+
+ session->userdata('category')==0){ + ?> +
+ "; + } ?> +
+
+

lang->line('Administrateurs'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + ?> + + + + + + + + + + + + + session->userdata('category')==0){ + ?> + + + + + + + result() as $row) { + $num ++; + $category = $this->lang->line('Administrateur'); + $statut = $this->lang->line('Non confirmé'); + if($row->category==0){ + $category = "Super Admin"; + } + if($row->salt!=''){ + $statut = $this->lang->line("Confirmé"); + } + + echo " + + + + + + + "; + if($row->email==$this->session->userdata('email')){ + echo ""; + }else{ + echo ""; + } + echo ""; + if($this->session->userdata('category')==0){ + echo ""; + + } + if ($row->category!=0){ + echo ""; + } + echo ""; + } + ?> + +
N°lang->line('Nom'); ?>lang->line('Prénom'); ?>lang->line('Contact'); ?>lang->line('Email'); ?>lang->line('Adresse'); ?>lang->line('Pays'); ?>lang->line('Catégorie'); ?>lang->line('Statut'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
$num$row->lastname$row->firstname$row->phone$row->email$row->adresse$row->country$category$statut + + + +
+ lang->line("Aucun utilisateur trouvé"); + } + }else { + echo $this->lang->line("Aucun utilisateur trouvé"); + } + ?> +
+
+
+ session->userdata('category')==0) { + ?> +
+
+
+

lang->line('Créer un compte administrateur'); ?>

+
+
+
+
+ + num_rows(); + if ($numrows > 0) { ?> + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + diff --git a/application/views/gestion_monnaie.php b/application/views/gestion_monnaie.php index 3f11e10f..5d1a8fc7 100755 --- a/application/views/gestion_monnaie.php +++ b/application/views/gestion_monnaie.php @@ -4,12 +4,10 @@ - - - + +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); + +?> +
@@ -137,56 +170,53 @@
-
-
-
-
- -
-
- -
-
+
+
+
+
+
+ +
+
+
+ + + + + + + + + result() as $row) { + $name = $this->session->userdata('site_lang') === 'french' ? $row->name_fr : $row->name_en; + echo " + + ".' + '; + } + } + ?> + +
lang->line('currency') ; ?> lang->line('rate') ; ?> (%)
".$row->code.' - '.$name."".round($provider->getExchangeRate($currency_code ,$row->code)->toFloat(),3)."
+ +
- - - - - - - - - -result() as $row) { -// echo " -// -// -// ".' -// -// '; -// } -// } -// ?> - -
lang->line('currency') ; ?> lang->line('rate') ; ?> (%) Actions
".$row->min."".$row->max."".$row->taux." -// -// -// -//
-
+ + + + @@ -195,11 +225,17 @@ - - + + + + - diff --git a/application/views/gestion_monnaies.php b/application/views/gestion_monnaies.php index e0b67307..8cc9a414 100755 --- a/application/views/gestion_monnaies.php +++ b/application/views/gestion_monnaies.php @@ -44,7 +44,7 @@

lang->line('activated_wallets'); ?>

-
+
- currency_name_fr; ?> + session->userdata('site_lang') === 'french' ? $row->currency_name_fr : $row->currency_name_en ?> currency_code; ?> "> - -
- -
- -

- lang->line('Gestion des réseaux'); ?> - -

- -
- -

Erreur!

- -
- - -
- -

Success!

- -
- - -
- -
-
-
-
-
-

lang->line('Réseaux assignés'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - ?> - - - - - - - - - - - - - - result() as $row) { - $num ++; - //$member_code = randomString1(10); - $libelle_status = $this->lang->line('Actif'); - if($row->status==0){ - $libelle_status = $this->lang->line('Inactif'); - } - echo " - - - - "; - if($row->status==0){ - echo ""; - }else{ - echo ""; - } - echo " - - "; - } - ?> - -
N°lang->line('Reseau'); ?>lang->line('Pays'); ?>lang->line('Statut'); ?>lang->line('Activer/Désactiver'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
$num$row->network$row->country$libelle_status - - - - - -
- - lang->line('Aucun réseau'); - } - }else { - echo $this->lang->line('Aucun réseau'); - } - ?> -
-
-
-
-
-
-

lang->line('Ajouter un réseau à la liste'); ?>

-
-
-
-
- - -
-
- -
-
-
-
-
-
-
-
-

lang->line('Assigner un réseau à un pays'); ?>

-
-
-
-
- - num_rows(); - if ($numrows > 0) { ?> - - lang->line("Aucun pays"); - } - ?> -
-
- - num_rows(); - if ($numrows > 0) { ?> - - lang->line("Aucun réseau"); - } - }else{ - echo $this->lang->line("Aucun réseau"); - } - ?> -
-
- -
-
-
-
-
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + +
+ +
+ +

+ lang->line('Gestion des réseaux'); ?> + +

+ +
+ +

Erreur!

+ +
+ + +
+ +

Success!

+ +
+ + +
+ +
+
+
+
+
+

lang->line('Réseaux assignés'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + ?> + + + + + + + + + + + + + + result() as $row) { + $num ++; + //$member_code = randomString1(10); + $libelle_status = $this->lang->line('Actif'); + if($row->status==0){ + $libelle_status = $this->lang->line('Inactif'); + } + echo " + + + + "; + if($row->status==0){ + echo ""; + }else{ + echo ""; + } + echo " + + "; + } + ?> + +
N°lang->line('Reseau'); ?>lang->line('Pays'); ?>lang->line('Statut'); ?>lang->line('Activer/Désactiver'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
$num$row->network$row->country$libelle_status + + + + + +
+ + lang->line('Aucun réseau'); + } + }else { + echo $this->lang->line('Aucun réseau'); + } + ?> +
+
+
+
+
+
+

lang->line('Ajouter un réseau à la liste'); ?>

+
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+
+

lang->line('Assigner un réseau à un pays'); ?>

+
+
+
+
+ + num_rows(); + if ($numrows > 0) { ?> + + lang->line("Aucun pays"); + } + ?> +
+
+ + num_rows(); + if ($numrows > 0) { ?> + + lang->line("Aucun réseau"); + } + }else{ + echo $this->lang->line("Aucun réseau"); + } + ?> +
+
+ +
+
+
+
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/application/views/gestion_publicite.php b/application/views/gestion_publicite.php index 2a8bfe3f..52d2ad94 100755 --- a/application/views/gestion_publicite.php +++ b/application/views/gestion_publicite.php @@ -40,7 +40,7 @@

Publicité interstitielle

-
+
diff --git a/application/views/gestion_villes.php b/application/views/gestion_villes.php index b4210ca9..b20220fe 100755 --- a/application/views/gestion_villes.php +++ b/application/views/gestion_villes.php @@ -1,369 +1,369 @@ - -
- -
- -

- lang->line('Modification et Activation des villes'); ?> -

- -
- -

Erreur!

- -
- - -
- -

Success!

- -
- - -
- -
-
-
-
-
-

lang->line('Activer/Désactiver'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - ?> -
- - - - - - - - - - - - - result() as $row) { - $num ++; - //$member_code = randomString1(10); - $libelle_status = $this->lang->line('Inactive'); - if($row->status==1){ - $libelle_status = $this->lang->line('Active'); - } - echo " - - - - "; - if($row->status==0) { - echo " - "; - }else{ - echo " - "; - } - echo " - "; - } - ?> - -
N°lang->line('Villes'); ?>lang->line('Pays'); ?>lang->line('Statut'); ?>lang->line('Activer'); ?>lang->line('Désactiver'); ?>lang->line('Modifier'); ?>
$num$row->name$row->country$libelle_status - -
- - lang->line('Aucune ville'); - } - }else { - echo $this->lang->line('Aucune ville'); - } - ?> -
-
-
-
-
-
-

lang->line('Ajouter une ville'); ?>

-
-
-
-
- - num_rows(); - if ($numrows > 0) { ?> - - lang->line('Aucun pays'); - } - ?> -
-
- - -
-
- -
-
-
-
-
-
- - -
- - - - - - - - - - - - - - - - - - - \ No newline at end of file + +
+ +
+ +

+ lang->line('Modification et Activation des villes'); ?> +

+ +
+ +

Erreur!

+ +
+ + +
+ +

Success!

+ +
+ + +
+ +
+
+
+
+
+

lang->line('Activer/Désactiver'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + ?> + + + + + + + + + + + + + + result() as $row) { + $num ++; + //$member_code = randomString1(10); + $libelle_status = $this->lang->line('Inactive'); + if($row->status==1){ + $libelle_status = $this->lang->line('Active'); + } + echo " + + + + "; + if($row->status==0) { + echo " + "; + }else{ + echo " + "; + } + echo " + "; + } + ?> + +
N°lang->line('Villes'); ?>lang->line('Pays'); ?>lang->line('Statut'); ?>lang->line('Activer'); ?>lang->line('Désactiver'); ?>lang->line('Modifier'); ?>
$num$row->name$row->country$libelle_status + +
+ + lang->line('Aucune ville'); + } + }else { + echo $this->lang->line('Aucune ville'); + } + ?> +
+
+
+
+
+
+

lang->line('Ajouter une ville'); ?>

+
+
+
+
+ + num_rows(); + if ($numrows > 0) { ?> + + lang->line('Aucun pays'); + } + ?> +
+
+ + +
+
+ +
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + diff --git a/application/views/gestion_wallet.php b/application/views/gestion_wallet.php index 38f96a06..7b138e9f 100755 --- a/application/views/gestion_wallet.php +++ b/application/views/gestion_wallet.php @@ -329,7 +329,7 @@ if ($transactions != false) {

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

-
+
diff --git a/application/views/gestion_wallet_hyp.php b/application/views/gestion_wallet_hyp.php index a58f82d1..1316fabc 100755 --- a/application/views/gestion_wallet_hyp.php +++ b/application/views/gestion_wallet_hyp.php @@ -375,7 +375,7 @@

lang->line('Commissions Superviseurs') ?>

-
+
diff --git a/application/views/gestion_wallet_ilink.php b/application/views/gestion_wallet_ilink.php index ca1cf33c..51e23f82 100755 --- a/application/views/gestion_wallet_ilink.php +++ b/application/views/gestion_wallet_ilink.php @@ -435,7 +435,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_user_wallet_wallet_international'); ?>

-
+
@@ -464,7 +464,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_user_wallet_wallet_national'); ?>

-
+
@@ -493,7 +493,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_user_wallet_cash_international'); ?>

-
+
@@ -522,7 +522,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_user_wallet_cash_national'); ?>

-
+
@@ -551,7 +551,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_agent_depot_wallet_international'); ?>

-
+
@@ -580,7 +580,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_agent_depot_wallet_national'); ?>

-
+
@@ -609,7 +609,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_agent_cash_cash_international'); ?>

-
+
@@ -638,7 +638,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('rate_com_agent_cash_cash_national'); ?>

-
+
@@ -700,7 +700,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

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

-
+
diff --git a/application/views/gestion_wallet_ilink_hyp.php b/application/views/gestion_wallet_ilink_hyp.php index b40850bb..e6223750 100755 --- a/application/views/gestion_wallet_ilink_hyp.php +++ b/application/views/gestion_wallet_ilink_hyp.php @@ -568,7 +568,7 @@

lang->line('rate_com_user_wallet_wallet_international'); ?>

-
+
@@ -597,7 +597,7 @@

lang->line('rate_com_user_wallet_wallet_national'); ?>

-
+
@@ -626,7 +626,7 @@

lang->line('rate_com_user_wallet_cash_international'); ?>

-
+
@@ -655,7 +655,7 @@

lang->line('rate_com_user_wallet_cash_national'); ?>

-
+
@@ -684,7 +684,7 @@

lang->line('rate_com_agent_depot_wallet_international'); ?>

-
+
@@ -713,7 +713,7 @@

lang->line('rate_com_agent_depot_wallet_national'); ?>

-
+
@@ -742,7 +742,7 @@

lang->line('rate_com_agent_cash_cash_international'); ?>

-
+
@@ -771,7 +771,7 @@

lang->line('rate_com_agent_cash_cash_national'); ?>

-
+
@@ -832,7 +832,7 @@

lang->line('Commissions Superviseurs') ?>

-
+
@@ -909,7 +909,7 @@
-
+
@@ -973,7 +973,7 @@
-
+
@@ -1084,7 +1084,7 @@
-
+
@@ -1155,7 +1155,7 @@
-
+
diff --git a/application/views/gestion_wallet_sup.php b/application/views/gestion_wallet_sup.php index 7651a3a7..db03cda6 100755 --- a/application/views/gestion_wallet_sup.php +++ b/application/views/gestion_wallet_sup.php @@ -225,7 +225,7 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );

lang->line('Commissions Agents') ?>

-
+
diff --git a/application/views/gestion_wallets.php b/application/views/gestion_wallets.php index 7e85acbe..99bbf70d 100755 --- a/application/views/gestion_wallets.php +++ b/application/views/gestion_wallets.php @@ -44,7 +44,7 @@

lang->line('Réseaux activés'); ?>

-
+
lang->line('menu_wallet_password'); ?> + first_row()->type == 'ilink'){ ?> +
  • "> + + lang->line('calculator'); ?> + +
    • + diff --git a/application/views/historique_recharges.php b/application/views/historique_recharges.php index 86e76169..8bc6c6bc 100755 --- a/application/views/historique_recharges.php +++ b/application/views/historique_recharges.php @@ -76,7 +76,7 @@

    lang->line('recharge_historic'); ?>

    -
    +
    num_rows(); diff --git a/application/views/historique_transactions.php b/application/views/historique_transactions.php index 14b3a638..df113f80 100755 --- a/application/views/historique_transactions.php +++ b/application/views/historique_transactions.php @@ -76,7 +76,7 @@

    lang->line('Historique des transactions') ?>

    -
    +
    num_rows(); @@ -97,6 +97,7 @@
    + @@ -127,6 +128,7 @@ + "; @@ -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) }] }); diff --git a/application/views/hyperviseur_dash.php b/application/views/hyperviseur_dash.php index 8d2293a5..39608f99 100755 --- a/application/views/hyperviseur_dash.php +++ b/application/views/hyperviseur_dash.php @@ -1,416 +1,418 @@ - - - - - - - - - - - - - db->query("SELECT agent_id FROM super_infos - WHERE MONTH(date_created) = '".$months[$i-1]."' AND YEAR(date_created) = '".$years[$i-1]."' - AND category='super' - AND code_parrain='".$this->session->userdata('member_code')."'" - ); - $super_data[] = $super_query_mounth->num_rows(); -} - -$demandes_query = $listdem; - -if($demandes_query!=false){ - $demandes=$demandes_query->num_rows(); - // Count networks for simple users - $array_simple = array(); - $num = 0; - if ($demandes > 0) { - foreach($demandes_query->result() as $row) { - $num++; - $array_simple[] = $row->codeMembre; - } - - $vals_simple = array_count_values($array_simple); - //echo 'No. of NON Duplicate Items: '.count($vals_simple).'

    '; - //print_r($vals_simple); - $pieChart2 = array(); - foreach(array_keys($vals_simple) as $paramName2) { - $color2 = dechex(rand(0x000000, 0xFFFFFF)); - $trash2 = array("value" => $vals_simple[$paramName2], - "color" => "#".$color2, - "highlight" => "#".$color2, - "label" => $paramName2); - - $pieChart2[]= $trash2; - - } - } -}else{ - $pieChart2 = array(); -} - -/** - ** Geolocated User Treatment - **/ -$users_geolocated_query = $list_geolocated_users; -// Geolocated Users by month replace 2016 by NOW() -$users_geolocated_data =array(); -for ($i = 1; $i <= 12; $i++) { - $users_geolocated_query_january = $this->db->query("SELECT agent_id FROM super_infos - WHERE MONTH(date_created) = '".$months[$i-1]."' AND YEAR(date_created) = '".$years[$i-1]."' - AND category='geolocated' AND latitude!=-1 AND longitude!=-1 - AND code_parrain IN (SELECT code_membre FROM super_infos WHERE code_parrain='".$this->session->userdata('member_code')."') - "); - $users_geolocated_data[] = $users_geolocated_query_january->num_rows(); -} - -if($users_geolocated_query!=false){ - - $users_geolocated=$users_geolocated_query->num_rows(); - //$users_geolocated_query = json_encode($users_geolocated_query->result()); - // Counts network for geolocated users - $array_geolocated = array(); - $num = 0; - if ($users_geolocated > 0) { - foreach($users_geolocated_query->result() as $row) { - $num++; - $array_geolocated[] = $row->town; - } - $vals_geolocated = array_count_values($array_geolocated); - //echo 'No. of NON Duplicate Items: '.count($vals_geolocated).'

    '; - //print_r($vals_geolocated); - $pieChart = array(); - foreach(array_keys($vals_geolocated) as $paramName) { - $color = dechex(rand(0x000000, 0xFFFFFF)); - $trash = array("value" => $vals_geolocated[$paramName], - "color" => "#".$color, - "highlight" => "#".$color, - "label" => $paramName); - - $pieChart[]= $trash; - } - } -}else{ - $pieChart = array(); -} -?> - -
    - - -
    -

    - lang->line('Hyperviseur'); ?> - lang->line('Tableau de bord'); ?> -

    -
    - -
    - -
    - - -
    - -
    -
    -

    - -

    lang->line('Utilisateurs géolocalisés'); ?>

    -
    -
    - -
    - lang->line("Plus d'informations"); ?> -
    -
    - -
    - -
    -
    -

    - -

    lang->line('Superviseur'); ?>

    -
    -
    - -
    - lang->line("Plus d'informations"); ?> -
    -
    -
    - -
    -
    -

    - -

    lang->line('Demandes de crédits'); ?>

    -
    -
    - -
    - lang->line("Plus d'informations"); ?> -
    -
    -
    - -
    -
    -

    - -

    lang->line("Demandes traitées"); ?>

    -
    -
    - -
    - lang->line("Plus d'informations"); ?> -
    -
    -
    - -
    -
    -

    - -

    lang->line("Demandes non traitées"); ?>

    -
    -
    - -
    - lang->line("Plus d'informations"); ?> -
    -
    - -
    - -
    -
    -

    lang->line("Adhésions"); ?>

    -
    -
    -
    - -
    -
    - -
    - -
    - -
    - -
    -
    -

    lang->line("Demandes de crédits par superviseur"); ?>

    -
    -
    - -
    - -
    - -
    -
    - -
    -
    -

    lang->line("Utilisateurs géolocalisés par ville"); ?>

    -
    -
    - -
    - -
    - -
    -
    - -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + db->query("SELECT agent_id FROM super_infos + WHERE MONTH(date_created) = '".$months[$i-1]."' AND YEAR(date_created) = '".$years[$i-1]."' + AND category='super' + AND code_parrain='".$this->session->userdata('member_code')."'" + ); + $super_data[] = $super_query_mounth->num_rows(); +} + +$demandes_query = $listdem; + +if($demandes_query!=false){ + $demandes=$demandes_query->num_rows(); + // Count networks for simple users + $array_simple = array(); + $num = 0; + if ($demandes > 0) { + foreach($demandes_query->result() as $row) { + $num++; + $array_simple[] = $row->codeMembre; + } + + $vals_simple = array_count_values($array_simple); + //echo 'No. of NON Duplicate Items: '.count($vals_simple).'

    '; + //print_r($vals_simple); + $pieChart2 = array(); + foreach(array_keys($vals_simple) as $paramName2) { + $color2 = dechex(rand(0x000000, 0xFFFFFF)); + $trash2 = array("value" => $vals_simple[$paramName2], + "color" => "#".$color2, + "highlight" => "#".$color2, + "label" => $paramName2); + + $pieChart2[]= $trash2; + + } + } +}else{ + $pieChart2 = array(); +} + +/** + ** Geolocated User Treatment + **/ +$users_geolocated_query = $list_geolocated_users; +// Geolocated Users by month replace 2016 by NOW() +$users_geolocated_data =array(); +for ($i = 1; $i <= 12; $i++) { + $users_geolocated_query_january = $this->db->query("SELECT agent_id FROM super_infos + WHERE MONTH(date_created) = '".$months[$i-1]."' AND YEAR(date_created) = '".$years[$i-1]."' + AND category='geolocated' AND latitude!=-1 AND longitude!=-1 + AND code_parrain IN (SELECT code_membre FROM super_infos WHERE code_parrain='".$this->session->userdata('member_code')."') + "); + $users_geolocated_data[] = $users_geolocated_query_january->num_rows(); +} + +if($users_geolocated_query!=false){ + + $users_geolocated=$users_geolocated_query->num_rows(); + //$users_geolocated_query = json_encode($users_geolocated_query->result()); + // Counts network for geolocated users + $array_geolocated = array(); + $num = 0; + if ($users_geolocated > 0) { + foreach($users_geolocated_query->result() as $row) { + $num++; + $array_geolocated[] = $row->town; + } + $vals_geolocated = array_count_values($array_geolocated); + //echo 'No. of NON Duplicate Items: '.count($vals_geolocated).'

    '; + //print_r($vals_geolocated); + $pieChart = array(); + foreach(array_keys($vals_geolocated) as $paramName) { + $color = dechex(rand(0x000000, 0xFFFFFF)); + $trash = array("value" => $vals_geolocated[$paramName], + "color" => "#".$color, + "highlight" => "#".$color, + "label" => $paramName); + + $pieChart[]= $trash; + } + } +}else{ + $pieChart = array(); +} +?> + +
    + + +
    +

    + lang->line('Hyperviseur'); ?> + lang->line('Tableau de bord'); ?> +

    +
    + +
    + +
    + +
    + +
    +
    +

    + +

    lang->line('Utilisateurs géolocalisés'); ?>

    +
    +
    + +
    + lang->line("Plus d'informations"); ?> +
    +
    + +
    + +
    +
    +

    + +

    lang->line('Superviseur'); ?>

    +
    +
    + +
    + lang->line("Plus d'informations"); ?> +
    +
    +
    + +
    +
    +

    + +

    lang->line('Demandes de crédits'); ?>

    +
    +
    + +
    + lang->line("Plus d'informations"); ?> +
    +
    +
    + +
    +
    +

    + +

    lang->line("Demandes traitées"); ?>

    +
    +
    + +
    + lang->line("Plus d'informations"); ?> +
    +
    +
    + +
    +
    +

    + +

    lang->line("Demandes non traitées"); ?>

    +
    +
    + +
    + lang->line("Plus d'informations"); ?> +
    +
    + +
    +
    +
    + +
    +
    +

    lang->line("Adhésions"); ?>

    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +

    lang->line("Demandes de crédits par superviseur"); ?>

    +
    +
    + +
    + +
    + +
    +
    + +
    +
    +

    lang->line("Utilisateurs géolocalisés par ville"); ?>

    +
    +
    + +
    + +
    + +
    +
    + +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/application/views/list_user_s.php b/application/views/list_user_s.php index 676d93a0..03edb7bd 100755 --- a/application/views/list_user_s.php +++ b/application/views/list_user_s.php @@ -1,291 +1,291 @@ - - - - -
    - -
    -
    - - -
    -
    - -
    - -

    Error!

    - -
    - - -
    - -

    Success!

    - -
    - - -
    -

    Liste des utilisateurs de votre zone

    -
    - -
    - - db->select('*'); - $this->db->from('users_simple'); - $this->db->where('network',$network); - - $result=$this->db->get(); - - $numrows=$result->num_rows(); - $num = 0; - if ($numrows > 0) { - - - ?> - - -
    lang->line('Commission de l\'hyperviseur') ?> lang->line('Commission du superviseur') ?> lang->line('Commission de l\'agent') ?>lang->line('agent_name') ?> Date
    ".$fmt->format( $row->commission_hyp)." ".$fmt->format( $row->commission_sup)." ".$fmt->format( $row->commission_ag)."".$row->agent." ".toLocateDate($row->date_created,$this->session->userdata('timezone'))."
    - - - - - - - - - - - - - - - - - result() as $row) { - $num++; - echo " - - - - - - - - - - - - "; - } - ?> - - - db->close(); - - ?> - - - - - - - - - - - - - - - - -
    QuartierNomCode paysReseauEmailContactBalanceModifierEffacer
    $row->firstname$row->lastname $row->country_code$row->network$row->email $row->phone$row->balance - - - -Edit - - - - - - -Delete - - - - - -
    QuartierNomCode paysReseauEmailContactBalanceModifierEffacer
    - - -
    - -
    - -
    -
    - - - -
    - - -
    - - - - -
    - - - - - - - - - - - - - - - - - + + + + +
    + +
    +
    + + +
    +
    + +
    + +

    Error!

    + +
    + + +
    + +

    Success!

    + +
    + + +
    +

    Liste des utilisateurs de votre zone

    +
    + +
    + + db->select('*'); + $this->db->from('users_simple'); + $this->db->where('network',$network); + + $result=$this->db->get(); + + $numrows=$result->num_rows(); + $num = 0; + if ($numrows > 0) { + + + ?> + + + + + + + + + + + + + + + + + + + + result() as $row) { + $num++; + echo " + + + + + + + + + + + + "; + } + ?> + + + db->close(); + + ?> + + + + + + + + + + + + + + + + +
    QuartierNomCode paysReseauEmailContactBalanceModifierEffacer
    $row->firstname$row->lastname $row->country_code$row->network$row->email $row->phone$row->balance + + + +Edit + + + + + + +Delete + + + + + +
    QuartierNomCode paysReseauEmailContactBalanceModifierEffacer
    + + +
    + +
    + +
    +
    + + + +
    + + +
    + + +
    + +
    + + + + + + + + + + + + + + + + + diff --git a/application/views/listeAdmin_save.php b/application/views/listeAdmin_save.php index eb4dcfb3..9b498506 100755 --- a/application/views/listeAdmin_save.php +++ b/application/views/listeAdmin_save.php @@ -311,7 +311,7 @@ function randomString($length=10 )
    -
    +
    db->get('users'); diff --git a/application/views/listeAdmin_save2.php b/application/views/listeAdmin_save2.php index 57d00185..77b6d082 100755 --- a/application/views/listeAdmin_save2.php +++ b/application/views/listeAdmin_save2.php @@ -311,7 +311,7 @@ function randomString($length=10 )
    -
    +
    db->get('users'); diff --git a/application/views/listeUsers.php b/application/views/listeUsers.php index 41933d3e..20e4734b 100755 --- a/application/views/listeUsers.php +++ b/application/views/listeUsers.php @@ -158,7 +158,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
    -
    +
    diff --git a/application/views/listeadmin.php b/application/views/listeadmin.php index 8c82dba4..80e7bd1b 100755 --- a/application/views/listeadmin.php +++ b/application/views/listeadmin.php @@ -70,7 +70,7 @@

    lang->line('Tous les'); ?> session->userdata('category')=='super'){ echo "(".$numberGeo." ".$this->lang->line('Restant').")";} ?>

    -
    +
    - - -
    - - - - - - - - -
    -
    - - -
    -
    - -
    - -

    Error!

    - -
    - - -
    - -

    Success!

    - -
    - - -
    -

    lang->line('Utilisateurs simples'); ?>

    -
    - -
    - - num_rows(); -$num = 0; -if ($numrows > 0) { - - -?> - - - - - - - - - - - - - - - - - - - - result() as $row) { -$num++; -echo " - - - - - - - - - - - - "; -} -?> - - - - - - - - - - - - - - - - - - - -
    lang->line('Nom'); ?>lang->line('Pays'); ?>lang->line('Adresse'); ?>lang->line('Reseau'); ?>lang->line('Email'); ?>lang->line('Solde'); ?>lang->line('Téléphone'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
    $row->lastname $row->country$row->adresse$row->network$row->email $row->solde$row->phone - ".$this->lang->line('Modifier')." - - - - - -".$this->lang->line('Supprimer')." - - - - - -
    lang->line('Nom'); ?>lang->line('Pays'); ?>lang->line('Adresse'); ?>lang->line('Reseau'); ?>lang->line('Email'); ?>lang->line('Solde'); ?>lang->line('Téléphone'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
    - - -
    - - -
    - - - -
    - - -
    - - -
    - -
    - - - - - - - - - - - - - - - - - - - + + + + +
    + + + + + + + + +
    +
    + + +
    +
    + +
    + +

    Error!

    + +
    + + +
    + +

    Success!

    + +
    + + +
    +

    lang->line('Utilisateurs simples'); ?>

    +
    + +
    + + num_rows(); +$num = 0; +if ($numrows > 0) { + + +?> + + + + + + + + + + + + + + + + + + + + result() as $row) { +$num++; +echo " + + + + + + + + + + + + "; +} +?> + + + + + + + + + + + + + + + + + + + +
    lang->line('Nom'); ?>lang->line('Pays'); ?>lang->line('Adresse'); ?>lang->line('Reseau'); ?>lang->line('Email'); ?>lang->line('Solde'); ?>lang->line('Téléphone'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
    $row->lastname $row->country$row->adresse$row->network$row->email $row->solde$row->phone + ".$this->lang->line('Modifier')." + + + + + +".$this->lang->line('Supprimer')." + + + + + +
    lang->line('Nom'); ?>lang->line('Pays'); ?>lang->line('Adresse'); ?>lang->line('Reseau'); ?>lang->line('Email'); ?>lang->line('Solde'); ?>lang->line('Téléphone'); ?>lang->line('Modifier'); ?>lang->line('Supprimer'); ?>
    + + +
    + + +
    + + + +
    + + +
    + + +
    + +
    + + + + + + + + + + + + + + + + + + + diff --git a/application/views/membreCode.php b/application/views/membreCode.php index 45d1425e..985cf49f 100755 --- a/application/views/membreCode.php +++ b/application/views/membreCode.php @@ -250,7 +250,7 @@ function randomString1($length=10 )
    Demandesdb->count_all('demande_superviseur');?> -
    +
    db->get('demande_superviseur'); @@ -402,7 +402,7 @@ else {
    Codes' Table -
    +
    db->query('SELECT * FROM codemembre'); @@ -509,4 +509,4 @@ $this->db->close(); - \ No newline at end of file + diff --git a/application/views/membreCodeAdmin.php b/application/views/membreCodeAdmin.php index 29a10711..5147841d 100755 --- a/application/views/membreCodeAdmin.php +++ b/application/views/membreCodeAdmin.php @@ -57,7 +57,7 @@

    lang->line("Demandes adhésion"); ?>

    -
    +
    lang->line("Codes valides"); ?>
    -
    +
    Demandesdb->count_all('demande_superviseur');?> -
    +
    db->get('demande_superviseur'); @@ -456,7 +456,7 @@ else {
    Codes' Table -
    +
    db->query('SELECT * FROM codemembre'); @@ -558,4 +558,4 @@ $this->db->close(); - \ No newline at end of file + diff --git a/application/views/search.php b/application/views/search.php index 61a9decb..5edf31e6 100755 --- a/application/views/search.php +++ b/application/views/search.php @@ -338,7 +338,7 @@ echo "You have selected :" .$selected_val; // Displaying Selected Value
    -
    +
    input->post('cherch')) { @@ -540,4 +540,4 @@ $this->db->close();
    - \ No newline at end of file + diff --git a/application/views/test.php b/application/views/test.php index 844942d0..7d8f3d5f 100755 --- a/application/views/test.php +++ b/application/views/test.php @@ -1,79 +1,79 @@ - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    demande_idmontantstatutdateAjoutdateModifreseaucodeParraincodeMembrecategorytempsvillepays
    demande_idmontantstatutdateAjoutdateModifreseaucodeParraincodeMembrecategorytempsvillepays
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - + + + + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    demande_idmontantstatutdateAjoutdateModifreseaucodeParraincodeMembrecategorytempsvillepays
    demande_idmontantstatutdateAjoutdateModifreseaucodeParraincodeMembrecategorytempsvillepays
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + diff --git a/application/views/wallet_password.php b/application/views/wallet_password.php index 89a8bd9c..b3b28c88 100755 --- a/application/views/wallet_password.php +++ b/application/views/wallet_password.php @@ -9,8 +9,6 @@

    lang->line('header_wallet_password'); ?> -

    =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" diff --git a/dist/js/money.js b/dist/js/money.js new file mode 100644 index 00000000..359df378 --- /dev/null +++ b/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));