+ History of nano credit in admin panel

application/controllers/Gestion.php

@@ -1917,6 +1917,9 @@ class Gestion extends CI_Controller
 		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 == 'transaction')
@@ -2072,6 +2075,10 @@ class Gestion extends CI_Controller
 
 			if ($this->input->get('id')) {
 				$data['network_id'] = $this->input->get('id');
+
+				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']);
@@ -2080,9 +2087,16 @@ class Gestion extends CI_Controller
 						$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');
+				}
 			} 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()) {

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";

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";
 ?>

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"
 ?>

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 {

application/views/historique_transactions_ilink.php

@@ -108,7 +108,8 @@ use Brick\Money\Money;
 				<div class="small-box bg-red-active">
 					<div class="inner">
 						<h4>
-							<strong> <?php echo $this->session->userdata('currency_code') . ' - ' . $currency_name_fr; ?> </strong>
+							<strong> <?php echo $this->session->userdata('currency_code') ? $this->session->userdata('currency_code') : $currency_code
+										. ' - ' . $currency_name_fr; ?> </strong>
 						</h4>
 						<p><?php echo $this->lang->line('currency') ?></p>
 					</div>

application/views/nano_credit/config_nano_credit.php

@@ -172,14 +172,14 @@ $context = new \Brick\Money\Context\AutoContext();
 			<div class="col-lg-3 col-lg-offset-2 col-xs-12">
 				<div class="box">
 					<div class="box-header">
-						<h3 class="box-title"><?php echo $this->lang->line('interest_rates'); ?></h3>
+						<h3 class="box-title"><?php echo $this->lang->line('nano_credit_interest_rates'); ?></h3>
 					</div>
 					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<thead>
 							<tr>
 								<th><?php echo $this->lang->line('interest_rates_period'); ?> </th>
-								<th><?php echo $this->lang->line('rate'); ?> </th>
+								<th><?php echo $this->lang->line('rate') . ' (%)'; ?> </th>
 							</tr>
 							</thead>
 							<tbody>
@@ -248,7 +248,7 @@ $context = new \Brick\Money\Context\AutoContext();
 											<div class="row">
 												<div class="col-sm-8">
 													<label for="nom"
-														   class="col-form-label"><?php echo $this->lang->line('interest_rates'); ?></label>
+														   class="col-form-label"><?php echo $this->lang->line('nano_credit_interest_rates'); ?></label>
 												</div>
 												<div class="col-sm-4">
 													<button type="button" class="btn btn-info add-new new5"><i
@@ -261,7 +261,7 @@ $context = new \Brick\Money\Context\AutoContext();
 											<thead>
 											<tr>
 												<th><?php echo $this->lang->line('interest_rates_period'); ?></th>
-												<th><?php echo $this->lang->line('rate'); ?></th>
+												<th><?php echo $this->lang->line('rate') . ' (%)'; ?></th>
 												<th>Actions</th>
 											</tr>
 											</thead>

application/views/nano_credit/config_savings.php

@@ -172,14 +172,14 @@ $context = new \Brick\Money\Context\AutoContext();
 			<div class="col-lg-3 col-lg-offset-2 col-xs-12">
 				<div class="box">
 					<div class="box-header">
-						<h3 class="box-title"><?php echo $this->lang->line('interest_rates'); ?></h3>
+						<h3 class="box-title"><?php echo $this->lang->line('savings_interest_rates'); ?></h3>
 					</div>
 					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
 							<thead>
 							<tr>
 								<th><?php echo $this->lang->line('interest_rates_period'); ?> </th>
-								<th><?php echo $this->lang->line('rate'); ?> </th>
+								<th><?php echo $this->lang->line('rate') . ' (%)'; ?> </th>
 							</tr>
 							</thead>
 							<tbody>
@@ -201,7 +201,7 @@ $context = new \Brick\Money\Context\AutoContext();
 			<div class="col-lg-4 col-xs-12">
 				<div class="box">
 					<div class="box-header">
-						<h3 class="box-title"><?php echo $this->lang->line('transaction_nano_credit'); ?></h3>
+						<h3 class="box-title"><?php echo $this->lang->line('savings_tax'); ?></h3>
 					</div>
 					<div class="box-body table-responsive" style="overflow-x:auto;">
 						<table class="table table-hover">
@@ -261,7 +261,7 @@ $context = new \Brick\Money\Context\AutoContext();
 											<thead>
 											<tr>
 												<th><?php echo $this->lang->line('interest_rates_period'); ?></th>
-												<th><?php echo $this->lang->line('rate'); ?></th>
+												<th><?php echo $this->lang->line('rate') . ' (%)'; ?></th>
 												<th>Actions</th>
 											</tr>
 											</thead>
@@ -314,7 +314,7 @@ $context = new \Brick\Money\Context\AutoContext();
 									<div class="row">
 										<div class="col-sm-8">
 											<label for="nom"
-												   class="col-form-label"><?php echo $this->lang->line('transaction_nano_credit'); ?></label>
+												   class="col-form-label"><?php echo $this->lang->line('savings_tax'); ?></label>
 										</div>
 										<div class="col-sm-4">
 											<button type="button" class="btn btn-info add-new new51"><i

application/views/nano_credit/gestion_nano_credit_admin.php

@@ -75,18 +75,144 @@ $context = new \Brick\Money\Context\AutoContext();
 					</div>
 				</div>
 			</div>
-
 		</div>
 
-		<div class="row">
+		<div class="row centered"
+		">
+		<div class="col-lg-3 col-xs-12">
+			<div class="box">
+				<div class="box-header">
+					<h3 class="box-title"><?php echo $this->lang->line('nano_credit_interest_rates'); ?></h3>
+				</div>
+				<div class="box-body table-responsive" style="overflow-x:auto;">
+					<table class="table table-hover">
+						<thead>
+						<tr>
+							<th><?php echo $this->lang->line('interest_rates_period'); ?> </th>
+							<th><?php echo $this->lang->line('rate') . ' (%)'; ?> </th>
+						</tr>
+						</thead>
+						<tbody>
+						<?php
+						if ($rates_nano_credit != false) {
+							foreach ($rates_nano_credit->result() as $row) {
+								echo "<tr>
+																	<td>" . $row->duree_mois . "</td>
+																	  <td>" . $row->taux . "</td>" . '
+																	 </tr>';
+							}
+						}
+						?>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		<div class="col-lg-3 col-xs-12">
+			<div class="box">
+				<div class="box-header">
+					<h3 class="box-title"><?php echo $this->lang->line('transaction_nano_credit'); ?></h3>
+				</div>
+				<div class="box-body table-responsive" style="overflow-x:auto;">
+					<table class="table table-hover">
+						<thead>
+						<tr>
+							<th><?php echo $this->lang->line('Nom'); ?> </th>
+							<th>Type</th>
+							<th>Valeur</th>
+						</tr>
+						</thead>
+						<tbody>
+						<?php
+						if ($taxes_nano_credit != false) {
+							foreach ($taxes_nano_credit->result() as $row) {
+								echo "<tr>
+																	<td>" . $row->nom . "</td>
+																	<td>" . $row->type . "</td>
+																	  <td>" . $row->valeur . "</td>" . '
+																	 </tr>';
+							}
+						}
+						?>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+
+		<div class="col-lg-3 col-xs-12">
+			<div class="box">
+				<div class="box-header">
+					<h3 class="box-title"><?php echo $this->lang->line('savings_interest_rates'); ?></h3>
+				</div>
+				<div class="box-body table-responsive" style="overflow-x:auto;">
+					<table class="table table-hover">
+						<thead>
+						<tr>
+							<th><?php echo $this->lang->line('interest_rates_period'); ?> </th>
+							<th><?php echo $this->lang->line('rate') . ' (%)'; ?> </th>
+						</tr>
+						</thead>
+						<tbody>
+						<?php
+						if ($rates_epargne != false) {
+							foreach ($rates_epargne->result() as $row) {
+								echo "<tr>
+																	<td>" . $row->duree_mois . "</td>
+																	  <td>" . $row->taux . "</td>" . '
+																	 </tr>';
+							}
+						}
+						?>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		<div class="col-lg-3 col-xs-12">
+			<div class="box">
+				<div class="box-header">
+					<h3 class="box-title"><?php echo $this->lang->line('savings_interest_rates'); ?></h3>
+				</div>
+				<div class="box-body table-responsive" style="overflow-x:auto;">
+					<table class="table table-hover">
+						<thead>
+						<tr>
+							<th><?php echo $this->lang->line('Nom'); ?> </th>
+							<th>Type</th>
+							<th>Valeur</th>
+						</tr>
+						</thead>
+						<tbody>
+						<?php
+						if ($taxes_epargne != false) {
+							foreach ($taxes_epargne->result() as $row) {
+								echo "<tr>
+																	<td>" . $row->nom . "</td>
+																	<td>" . $row->type . "</td>
+																	  <td>" . $row->valeur . "</td>" . '
+																	 </tr>';
+							}
+						}
+						?>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+</div>
+
+<div class="row">
 	<div class="col-xs-12">
 		<div class="box">
 			<div class="box-header">
 				<h3 class="box-title">
 					<?php echo $this->lang->line('users_groups') ?></h3>
 				<div class="box-tools">
-							<a class="btn btn-primary" href="
+					<a class="btn btn-primary"
-		<?php echo current_url() . ($network_id ? '?history=nano_credit' : '') ?>">
+					   href="<?php echo current_url() . ($network_id ? '?id=' . $network_id . '&history=nano_credit' : '') ?>">
 						<?php echo $this->lang->line('nano_credit_history'); ?>
 					</a>
 				</div>

application/views/nano_credit/gestion_nano_credits.php

@@ -94,6 +94,12 @@
 														data-network-id="<?php echo $row->id ?>"
 														class="btn btn-danger openModal"><?php echo $this->lang->line('Désactiver'); ?></button>
 											</td>
+											<td>
+												<a href="<?php echo current_url() . ($row->id_network ? '?id=' . $row->id_network : '') ?>"
+												   class="btn btn-primary btn-block" <?php if (!$row->has_nano_credit) echo "disabled" ?> >
+													<b><?php echo $this->lang->line('Voir plus...'); ?></b>
+												</a>
+											</td>
 											<?php
 										} else {
 											?>
@@ -104,11 +110,8 @@
 												<button type="button" data-network-id="<?php echo $row->id ?>"
 														class="btn btn-primary activateNanoCredit"><?php echo $this->lang->line('Activer'); ?></button>
 											</td>
-											<?php
-										}
-										?>
 											<td>
-											<a href="<?php echo current_url() . ($row->id_network ? '?id=' . $row->id_network : '') ?>"
+												<a href="<?php echo current_url() ?>"
 												   class="btn btn-primary btn-block" <?php if (!$row->has_nano_credit) echo "disabled" ?> >
 													<b><?php echo $this->lang->line('Voir plus...'); ?></b>
 												</a>
@@ -116,6 +119,10 @@
 											<?php
 										}
 										?>
+
+										<?php
+									}
+									?>
 									</tbody>
 								</table>
 

application/views/nano_credit/historique_nano_credit.php

@@ -31,9 +31,9 @@
 	<section class="content-header">
 
 		<h1>
-			<?php echo isset($category) ? 'Nano credit' : $this->lang->line('Gestion des wallets');
+			<?php echo isset($category) ? 'Nano credit' : $this->lang->line('nano_credit_management');
 			echo ' ' . $network . ' - ' . $country
-					. ' :: ' . $this->lang->line('Historique des transactions'); ?>
+					. ' :: ' . $this->lang->line('nano_credit_history'); ?>
 			<!--			<input type="button" class="btn btn-primary pull-right" id="Bactiver"-->
 			<!--				   value="Activer/Désactiver le(s) réseau(x)" />-->
 		</h1>
@@ -112,7 +112,7 @@
 			<div class="col-xs-12">
 				<div class="box">
 					<div class="box-header">
-						<h3 class="box-title"><?php echo $this->lang->line('export_transaction_history') ?></h3>
+						<h3 class="box-title"><?php echo $this->lang->line('export_nano_credit_demands_history') ?></h3>
 					</div>
 					<div class="box-body" style="overflow-x:auto;">
 						<?php
@@ -127,11 +127,11 @@
 							<thead>
 							<tr>
 								<th align='center'>ID</th>
-								<th align='center'>Etat</th>
+								<th align='center'><?php echo $this->lang->line('state') ?></th>
-								<th align='center'>Caution</th>
+								<th align='center'><?php echo $this->lang->line('caution_type') ?></th>
-								<th align='center'>Duree (en mois)</th>
+								<th align='center'><?php echo $this->lang->line('duration') ?></th>
 								<th><?php echo $this->lang->line('Montant') ?></th>
-								<th><?php echo $this->lang->line('fees') ?></th>
+								<th><?php echo $this->lang->line('interest') ?></th>
 								<th><?php echo $this->lang->line('tax') ?></th>
 								<th><?php echo $this->lang->line('agent_name') ?></th>
 								<th><?php echo $this->lang->line('issuer_id') ?></th>
@@ -163,7 +163,7 @@
 											<td>" . strtoupper($row->type_caution) . "</td>
 											<td>" . strtoupper($row->duree_mois) . "</td>
 											<td>" . $moneyNet->formatTo('fr_FR') . "</td>
-											<td>" . Money::of(round($row->frais, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>
+											<td>" . Money::of(round($row->interet, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>
 											<td>" . Money::of(round($row->taxe, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>
 											<td>" . $row->agent . "</td>
 											<td>" . $emetteur . "</td>