+ Update Time format and Traduction
This commit is contained in:
parent
dc2e5f68be
commit
f0440ff466
|
@ -136,7 +136,7 @@ $config['subclass_prefix'] = 'MY_';
|
||||||
| Note: This will NOT disable or override the CodeIgniter-specific
|
| Note: This will NOT disable or override the CodeIgniter-specific
|
||||||
| autoloading (application/config/autoload.php)
|
| autoloading (application/config/autoload.php)
|
||||||
*/
|
*/
|
||||||
$config['composer_autoload'] = FALSE;
|
$config['composer_autoload'] = FCPATH.'vendor/autoload.php';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||||
|
use Spatie\Async\Pool;
|
||||||
|
|
||||||
class Gestion extends CI_Controller
|
class Gestion extends CI_Controller
|
||||||
{
|
{
|
||||||
|
@ -1638,8 +1639,8 @@ class Gestion extends CI_Controller
|
||||||
if($method == 'create')
|
if($method == 'create')
|
||||||
{
|
{
|
||||||
$res = $this->user_model->addConfigWallet($network_id , $taux_client_r , $taux_client_d , $taux_ag_r ,$taux_ag_d , $taux_sup_r , $taux_sup_d, $taux_bq_r , $taux_bq_d , $frais_d);
|
$res = $this->user_model->addConfigWallet($network_id , $taux_client_r , $taux_client_d , $taux_ag_r ,$taux_ag_d , $taux_sup_r , $taux_sup_d, $taux_bq_r , $taux_bq_d , $frais_d);
|
||||||
if($res)
|
// if($res)
|
||||||
$this->generateAllWallets($network_id);
|
// $this->generateAllWallets($network_id);
|
||||||
|
|
||||||
}
|
}
|
||||||
else if($method = 'update'){
|
else if($method = 'update'){
|
||||||
|
@ -1686,11 +1687,12 @@ class Gestion extends CI_Controller
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function generateAllWallets($network_id){
|
public function generateAllWallets(){
|
||||||
// if($this->isLogged()) {
|
// Asynchrous method
|
||||||
// if (isset($_POST)) {
|
|
||||||
//
|
$network_id = $_POST['network_id'];
|
||||||
// $network_id = $_POST['network_id'];
|
$pool = Pool::create();
|
||||||
|
$pool->add(function () use ($network_id) {
|
||||||
// Fetch all agents , hyperviseur , superviseur
|
// Fetch all agents , hyperviseur , superviseur
|
||||||
$f_agents = $this->user_model->getAllAgentsForNetwork($network_id) ;
|
$f_agents = $this->user_model->getAllAgentsForNetwork($network_id) ;
|
||||||
if ($f_agents){
|
if ($f_agents){
|
||||||
|
@ -1699,37 +1701,25 @@ class Gestion extends CI_Controller
|
||||||
$res = $this->user_model->getWallet($row->agent_id);
|
$res = $this->user_model->getWallet($row->agent_id);
|
||||||
if($res){
|
if($res){
|
||||||
// Reinitialize the wallet
|
// Reinitialize the wallet
|
||||||
$this->user_model->reinitializeWallet($res->id_wallet);
|
// $this->user_model->reinitializeWallet($res->first_row()->wallet_id);
|
||||||
}else{
|
}else{
|
||||||
$this->user_model->addWallet($row->agent_id);
|
$this->user_model->addWallet($row->agent_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
})->then(function () {
|
||||||
|
|
||||||
// }
|
});
|
||||||
// }
|
await($pool);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function historique($network_id ,$startDate ,$endDate)
|
private function historique($network_id ,$startDate ,$endDate)
|
||||||
{
|
{
|
||||||
|
$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d' ;
|
||||||
$data['startDate'] = $startDate;
|
$data['startDate'] = $startDate ? date($format, strtotime($startDate)) : null ;
|
||||||
$data['endDate'] = $endDate;
|
$data['endDate'] = $endDate ?date($format, strtotime($endDate)): null ;
|
||||||
$endDate = Date('Y-m-d', strtotime($endDate."+1 day"));
|
$endDate = Date('Y-m-d', strtotime($endDate."+1 day"));
|
||||||
$data['transactions'] = $this->user_model->getTransactions($startDate , $endDate ,$network_id);
|
$data['transactions'] = $this->user_model->getTransactions($startDate , $endDate ,$network_id);
|
||||||
// if($res)
|
|
||||||
// $transactions = $res->result();
|
|
||||||
//
|
|
||||||
// if($startDate!=null & $endDate != null){
|
|
||||||
// if ($transactions){
|
|
||||||
// $transactions = array_filter($transactions, function ($trans) use ($endDate ,$startDate){
|
|
||||||
// $date = strtotime($trans->date_created);
|
|
||||||
// return $date >= strtotime($startDate) && $date <= strtotime($endDate) ;
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
$data['active'] = "wallet";
|
$data['active'] = "wallet";
|
||||||
$data['alert'] = "";
|
$data['alert'] = "";
|
||||||
$data['networks'] = $this->user_model->getAllActivatedNetworks();
|
$data['networks'] = $this->user_model->getAllActivatedNetworks();
|
||||||
|
|
|
@ -201,8 +201,9 @@ class Hyperviseur_dash extends CI_Controller
|
||||||
$fin = date('Y-m-d');
|
$fin = date('Y-m-d');
|
||||||
$debut = Date('Y-m-d', strtotime("-5 days"));
|
$debut = Date('Y-m-d', strtotime("-5 days"));
|
||||||
}
|
}
|
||||||
$data['debut'] = $debut;
|
$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d' ;
|
||||||
$data['fin'] = $fin;
|
$data['debut'] = $debut ? date($format, strtotime($debut)) : null ;
|
||||||
|
$data['fin'] = $fin ?date($format, strtotime($fin)): null ;
|
||||||
$fin = Date('Y-m-d', strtotime($fin."+1 day"));
|
$fin = Date('Y-m-d', strtotime($fin."+1 day"));
|
||||||
|
|
||||||
$ville = $this->session->userdata('ville');
|
$ville = $this->session->userdata('ville');
|
||||||
|
@ -263,8 +264,9 @@ class Hyperviseur_dash extends CI_Controller
|
||||||
$network = $this->session->userdata('network');
|
$network = $this->session->userdata('network');
|
||||||
$debut = $this->input->get("d");
|
$debut = $this->input->get("d");
|
||||||
$fin = $this->input->get("f");
|
$fin = $this->input->get("f");
|
||||||
$data['debut'] = $debut;
|
$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d' ;
|
||||||
$data['fin'] = $fin;
|
$data['debut'] = $debut ? date($format, strtotime($debut)) : null ;
|
||||||
|
$data['fin'] = $fin ?date($format, strtotime($fin)): null ;
|
||||||
$data['demand_type'] = 'adhesion';
|
$data['demand_type'] = 'adhesion';
|
||||||
$data['active'] = "demandesAd";
|
$data['active'] = "demandesAd";
|
||||||
$data['alert'] = "";
|
$data['alert'] = "";
|
||||||
|
|
|
@ -118,8 +118,9 @@ class Superviseur_dash extends CI_Controller
|
||||||
$user_geo = $this->input->get("u");
|
$user_geo = $this->input->get("u");
|
||||||
$debut = $this->input->get("d");
|
$debut = $this->input->get("d");
|
||||||
$fin = $this->input->get("f");
|
$fin = $this->input->get("f");
|
||||||
$data['debut'] = $debut;
|
$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d' ;
|
||||||
$data['fin'] = $fin;
|
$data['debut'] = $debut ? date($format, strtotime($debut)) : null ;
|
||||||
|
$data['fin'] = $fin ?date($format, strtotime($fin)): null ;
|
||||||
$fin = Date('Y-m-d', strtotime($fin."+1 day")); // Increment date because SQL BETWEEN
|
$fin = Date('Y-m-d', strtotime($fin."+1 day")); // Increment date because SQL BETWEEN
|
||||||
|
|
||||||
$network = $this->session->userdata('network');
|
$network = $this->session->userdata('network');
|
||||||
|
@ -171,8 +172,9 @@ class Superviseur_dash extends CI_Controller
|
||||||
$network = $this->session->userdata('network');
|
$network = $this->session->userdata('network');
|
||||||
$debut = $this->input->get("d");
|
$debut = $this->input->get("d");
|
||||||
$fin = $this->input->get("f");
|
$fin = $this->input->get("f");
|
||||||
$data['debut'] = $debut;
|
$format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d' ;
|
||||||
$data['fin'] = $fin;
|
$data['debut'] = $debut ? date($format, strtotime($debut)) : null ;
|
||||||
|
$data['fin'] = $fin ?date($format, strtotime($fin)): null ;
|
||||||
$data['active'] = "demandesAd";
|
$data['active'] = "demandesAd";
|
||||||
$data['alert'] = "";
|
$data['alert'] = "";
|
||||||
$data['demand_type'] = 'adhesion';
|
$data['demand_type'] = 'adhesion';
|
||||||
|
|
|
@ -220,6 +220,10 @@ $lang['Statut du compte'] = 'Account status';
|
||||||
$lang['Publicité'] = 'Publicity';
|
$lang['Publicité'] = 'Publicity';
|
||||||
$lang['Gestion de la publicité'] = 'Advertising Management';
|
$lang['Gestion de la publicité'] = 'Advertising Management';
|
||||||
|
|
||||||
|
//GAME
|
||||||
|
$lang['Game'] = 'Game';
|
||||||
|
$lang['Utilisateurs'] = 'Users';
|
||||||
|
|
||||||
//Wallet
|
//Wallet
|
||||||
$lang['Gestion des wallets'] = 'Wallet Management';
|
$lang['Gestion des wallets'] = 'Wallet Management';
|
||||||
$lang['Réseaux activés'] = 'Activated networks';
|
$lang['Réseaux activés'] = 'Activated networks';
|
||||||
|
@ -230,7 +234,18 @@ $lang['Taux de commission agent géolocalisé sur retrait'] = 'Geolocated agent
|
||||||
$lang['Taux de commission agent géolocalisé sur dépot'] = 'Geolocated agent commission rate on deposit';
|
$lang['Taux de commission agent géolocalisé sur dépot'] = 'Geolocated agent commission rate on deposit';
|
||||||
$lang['Taux de commission superviseur sur retrait'] = 'Supervisor commission rate on withdrawal';
|
$lang['Taux de commission superviseur sur retrait'] = 'Supervisor commission rate on withdrawal';
|
||||||
$lang['Taux de commission superviseur sur dépot'] = 'Supervisor commission rate on deposit';
|
$lang['Taux de commission superviseur sur dépot'] = 'Supervisor commission rate on deposit';
|
||||||
|
$lang['Part de la banque sur le retrait'] = 'Partner bank\'s share of withdrawal';
|
||||||
|
$lang['Part de la banque sur le dépot'] = 'Share of partner bank on deposit';
|
||||||
|
$lang['Frais minimun de la banque sur le dépot'] = 'Minimum bank charges on customer deposit';
|
||||||
$lang['Suppression du wallet'] = 'Removal of the wallet';
|
$lang['Suppression du wallet'] = 'Removal of the wallet';
|
||||||
|
$lang['Modifier la configuration'] = 'Change configuration';
|
||||||
|
$lang['Historique des 12 derniers mois'] = 'Withdrawals and deposits from the last 12 months';
|
||||||
|
$lang['Historique'] = 'Historic';
|
||||||
|
$lang['Commission Hyperviseur'] = 'Hypervisor Commission';
|
||||||
|
$lang['Parts dépots & retraits'] = 'Deposit & withdrawal shares';
|
||||||
|
$lang['Historique des transactions'] = 'Transaction history';
|
||||||
|
$lang['Période'] = 'Period';
|
||||||
$lang['Aucune demande'] = 'No transactions';
|
$lang['Aucune demande'] = 'No transactions';
|
||||||
|
$lang['Acceptée'] = 'Accepted';
|
||||||
|
$lang['Annulée'] = 'Canceled';
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>403 Forbidden</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<p>Directory access is forbidden.</p>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -248,12 +248,19 @@
|
||||||
$lang['Taux de commission superviseur sur dépot'] = 'Taux de commission superviseur sur dépot';
|
$lang['Taux de commission superviseur sur dépot'] = 'Taux de commission superviseur sur dépot';
|
||||||
$lang['Part de la banque sur le retrait'] = 'Part de la banque partenaire sur le retrait';
|
$lang['Part de la banque sur le retrait'] = 'Part de la banque partenaire sur le retrait';
|
||||||
$lang['Part de la banque sur le dépot'] = 'Part de la banque partenaire sur le dépot';
|
$lang['Part de la banque sur le dépot'] = 'Part de la banque partenaire sur le dépot';
|
||||||
$lang['Frais minimun de la banque sur le dépot'] = 'Frais minimun de la banque sur le dépot du client';
|
$lang['Frais minimun de la banque sur le dépot'] = 'Frais minimum de la banque sur le dépot du client';
|
||||||
$lang['Suppression du wallet'] = 'Suppression du wallet';
|
$lang['Suppression du wallet'] = 'Suppression du wallet';
|
||||||
$lang['Modifier la configuration'] = 'Modifier la configuration';
|
$lang['Modifier la configuration'] = 'Modifier la configuration';
|
||||||
$lang['Commissions Hyperviseur'] = 'Commissions Hyperviseur';
|
$lang['Commission Hyperviseur'] = 'Commissions Hyperviseur';
|
||||||
$lang['Commissions Superviseurs'] = 'Commissions Superviseurs';
|
$lang['Commissions Superviseurs'] = 'Commissions Superviseurs';
|
||||||
$lang['Commissions Agents']= 'Commissions Agents';
|
$lang['Commissions Agents']= 'Commissions Agents';
|
||||||
|
$lang['Historique des 12 derniers mois'] = 'Retraits et dépots des 12 derniers mois';
|
||||||
|
$lang['Historique'] = 'Historique';
|
||||||
|
$lang['Historique des transactions'] = 'Historique des transactions';
|
||||||
|
$lang['Période'] = 'Période';
|
||||||
|
$lang['Parts dépots & retraits'] = 'Parts dépots & retraits';
|
||||||
|
|
||||||
$lang['Aucune transaction'] = 'Aucune transaction';
|
$lang['Aucune transaction'] = 'Aucune transaction';
|
||||||
|
$lang['Acceptée'] = 'Acceptée';
|
||||||
|
$lang['Annulée'] = 'Annulée';
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -303,7 +303,7 @@ class User_model extends CI_Model
|
||||||
$query = $this->db->query("SELECT *
|
$query = $this->db->query("SELECT *
|
||||||
FROM info_demandeCredits AS d
|
FROM info_demandeCredits AS d
|
||||||
WHERE d.codeMembre='".$member_code."'
|
WHERE d.codeMembre='".$member_code."'
|
||||||
ORDER BY dateAjout");
|
ORDER BY dateAjout DESC");
|
||||||
|
|
||||||
if($query->num_rows()>0){
|
if($query->num_rows()>0){
|
||||||
return $query;
|
return $query;
|
||||||
|
|
|
@ -94,13 +94,14 @@
|
||||||
echo "<span class='info-box-number'>".$nameOfcurentGeolocatedUser."</span>";
|
echo "<span class='info-box-number'>".$nameOfcurentGeolocatedUser."</span>";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<span class="info-box-text">Période </span>
|
<span class="info-box-text"> <?php echo $this->lang->line('Période') ?> </span>
|
||||||
<span class="info-box-number">
|
<span class="info-box-number">
|
||||||
<input id="picker" style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%" type="text" name="daterange" data-type="<?php echo $demand_type?>" data-category="<?php echo $this->session->userdata('category') ?>"
|
<input id="picker" style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%" type="text" name="daterange" data-lang="<?php echo $this->session->userdata('site_lang') ?>"
|
||||||
|
data-type="<?php echo $demand_type?>" data-category="<?php echo $this->session->userdata('category') ?>"
|
||||||
value="<?php echo ($debut!=null & $fin != null) ? $debut. ' - '.$fin : ''?>"
|
value="<?php echo ($debut!=null & $fin != null) ? $debut. ' - '.$fin : ''?>"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
<span> Format : <?php echo $this->session->userdata('site_lang') === 'french' ? 'Jour - Mois - Année ' : 'Year - Month - Day'?> </span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -233,7 +234,9 @@
|
||||||
</tr>";}else{
|
</tr>";}else{
|
||||||
$etat = $this->lang->line("Non traitée");
|
$etat = $this->lang->line("Non traitée");
|
||||||
if($row->statut==1){
|
if($row->statut==1){
|
||||||
$etat = $this->lang->line("traitée");
|
$etat = $this->lang->line("Acceptée");
|
||||||
|
}else if($row->statut == 2){
|
||||||
|
$etat = $this->lang->line("Annulée");
|
||||||
}
|
}
|
||||||
$origin = $row->codeMembre;
|
$origin = $row->codeMembre;
|
||||||
$destination = $row->codeParrain;
|
$destination = $row->codeParrain;
|
||||||
|
@ -378,7 +381,9 @@
|
||||||
</tr>";}else{
|
</tr>";}else{
|
||||||
$etat = $this->lang->line("Non traitée");
|
$etat = $this->lang->line("Non traitée");
|
||||||
if($row->statut==1){
|
if($row->statut==1){
|
||||||
$etat = $this->lang->line("traitée");
|
$etat = $this->lang->line("Acceptée");
|
||||||
|
}else if($row->statut == 2){
|
||||||
|
$etat = $this->lang->line("Annulée");
|
||||||
}
|
}
|
||||||
$origin = $row->codeMembre;
|
$origin = $row->codeMembre;
|
||||||
$destination = $row->codeParrain;
|
$destination = $row->codeParrain;
|
||||||
|
@ -1050,7 +1055,9 @@
|
||||||
</tr>";}else{
|
</tr>";}else{
|
||||||
$etat = $this->lang->line("Non traitée");
|
$etat = $this->lang->line("Non traitée");
|
||||||
if($row->statut==1){
|
if($row->statut==1){
|
||||||
$etat = $this->lang->line("traitée");
|
$etat = $this->lang->line("Acceptée");
|
||||||
|
}else if($row->statut == 2){
|
||||||
|
$etat = $this->lang->line("Annulée");
|
||||||
}
|
}
|
||||||
$origin = $row->codeMembre;
|
$origin = $row->codeMembre;
|
||||||
$destination = $row->codeParrain;
|
$destination = $row->codeParrain;
|
||||||
|
@ -1383,9 +1390,15 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(function () {
|
$(function () {
|
||||||
$('#listeMembres').DataTable();
|
$('#listeMembres').DataTable({
|
||||||
$('#listeMembres1').DataTable();
|
"aaSorting": [[ 3, "desc" ]]
|
||||||
$('#listeMembres2').DataTable();
|
});
|
||||||
|
$('#listeMembres1').DataTable({
|
||||||
|
"aaSorting": [[ 3, "desc" ]]
|
||||||
|
});
|
||||||
|
$('#listeMembres2').DataTable({
|
||||||
|
"aaSorting": [[ 1, "desc" ]]
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
@ -1442,11 +1455,12 @@
|
||||||
$(function() {
|
$(function() {
|
||||||
const type = $('#picker').data('type');
|
const type = $('#picker').data('type');
|
||||||
const category = $('#picker').data('category');
|
const category = $('#picker').data('category');
|
||||||
|
const lang = $('#picker').data('lang');
|
||||||
$('input[name="daterange"]').daterangepicker({
|
$('input[name="daterange"]').daterangepicker({
|
||||||
opens: 'left',
|
opens: 'left',
|
||||||
autoUpdateInput: false,
|
autoUpdateInput: false,
|
||||||
locale: {
|
locale: {
|
||||||
format: 'YYYY-MM-DD',
|
format: lang === 'french' ? 'DD-MM-YYYY' : 'YYYY-MM-DD',
|
||||||
cancelLabel: 'Clear'
|
cancelLabel: 'Clear'
|
||||||
}
|
}
|
||||||
}, function(start, end, label) {
|
}, function(start, end, label) {
|
||||||
|
|
|
@ -139,7 +139,7 @@ if ($transactions != false) {
|
||||||
<section class="content-header">
|
<section class="content-header">
|
||||||
|
|
||||||
<h1>
|
<h1>
|
||||||
Gestion des wallets <?php echo $network .' - '.$country; ?>
|
<?php echo $this->lang->line('Gestion des wallets'). ' '. $network .' - '.$country; ?>
|
||||||
</h1>
|
</h1>
|
||||||
<?php
|
<?php
|
||||||
$site_url = base_url();
|
$site_url = base_url();
|
||||||
|
@ -302,10 +302,11 @@ if ($transactions != false) {
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<div class="box box-success">
|
<div class="box box-success">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">Retraits et dépots des 12 derniers
|
<h3 class="box-title">
|
||||||
mois<?php //echo $this->lang->line('Souscription des 12 derniers mois'); ?></h3>
|
<?php echo $this->lang->line('Historique des 12 derniers mois'); ?></h3>
|
||||||
<div class="box-tools">
|
<div class="box-tools">
|
||||||
<a class="btn btn-primary" href="<?php echo current_url().($network_id ? '?id='.$network_id . '&history=true' : '')?>"> Historique </a>
|
<a class="btn btn-primary" href="<?php echo current_url().($network_id ? '?id='.$network_id . '&history=true' : '')?>">
|
||||||
|
<?php echo $this->lang->line('Historique'); ?></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
|
@ -318,8 +319,8 @@ if ($transactions != false) {
|
||||||
<div class="col-xs-6">
|
<div class="col-xs-6">
|
||||||
<div class="box box-danger">
|
<div class="box box-danger">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">Parts dépots &
|
<h3 class="box-title">
|
||||||
retraits<?php //echo $this->lang->line("Utilisateurs géolocalisés par ville"); ?></h3>
|
<?php echo $this->lang->line("Parts dépots & retraits"); ?></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body" id="chart2">
|
<div class="box-body" id="chart2">
|
||||||
<canvas id="pieChart" style="height:250px"></canvas>
|
<canvas id="pieChart" style="height:250px"></canvas>
|
||||||
|
@ -330,7 +331,7 @@ if ($transactions != false) {
|
||||||
<div class="col-xs-6">
|
<div class="col-xs-6">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header">
|
<div class="box-header">
|
||||||
<h3 class="box-title"><?php echo $this->lang->line('Commissions Hyperviseur') ?></h3>
|
<h3 class="box-title"><?php echo $this->lang->line('Commission Hyperviseur') ?></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<table id="example1" class="table table-bordered table-hover">
|
<table id="example1" class="table table-bordered table-hover">
|
||||||
|
|
|
@ -280,17 +280,17 @@
|
||||||
console.log(resultat+" "+error );
|
console.log(resultat+" "+error );
|
||||||
}
|
}
|
||||||
}).done(function () {
|
}).done(function () {
|
||||||
//$.ajax({
|
$.ajax({
|
||||||
// url : '<?php //echo base_url('index.php/Gestion/generateAllWallets')?>//',
|
url : '<?php echo base_url('index.php/Gestion/generateAllWallets')?>',
|
||||||
// type : 'POST',
|
type : 'POST',
|
||||||
// dataType : 'json',
|
dataType : 'json',
|
||||||
// data : {"network_id": network_id},
|
data : {"network_id": network_id},
|
||||||
// timeout : 0,
|
async : true ,
|
||||||
// async : true ,
|
timeout : 0,
|
||||||
// success : function () {
|
success : function () {
|
||||||
// console.log("All wallets are generated");
|
console.log("All wallets are generated");
|
||||||
// }
|
}
|
||||||
//});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@
|
||||||
</li>
|
</li>
|
||||||
<li class="<?php if($active=="demandesAd"){echo "active ";} ?>">
|
<li class="<?php if($active=="demandesAd"){echo "active ";} ?>">
|
||||||
<a href="<?php echo base_url('index.php/Superviseur_dash/getDemandesAd') ?>">
|
<a href="<?php echo base_url('index.php/Superviseur_dash/getDemandesAd') ?>">
|
||||||
<i class="fa fa-users"></i> <span>Demandes d'adhésion</span>
|
<i class="fa fa-users"></i> <span> <?php echo $this->lang->line('Demandes adhésion'); ?></span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<?php if($hasWallet){
|
<?php if($hasWallet){
|
||||||
|
|
|
@ -44,14 +44,13 @@
|
||||||
<div class="row">
|
<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">
|
||||||
<div class="info-box">
|
<div class="info-box">
|
||||||
<!-- <span id="change-periode" style="cursor: pointer;" class="info-box-icon bg-aqua"><i class="ion ion-android-arrow-right"></i></span>-->
|
<span class="info-box-icon bg-aqua"><i class="ion ion-android-time"></i></span>
|
||||||
<span class="info-box-icon bg-aqua"><i class="ion ion-android-arrow-down"></i></span>
|
|
||||||
<div class="info-box-content">
|
<div class="info-box-content">
|
||||||
<span class="info-box-text">Période </span>
|
<span class="info-box-text"><?php echo $this->lang->line('Période') ?> </span>
|
||||||
<span class="info-box-number">
|
<span class="info-box-number">
|
||||||
<input
|
<input
|
||||||
style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%"
|
style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%"
|
||||||
type="text" name="daterange"
|
type="text" name="daterange" data-lang="<?php echo $this->session->userdata('site_lang') ?>"
|
||||||
value="<?php echo ($startDate!=null & $endDate != null) ? $startDate. ' - '.$endDate : ''?>"/>
|
value="<?php echo ($startDate!=null & $endDate != null) ? $startDate. ' - '.$endDate : ''?>"/>
|
||||||
|
|
||||||
</span>
|
</span>
|
||||||
|
@ -64,7 +63,7 @@
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header">
|
<div class="box-header">
|
||||||
<h3 class="box-title">Historique des transactions</h3>
|
<h3 class="box-title"><?php echo $this->lang->line('Historique des transactions') ?></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body">
|
<div class="box-body">
|
||||||
<?php
|
<?php
|
||||||
|
@ -152,7 +151,9 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(function () {
|
$(function () {
|
||||||
$('#transactions').DataTable();
|
$('#transactions').DataTable({
|
||||||
|
"aaSorting": [[ 0, "desc" ]]
|
||||||
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -161,11 +162,12 @@
|
||||||
var endDate;
|
var endDate;
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
|
const lang = $('#picker').data('lang');
|
||||||
$('input[name="daterange"]').daterangepicker({
|
$('input[name="daterange"]').daterangepicker({
|
||||||
opens: 'left',
|
opens: 'left',
|
||||||
autoUpdateInput: false,
|
autoUpdateInput: false,
|
||||||
locale: {
|
locale: {
|
||||||
format: 'YYYY-MM-DD',
|
format: lang === 'french' ? 'DD-MM-YYYY' : 'YYYY-MM-DD',
|
||||||
cancelLabel: 'Clear'
|
cancelLabel: 'Clear'
|
||||||
}
|
}
|
||||||
}, function (start, end, label) {
|
}, function (start, end, label) {
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
<div class="login-page">
|
<div class="login-page">
|
||||||
<div class="img-container">
|
<div class="img-container">
|
||||||
<div class="choice-lang">
|
<div class="choice-lang">
|
||||||
<img src="<?php echo base_url('images/flag_french.png') ?>" class="img-circle img-responsive" onclick="javascript:window.location.href='<?php echo base_url(); ?>/index.php/LanguageSwitcher/switchLang/french';"/>
|
<img src="<?php echo base_url('images/flag_french.png') ?>" class="img-circle img-responsive" onclick="javascript:window.location.href ='<?php echo base_url(); ?>index.php/LanguageSwitcher/switchLang/french';"/>
|
||||||
<img src="<?php echo base_url('images/flag_uk.jpg') ?>" class="img-circle img-responsive" onclick="javascript:window.location.href='<?php echo base_url(); ?>/index.php/LanguageSwitcher/switchLang/english';"/>
|
<img src="<?php echo base_url('images/flag_uk.jpg') ?>" class="img-circle img-responsive" onclick="javascript:window.location.href ='<?php echo base_url(); ?>index.php/LanguageSwitcher/switchLang/english';"/>
|
||||||
<!--<a href='#modal-langue'data-toggle='modal'><?php echo $this->lang->line('langue'); ?> : <?php echo $this->session->userdata('site_lang') ?> </a>-->
|
<!--<a href='#modal-langue'data-toggle='modal'><?php echo $this->lang->line('langue'); ?> : <?php echo $this->session->userdata('site_lang') ?> </a>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center pull-right photo">
|
<div class="text-center pull-right photo">
|
||||||
|
|
|
@ -11,7 +11,8 @@
|
||||||
"source": "https://github.com/bcit-ci/CodeIgniter"
|
"source": "https://github.com/bcit-ci/CodeIgniter"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.4"
|
"php": ">=5.4",
|
||||||
|
"spatie/async": "^1.4"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"paragonie/random_compat": "Provides better randomness in PHP 5.x"
|
"paragonie/random_compat": "Provides better randomness in PHP 5.x"
|
||||||
|
|
Loading…
Reference in New Issue