diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index 7fc0db72..034b1e8e 100755 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -1916,7 +1916,10 @@ class Gestion extends CI_Controller $networkDetails = $this->user_model->getNetworkDetails($network_id); if($networkDetails){ $data['network'] = $networkDetails->first_row()->network; - $data['country'] = $networkDetails->first_row()->country; + $data['country'] = $networkDetails->first_row()->country; + $data['currency_name_fr'] = $networkDetails->first_row()->currency_name_fr; + $data['currency_name_en'] = $networkDetails->first_row()->currency_name_en; + $data['currency_code'] = $networkDetails->first_row()->currency_code; } $this->load->view('header_gestion', $data); if ($type == 'transaction') @@ -2072,17 +2075,28 @@ class Gestion extends CI_Controller if ($this->input->get('id')) { $data['network_id'] = $this->input->get('id'); - $data['groups'] = $this->user_model->getUsersGroups($data['network_id']); - $data['configWallet'] = $this->user_model->getConfigWallet($data['network_id'])->first_row(); - $networkDetails = $this->user_model->getNetworkDetails($data['network_id']); - if ($networkDetails) { - $data['network'] = $networkDetails->first_row()->network; - $data['country'] = $networkDetails->first_row()->country; - $data['currency_code'] = $networkDetails->first_row()->currency_code; + + if ($this->input->get('history')) { + $this->historique_nano_credit($data['network_id'], $this->input->get('d'), $this->input->get('f'), $this->input->get('history')); + } else { + $data['groups'] = $this->user_model->getUsersGroups($data['network_id']); + $data['configWallet'] = $this->user_model->getConfigWallet($data['network_id'])->first_row(); + $networkDetails = $this->user_model->getNetworkDetails($data['network_id']); + if ($networkDetails) { + $data['network'] = $networkDetails->first_row()->network; + $data['country'] = $networkDetails->first_row()->country; + $data['currency_code'] = $networkDetails->first_row()->currency_code; + } + + $data['rates_nano_credit'] = $this->user_model->getNanoCreditRates($data['configWallet']->id); + $data['taxes_nano_credit'] = $this->user_model->getTaxes($data['configWallet']->id, 'nano_credit'); + + $data['rates_epargne'] = $this->user_model->getNanoCreditRates($data['configWallet']->id, 'epargne'); + $data['taxes_epargne'] = $this->user_model->getTaxes($data['configWallet']->id, 'epargne'); + $this->load->view('header_gestion', $data); + $this->load->view('nano_credit/gestion_nano_credit_admin'); + $this->load->view('footer'); } - $this->load->view('header_gestion', $data); - $this->load->view('nano_credit/gestion_nano_credit_admin'); - $this->load->view('footer'); } else { $data['networks'] = $this->user_model->getAllIlinkWorldNetworks(); $this->load->view('header_gestion', $data); @@ -2093,6 +2107,40 @@ class Gestion extends CI_Controller } } + private function historique_nano_credit($network_id, $startDate, $endDate, $type) + { + + $data['configWallet'] = $this->user_model->getConfigWallet($network_id); + $format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d'; + $data['startDate'] = $startDate ? date($format, strtotime($startDate)) : null; + $data['endDate'] = $endDate ? date($format, strtotime($endDate)) : null; + $endDate = Date('Y-m-d', strtotime($endDate . "+1 day")); + + if ($type == 'nano_credit') { + $data['transactions'] = $this->user_model->getUserDemandesCredit($startDate, $endDate, $network_id); + } else if ($type == 'savings') { + $data['transactions'] = $this->user_model->getIlinkTransactions($startDate, $endDate, $network_id); + } + $data['active'] = "nano_credit"; + $data['alert'] = ""; + $data['networks'] = $this->user_model->getAllActivatedNetworks(); + $data['game_pays'] = $this->user_model->getGameCountry(); + $networkDetails = $this->user_model->getNetworkDetails($network_id); + if ($networkDetails) { + $data['network'] = $networkDetails->first_row()->network; + $data['country'] = $networkDetails->first_row()->country; + $data['currency_name_fr'] = $networkDetails->first_row()->currency_name_fr; + $data['currency_name_en'] = $networkDetails->first_row()->currency_name_en; + $data['currency_code'] = $networkDetails->first_row()->currency_code; + } + $this->load->view('header_gestion', $data); + if ($type == 'epargne') + $this->load->view('nano_credit/historique_savings'); + else + $this->load->view('nano_credit/historique_nano_credit'); + $this->load->view('footer'); + } + public function activate_nano_credit() { if ($this->isLogged()) { diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 2e0dc1e9..ff5718cc 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -445,7 +445,6 @@ class Hyperviseur_dash extends CI_Controller $data['currency_name_fr'] = $networkDetails->first_row()->currency_name_fr; $data['currency_name_en'] = $networkDetails->first_row()->currency_name_en; $data['transactions'] = $this->user_model->getIlinkTransactions($startDate, $endDate, $network_id); - var_dump($data['transactions']); } else if ($type == 'commission_transfer') $data['transactions'] = $this->user_model->getCommissionTransfers($startDate, $endDate, $this->session->userdata('member_code')); else if ($type == 'balance_statement') @@ -1266,7 +1265,7 @@ class Hyperviseur_dash extends CI_Controller if ($type == 'nano_credit') { $data['transactions'] = $this->user_model->getUserDemandesCredit($startDate, $endDate, $network_id); - } else if ($type == 'transaction_ilink') { + } else if ($type == 'savings') { $data['transactions'] = $this->user_model->getIlinkTransactions($startDate, $endDate, $network_id); } $data['active'] = "nano_credit"; diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 593c1314..6b83c7e2 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -464,8 +464,17 @@ $lang['credit_limit'] = 'Credit limit'; $lang['wallet_management'] = 'Wallet management'; $lang['nano_credit_management'] = 'Management of nano credit'; $lang['change_interest_rates'] = 'Change interest rates'; -$lang['interest_rates'] = 'Interest rate'; +$lang['nano_credit_interest_rates'] = 'Interest rate on nano credit'; $lang['interest_rates_period'] = 'Period (in months)'; $lang['nano_credit_update'] = 'Update nano credit'; $lang['transaction_nano_credit'] = 'Taxes on nano credit'; +$lang['edit_nano_credit'] = 'Configuration of nano credit'; +$lang['edit_savings'] = 'Savings configuration'; +$lang['export_nano_credit_demands_history'] = "Export requests for nano credits"; +$lang['savings_interest_rates'] = "Interest rate on savings"; +$lang['savings_tax'] = 'Taxes on savings'; +$lang['interest'] = "Interest"; +$lang['duration'] = "Duration (in months)"; +$lang['state'] = "State"; +$lang['caution_type'] = "Type of deposit"; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 9e8ec804..23e0a8e2 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -476,10 +476,17 @@ $lang['credit_limit'] = 'Limite de credit'; $lang['wallet_management'] = 'Gestion du wallet'; $lang['nano_credit_management'] = 'Gestion du nano credit'; $lang['change_interest_rates'] = 'Modifier les taux d\'intérêts'; -$lang['interest_rates'] = 'Taux d\'intérêts'; +$lang['nano_credit_interest_rates'] = 'Taux d\'intérêts du nano credit'; $lang['interest_rates_period'] = 'Période (en mois)'; $lang['nano_credit_update'] = 'Mise à jour du nano crédit'; $lang['transaction_nano_credit'] = 'Taxes sur le nano crédit'; $lang['edit_nano_credit'] = 'Configuration du nano credit'; -$lang['edit_savings'] = 'Configuration de l\'épargne' +$lang['edit_savings'] = 'Configuration de l\'épargne'; +$lang['export_nano_credit_demands_history'] = "Exporter les demandes de nano credits"; +$lang['savings_interest_rates'] = "Taux d'intérêts sur l'epargne"; +$lang['savings_tax'] = 'Taxes sur l\'epargne'; +$lang['interest'] = "Intérêt"; +$lang['duration'] = "Duree (en mois)"; +$lang['state'] = "Etat"; +$lang['caution_type'] = "Type de caution" ?> diff --git a/application/models/User_model.php b/application/models/User_model.php index 3a04d616..90105ef1 100755 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -2580,7 +2580,7 @@ class User_model extends CI_Model $query = $this->db->query("SELECT * FROM infos_ilink_transaction WHERE `network_emetteur`=" . $id_network . $chain); - var_dump($query->result_array()); + //var_dump($query->result_array()); if ($query->num_rows() > 0) { return $query; } else { diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php index c8667b5f..f12114e1 100755 --- a/application/views/historique_transactions_ilink.php +++ b/application/views/historique_transactions_ilink.php @@ -108,7 +108,8 @@ use Brick\Money\Money;

- session->userdata('currency_code') . ' - ' . $currency_name_fr; ?> + session->userdata('currency_code') ? $this->session->userdata('currency_code') : $currency_code + . ' - ' . $currency_name_fr; ?>

lang->line('currency') ?>

diff --git a/application/views/nano_credit/config_nano_credit.php b/application/views/nano_credit/config_nano_credit.php index 587a5278..ef326e91 100755 --- a/application/views/nano_credit/config_nano_credit.php +++ b/application/views/nano_credit/config_nano_credit.php @@ -172,14 +172,14 @@ $context = new \Brick\Money\Context\AutoContext();
-

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

+

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

- + @@ -248,7 +248,7 @@ $context = new \Brick\Money\Context\AutoContext();
+ class="col-form-label">lang->line('nano_credit_interest_rates'); ?>
- + diff --git a/application/views/nano_credit/config_savings.php b/application/views/nano_credit/config_savings.php index f07a269e..83726ff2 100755 --- a/application/views/nano_credit/config_savings.php +++ b/application/views/nano_credit/config_savings.php @@ -172,14 +172,14 @@ $context = new \Brick\Money\Context\AutoContext();
-

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

+

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

lang->line('interest_rates_period'); ?> lang->line('rate'); ?> lang->line('rate') . ' (%)'; ?>
lang->line('interest_rates_period'); ?>lang->line('rate'); ?>lang->line('rate') . ' (%)'; ?> Actions
- + @@ -201,7 +201,7 @@ $context = new \Brick\Money\Context\AutoContext();
-

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

+

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

lang->line('interest_rates_period'); ?> lang->line('rate'); ?> lang->line('rate') . ' (%)'; ?>
@@ -261,7 +261,7 @@ $context = new \Brick\Money\Context\AutoContext(); - + @@ -314,7 +314,7 @@ $context = new \Brick\Money\Context\AutoContext();
+ class="col-form-label">lang->line('savings_tax'); ?>
- -
-
-
-
-

- lang->line('users_groups') ?>

-
- - lang->line('nano_credit_history'); ?> - -
-
-
-
lang->line('interest_rates_period'); ?>lang->line('rate'); ?>lang->line('rate') . ' (%)'; ?> Actions
- - - " . $this->lang->line('group_code') . " +
+
+
+
+

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

+
+
+
+ + + + + + + + result() as $row) { + echo " + + " . ' + '; + } + } + ?> + +
lang->line('interest_rates_period'); ?> lang->line('rate') . ' (%)'; ?>
" . $row->duree_mois . "" . $row->taux . "
+
+
+
+
+
+
+

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

+
+
+ + + + + + + + + + result() as $row) { + echo " + + + " . ' + '; + } + } + ?> + +
lang->line('Nom'); ?> TypeValeur
" . $row->nom . "" . $row->type . "" . $row->valeur . "
+
+
+
+ + +
+
+
+

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

+
+
+ + + + + + + + + result() as $row) { + echo " + + " . ' + '; + } + } + ?> + +
lang->line('interest_rates_period'); ?> lang->line('rate') . ' (%)'; ?>
" . $row->duree_mois . "" . $row->taux . "
+
+
+
+
+
+
+

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

+
+
+ + + + + + + + + + result() as $row) { + echo " + + + " . ' + '; + } + } + ?> + +
lang->line('Nom'); ?> TypeValeur
" . $row->nom . "" . $row->type . "" . $row->valeur . "
+
+
+
+ +
+ +
+
+
+
+

+ lang->line('users_groups') ?>

+
+ + lang->line('nano_credit_history'); ?> + +
+
+
+ + + + " . $this->lang->line('group_code') . " diff --git a/application/views/nano_credit/gestion_nano_credits.php b/application/views/nano_credit/gestion_nano_credits.php index 5d455f53..b88338c4 100755 --- a/application/views/nano_credit/gestion_nano_credits.php +++ b/application/views/nano_credit/gestion_nano_credits.php @@ -94,6 +94,12 @@ data-network-id="id ?>" class="btn btn-danger openModal">lang->line('Désactiver'); ?> + @@ -104,15 +110,16 @@ + - + diff --git a/application/views/nano_credit/historique_nano_credit.php b/application/views/nano_credit/historique_nano_credit.php index 5701d7c0..fc0b1818 100755 --- a/application/views/nano_credit/historique_nano_credit.php +++ b/application/views/nano_credit/historique_nano_credit.php @@ -31,9 +31,9 @@

- lang->line('Gestion des wallets'); + lang->line('nano_credit_management'); echo ' ' . $network . ' - ' . $country - . ' :: ' . $this->lang->line('Historique des transactions'); ?> + . ' :: ' . $this->lang->line('nano_credit_history'); ?>

@@ -112,7 +112,7 @@
-

lang->line('export_transaction_history') ?>

+

lang->line('export_nano_credit_demands_history') ?>

- - - + + + - + @@ -163,7 +163,7 @@ - +
" . $this->lang->line('Nom') . " " . $this->lang->line('creator') . " " . $this->lang->line('credit_limit') . " + has_nano_credit) echo "disabled" ?> > + lang->line('Voir plus...'); ?> + + + has_nano_credit) echo "disabled" ?> > + lang->line('Voir plus...'); ?> + + - has_nano_credit) echo "disabled" ?> > - lang->line('Voir plus...'); ?> - -
IDEtatCautionDuree (en mois)lang->line('state') ?>lang->line('caution_type') ?>lang->line('duration') ?> lang->line('Montant') ?>lang->line('fees') ?>lang->line('interest') ?> lang->line('tax') ?> lang->line('agent_name') ?> lang->line('issuer_id') ?>" . strtoupper($row->type_caution) . " " . strtoupper($row->duree_mois) . " " . $moneyNet->formatTo('fr_FR') . "" . Money::of(round($row->frais, 2), $currency_code, $context)->formatTo('fr_FR') . "" . Money::of(round($row->interet, 2), $currency_code, $context)->formatTo('fr_FR') . " " . Money::of(round($row->taxe, 2), $currency_code, $context)->formatTo('fr_FR') . " " . $row->agent . " " . $emetteur . "