adminnistrateur
/
backoffice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Fix transate and demande credit and adhesion bug

This commit is contained in:
DJERY-TOM 2020-05-02 11:49:34 +01:00
parent f0440ff466
commit dabdfd1fea
16 changed files with 2274 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Gestion.php
View File

@ -1715,6 +1715,7 @@ class Gestion extends CI_Controller
private function historique($network_id ,$startDate ,$endDate)
{
$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 ;

6
application/controllers/Hyperviseur_dash.php
View File

@ -224,12 +224,12 @@ class Hyperviseur_dash extends CI_Controller
$data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code'));
$data['tab_fastDemande'] = $this->user_model->getRangeASCDemandesByNetwork($debut,$fin,$this->session->userdata('member_code'),$this->session->userdata('current_demande_ville'),$super);
$data['tab_slowDemande'] = $this->user_model->getRangeDESCDemandesByNetwork($debut,$fin,$this->session->userdata('member_code'),$this->session->userdata('current_demande_ville'),$super);
$data['list'] = $this->user_model->getDemandesBySuper($debut,$fin,$this->session->userdata('member_code'),$super);
$data['list'] = $this->user_model->getDemandesBySuper($this->session->userdata('member_code'),$super);
$data['temp_moyen'] = $this->user_model->getTempsMoyenByVille($this->session->userdata('member_code'),$super,$this->session->userdata('network'));
$data['networks'] = $this->user_model->getNetworkByHyp($this->session->userdata('member_code'));
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$this->load->view('header_hyp', $data);
$this->load->view('demande');
$this->load->view('demande_credit');
$this->load->view('footer');
}
}
@ -289,7 +289,7 @@ class Hyperviseur_dash extends CI_Controller
$data['type'] = $this->lang->line('Adhésion');
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$this->load->view('header_hyp', $data);
$this->load->view('demande');
$this->load->view('demande_adhesion');
$this->load->view('footer');
}
}

2
application/controllers/LanguageSwitcher.php
View File

@ -5,7 +5,7 @@ class LanguageSwitcher extends CI_Controller
parent::__construct();
}
function switchLang($language = "") {
public function switchLang($language = "") {
$language = ($language != "") ? $language : "french";
$this->session->set_userdata('site_lang', $language);

7
application/controllers/Superviseur_dash.php
View File

@ -149,7 +149,7 @@ class Superviseur_dash extends CI_Controller
$data['nameOfcurentGeolocatedUser'] = $this->user_model->nameOfCurrentGeolocatedUser_forSuper($user_geo);
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$this->load->view('header_sup', $data);
$this->load->view('demande');
$this->load->view('demande_credit');
$this->load->view('footer');
}else{
@ -196,7 +196,7 @@ class Superviseur_dash extends CI_Controller
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code'));
$this->load->view('header_sup', $data);
$this->load->view('demande');
$this->load->view('demande_adhesion');
$this->load->view('footer');
}
}
@ -235,7 +235,6 @@ class Superviseur_dash extends CI_Controller
//Fetch all transactions of any geolocated agent of the network
$data["transactions"] = array();
$totalCommissionBanque = 0;
if($agents_g){
foreach($agents_g->result() AS $row){
$wallet = $this->user_model->getWallet($row->agent_id);
@ -243,7 +242,6 @@ class Superviseur_dash extends CI_Controller
$transactions = $this->user_model->getAgentTransactions($wallet->first_row()->wallet_id);
if($transactions){
foreach($transactions->result() AS $trans){
$totalCommissionBanque += $trans->commission_banque;
$trans->agent_id = $row->agent_id ; // Add agent id to transaction
array_push( $data['transactions'], $trans);
}
@ -251,7 +249,6 @@ class Superviseur_dash extends CI_Controller
}
}
}
$data["totalCommissionBanque"] = $totalCommissionBanque;
}else{
$data["commission"] = "N/A";
$data["principal"] = "N/A";

5
application/controllers/Users.php
View File

@ -217,8 +217,9 @@
{
$this->session->sess_destroy();
$data['alert'] = 'You have been disconnected';
//redirect('index.php/Users/index', $data);
$this->load->view('login', $data);
$this->session->set_flashdata('error','You have been disconnected' );
redirect('index.php/Users', $data);
// $this->load->view('login', $data);
}
public function forgot_password(){

1
application/hooks/LanguageLoader.php
View File

@ -6,7 +6,6 @@ class LanguageLoader
$ci->load->helper('language');
if($ci->session->userdata('connected')){
$siteLang = $ci->session->userdata('site_lang');
if ($siteLang) {
$ci->session->set_userdata('site_lang',$siteLang);

6
application/language/english/message_lang.php
View File

@ -245,7 +245,13 @@ $lang['Commission Hyperviseur'] = 'Hypervisor Commission';
$lang['Parts dépots & retraits'] = 'Deposit & withdrawal shares';
$lang['Historique des transactions'] = 'Transaction history';
$lang['Période'] = 'Period';
$lang['Commission de la banque'] = 'Bank commission';
$lang['Commission de l\'hyperviseur'] = 'Hypervisor commission';
$lang['Commission du superviseur'] = 'Supervisor\'s Commission';
$lang['Commission de l\'agent'] = 'Agent\'s commission';
$lang['Aucune demande'] = 'No transactions';
$lang['Acceptée'] = 'Accepted';
$lang['Annulée'] = 'Canceled';
$lang['RETRAIT'] = 'WITHDRAWAL';
$lang['DEPOT'] = 'DEPOSIT';
?>

7
application/language/french/message_lang.php
View File

@ -259,7 +259,12 @@
$lang['Historique des transactions'] = 'Historique des transactions';
$lang['Période'] = 'Période';
$lang['Parts dépots & retraits'] = 'Parts dépots & retraits';
$lang['Commission de la banque'] = 'Commission de la banque';
$lang['Commission de l\'hyperviseur'] = 'Commission de l\'hyperviseur';
$lang['Commission du superviseur'] = 'Commission du superviseur';
$lang['Commission de l\'agent'] = 'Commission de l\'agent';
$lang['RETRAIT'] = 'RETRAIT';
$lang['DEPOT'] = 'DEPOT';
$lang['Aucune transaction'] = 'Aucune transaction';
$lang['Acceptée'] = 'Acceptée';
$lang['Annulée'] = 'Annulée';

44
application/models/User_model.php
View File

@ -492,15 +492,15 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,
(SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif)
FROM demande_credit AS req_im
WHERE req_im.statut=1 AND req_im.id=d.id) AS temps
WHERE req_im.statut='1' AND req_im.id=d.id) AS temps
FROM demande_credit AS d
WHERE statut=1
WHERE statut='1'
ORDER BY temps
LIMIT 5");
}else{
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."'
WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."'
AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps
LIMIT 5");
@ -518,7 +518,7 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeMembre='".$codeParrain."'
WHERE statut='1' AND d.codeMembre='".$codeParrain."'
ORDER BY temps
LIMIT 5");
@ -536,15 +536,15 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,
(SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif)
FROM demande_credit AS req_im
WHERE req_im.statut=1 AND req_im.id=d.id) AS temps
WHERE req_im.statut='1' AND req_im.id=d.id) AS temps
FROM demande_credit AS d
WHERE statut=1 AND d.reseau='".$ville."' AND date_creation BETWEEN '".$debut."' AND '".$fin."'
WHERE statut='1' AND d.reseau='".$ville."' AND date_creation BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps
LIMIT 5");
}else{
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$super."'
WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$super."'
AND dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps
LIMIT 5");
@ -596,15 +596,15 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,
(SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif)
FROM demande_credit AS req_im
WHERE req_im.statut=1 AND req_im.id=d.id) AS temps
WHERE req_im.statut='1' AND req_im.id=d.id) AS temps
FROM demande_credit AS d
WHERE statut=1
WHERE statut='1'
ORDER BY temps DESC
LIMIT 5");
}else{
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."'
WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."'
AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps DESC
LIMIT 5");
@ -622,7 +622,7 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeMembre='".$codeParrain."'
WHERE statut='1' AND d.codeMembre='".$codeParrain."'
ORDER BY temps DESC
LIMIT 5");
@ -640,15 +640,15 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,
(SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif)
FROM demande_credit AS req_im
WHERE req_im.statut=1 AND req_im.id=d.id) AS temps
WHERE req_im.statut='1' AND req_im.id=d.id) AS temps
FROM demande_credit AS d
WHERE statut=1 AND d.reseau='".$ville."' AND date_creation BETWEEN '".$debut."' AND '".$fin."'
WHERE statut='1' AND d.reseau='".$ville."' AND date_creation BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps DESC
LIMIT 5");
}else{
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$super."'
WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$super."'
AND dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps DESC
LIMIT 5");
@ -697,11 +697,11 @@ class User_model extends CI_Model
public function getTempsMoyen($user_geo, $debut, $fin, $codeParrain){
if($codeParrain=='all'){
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut=1");
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'");
}else{
$query = $this->db->query("SELECT AVG(temps) AS temps
FROM info_demandeCredits
WHERE statut=1 AND codeParrain='".$codeParrain."'
WHERE statut= '1' AND codeParrain='".$codeParrain."'
AND codeMembre='".$user_geo."'
AND dateAjout BETWEEN '".$debut."' AND '".$fin."'");
}
@ -717,9 +717,9 @@ class User_model extends CI_Model
public function getTempsMoyenDemandeSup($codeParrain){
if($codeParrain=='all'){
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut=1");
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'");
}else{
$query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut=1 AND codeMembre='".$codeParrain."'");
$query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut='1' AND codeMembre='".$codeParrain."'");
}
if($query->num_rows()>0){
@ -733,7 +733,7 @@ class User_model extends CI_Model
public function getTempsMoyenByVille($codeParrain,$super){
if($codeParrain=='all'){
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut=1 AND reseau='".$network."' ");
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'AND reseau='".$network."' ");
}else{
$query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut='1' AND codeParrain='".$codeParrain."' AND codeMembre='".$super."' ");
}
@ -834,7 +834,7 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps
FROM info_demandeCredits
WHERE pays='".$pays."'
AND statut=1
AND statut='1'
AND ville='".$ville."'
AND (codeParrain='".$codeHyper."'
OR codeParrain IN (SELECT code_membre FROM super_infos WHERE code_parrain='".$codeHyper."' AND category ='super'))");
@ -852,7 +852,7 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE pays='".$pays."'
AND statut=1
AND statut='1'
AND ville='".$ville."'
AND (codeParrain='".$codeHyper."'
OR codeParrain IN (SELECT code_membre FROM super_infos WHERE code_parrain='".$codeHyper."' AND category ='super'))
@ -872,7 +872,7 @@ class User_model extends CI_Model
$query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps
FROM info_demandeCredits AS d
WHERE pays='".$pays."'
AND statut=1
AND statut='1'
AND ville='".$ville."'
AND (codeParrain='".$codeHyper."'
OR codeParrain IN (SELECT code_membre FROM super_infos WHERE code_parrain='".$codeHyper."' AND category ='super'))

61
application/views/demande.php
View File

@ -1384,20 +1384,55 @@
<!-- AdminLTE for demo purposes -->
<script src="<?php echo base_url('dist/js/demo.js') ?>"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment-with-locales.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/plug-ins/1.10.19/sorting/datetime-moment.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/plug-ins/1.10.20/dataRender/datetime.js"></script>
<script>
$(function () {
const lang = $('#picker').data('lang');
const format = lang === 'french' ? 'fr' : 'en';
moment.updateLocale(moment.locale(format), { invalidDate: "" }); // Blank text when is invalid date
$('#listeMembres').DataTable({
"aaSorting": [[ 3, "desc" ]]
});
$('#listeDemandesRapides').DataTable({
searching: false, paging: false, info: false,
"aaSorting": [[ 4, "desc" ]],
"columnDefs": [ {
targets: [4,5],
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
}]
});
$('#listeDemandesTardives').DataTable({
searching: false, paging: false, info: false,
"aaSorting": [[ 3, "desc" ]],
"columnDefs": [ {
targets: [4,5],
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
}]
});
$('#listeMembres1').DataTable({
"aaSorting": [[ 3, "desc" ]]
"aaSorting": [[ 3, "desc" ]],
"columnDefs": [ {
targets: [3,4],
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format),
"defaultContent": ""
}]
});
$('#listeMembres2').DataTable({
"aaSorting": [[ 1, "desc" ]]
"aaSorting": [[ 1, "desc" ]],
"columnDefs": [ {
targets: [1,2],
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
}]
});
});
@ -1482,6 +1517,24 @@
}
});
$('input[name="daterange"]').on('cancel.daterangepicker', function(ev, picker) {
//do something, like clearing an input
$('#daterange').val('');
if(category == 'super'){
if(type == 'credit'){
window.location.replace("<?php echo base_url('index.php/Superviseur_dash/getDemandes')?>"+"?d="+debut+"&f="+fin+"&u="+user_geo);
}else if (type == 'adhesion'){
window.location.replace("<?php echo base_url('index.php/Superviseur_dash/getDemandesAd')?>"+"?d="+debut+"&f="+fin);
}
}else if (category == 'hyper'){
if(type == 'credit'){
window.location.replace("<?php echo base_url('index.php/Hyperviseur_dash/getDemandes')?>"+"?d="+debut+"&f="+fin+"&u="+user_geo);
}else if (type == 'adhesion'){
window.location.replace("<?php echo base_url('index.php/Hyperviseur_dash/getDemandesAd')?>"+"?d="+debut+"&f="+fin);
}
}
});
});
</script>

605
application/views/demande_adhesion.php Normal file
View File

@ -0,0 +1,605 @@
<!-- DataTables -->
<link rel="stylesheet" href="<?php echo base_url('bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css') ?>">
<div class="content-wrapper">
<?php
function duree($time) {
$tabTemps = array("jours" => 86400,
"h" => 3600,
"m" => 60,
"s" => 1);
$result = "";
foreach($tabTemps as $uniteTemps => $nombreSecondesDansUnite) {
$$uniteTemps = floor($time/$nombreSecondesDansUnite);
$time = $time%$nombreSecondesDansUnite;
if($$uniteTemps > 0 || !empty($result)){
$result .= $$uniteTemps." $uniteTemps ";
}
}
return $result;
}
function dateDiff($date1, $date2){
$diff = abs($date1 - $date2); // abs pour avoir la valeur absolute, ainsi éviter d'avoir une différence négative
$retour = array();
$tmp = $diff;
$second = $tmp % 60;
$tmp = floor( ($tmp - $second) /60 );
$minute = $tmp % 60;
$tmp = floor( ($tmp - $minute)/60 );
$heure = $tmp % 24;
$tmp = floor( ($tmp - $heure) /24 );
$jour = $tmp;
return 'Depuis '.$jour.' jours '.$heure.' heures '.$minute.' minutes '.$second.' secondes';
}
function traitementTemps($time,$dateAjout){
if($time==null){
$now = time();
$date2 = strtotime($dateAjout);
return dateDiff($now, $date2);
}
else{
return duree($time);
}
}
?>
<section class="content">
<div class="row">
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="info-box">
<span class="info-box-icon bg-aqua"><i class="ion ion-android-arrow-down"></i></span>
<div class="info-box-content">
<span class="info-box-text"><?php echo $this->lang->line('Temps moyen de traitement entrant'); ?> </span>
<span class="info-box-number">
<?php
if($temp_moyen!=false){
if(duree($temp_moyen)==""){
echo "0s";
}else{
echo duree($temp_moyen);
}
}else{
echo $this->lang->line('Aucune demande traitée');
}
?>
</span>
</div>
</div>
</div>
<div class="col-md-4 col-sm-6 col-xs-12">
<div class="info-box">
<span class="info-box-icon bg-aqua"><i class="ion ion-android-time"></i></span>
<div class="info-box-content">
<?php
if($this->session->userdata('category') == "super"){
if(isset($nameOfcurentGeolocatedUser))
echo "<span class='info-box-number'>".$nameOfcurentGeolocatedUser."</span>";
}
?>
<span class="info-box-text"> <?php echo $this->lang->line('Période') ?> </span>
<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-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 : ''?>"
/>
</span>
<span> Format : <?php echo $this->session->userdata('site_lang') === 'french' ? 'Jour - Mois - Année ' : 'Year - Month - Day'?> </span>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?></h3>
</div>
<div class="box-body">
<?php
$result=$list;
if($result!=false){
$numrows=$result->num_rows();
$num = 0;
if ($numrows > 0) {
?>
<table id="listeMembres" class="table table-bordered table-striped table-modified">
<thead>
<?php
echo "
<tr class='label-primary'>
<th>".$this->lang->line('Téléphone utilisateur')."</th>
<th>".$this->lang->line('Catégorie')."</th>
<th>".$this->lang->line('Parrain')."</th>
<th>".$this->lang->line('Date de la demande')."</th>
<th>".$this->lang->line('Date de traitement')."</th>
<th>".$this->lang->line('Statut')."</th>
<th>".$this->lang->line('Délai de traitement')."</th>
</tr>";
?>
</thead>
<tbody>
<?php
// output data of each row
foreach($result->result() as $row) {
$num++;
$etat = $this->lang->line("Non traitée");
if($row->etat==1){
$etat = $this->lang->line("traitée");
}
$code = $row->code_membre;
if($row->code_membre==$this->session->userdata('member_code')){
$code = $this->lang->line('Vous');
}
echo "<tr>
<td> $row->phone </td>
<td >Super </td>
<td>$row->code_membre</td>
<td>$row->date_creation </td>
<td > $row->date_modified</td>
<td>$etat</td>
<td>".traitementTemps($row->temps,$row->date_creation)."</td>
</tr>";
}
?>
</tbody>
<?php
} else {
echo $this->lang->line('Aucune demande');
}
}else{
echo $this->lang->line('Aucune demande');
}
?>
</table>
</div>
</div>
</div>
<div class="col-md-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
</div>
<div class="box-body">
<?php
$result=$tab_fastDemande;
if($result!=false){
$numrows=$result->num_rows();
$num = 0;
if ($numrows > 0) {
?>
<table id="listeDemandesRapides" class="table table-bordered table-striped table-modified">
<thead>
<?php
echo "
<tr class='label-primary'>
<th>N°</th>
<th>".$this->lang->line('Téléphone utilisateur')."</th>
<th>".$this->lang->line('Parrain')."</th>
<th>".$this->lang->line('Date de la demande')."</th>
<th>".$this->lang->line('Date de traitement')."</th>
<th>".$this->lang->line('Délai de traitement')."</th>
</tr>";
?>
</thead>
<tbody>
<?php
// output data of each row
foreach($result->result() as $row) {
$num++;
$superviseur = $row->superviseur;
if($row->superviseur==$this->session->userdata('member_code')){
$superviseur = $this->lang->line('Vous');
}
echo "<tr>
<td>$num</td>
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>$row->dateA</td>
<td>$row->dateM</td>
<td>".duree($row->temps)."</td>
</tr>";
}
?>
</tbody>
<?php
} else {
echo $this->lang->line('Aucune demande');
}
}else{
echo $this->lang->line('Aucune demande');
}
?>
</table>
</div>
</div>
</div>
<div class="col-md-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
</div>
<div class="box-body">
<?php
$result=$tab_slowDemande;
if($result!=false){
$numrows=$result->num_rows();
$num = 0;
if ($numrows > 0) {
?>
<table id="listeDemandesTardives" class="table table-bordered table-striped table-modified">
<thead>
<?php
echo "
<tr class='label-primary'>
<th>N°</th>
<th>".$this->lang->line('Contact')."</th>
<th>".$this->lang->line('Parrain')."</th>
<th>".$this->lang->line('Date de la demande')."</th>
<th>".$this->lang->line('Date de traitement')."</th>
<th>".$this->lang->line('Délai de traitement')."</th>
</tr>";
?>
</thead>
<tbody>
<?php
// output data of each row
foreach($result->result() as $row) {
$num++;
$superviseur = $row->superviseur;
if($row->superviseur==$this->session->userdata('member_code')){
$superviseur = $this->lang->line('Vous');
}
if($type==$this->lang->line('Adhésion')){
echo "<tr>
<td>$num</td>
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>$row->dateA</td>
<td>$row->dateM</td>
<td>".duree($row->temps)."</td>
</tr>";}else{
echo "<tr>
<td>$num</td>
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>$row->montant</td>
<td>$row->dateA</td>
<td>$row->dateM</td>
<td>".duree($row->temps)."</td>
</tr>";
}
}
?>
</tbody>
<?php
} else {
echo $this->lang->line('Aucune demande');
}
}else{
echo $this->lang->line('Aucune demande');
}
?>
</table>
</div>
</div>
</div>
</div>
</section>
</div>
<!-- jQuery 3 -->
<script src="<?php echo base_url('bower_components/jquery/dist/jquery.min.js') ?>"></script>
<!-- Bootstrap 3.3.7 -->
<script src="<?php echo base_url('bower_components/bootstrap/dist/js/bootstrap.min.js') ?>"></script>
<!-- DataTables -->
<script src="<?php echo base_url('bower_components/datatables.net/js/jquery.dataTables.min.js') ?>"></script>
<script src="<?php echo base_url('bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js') ?>"></script>
<!-- SlimScroll -->
<script src="<?php echo base_url('bower_components/jquery-slimscroll/jquery.slimscroll.min.js') ?>"></script>
<!-- FastClick -->
<script src="<?php echo base_url('bower_components/fastclick/lib/fastclick.js') ?>"></script>
<!-- AdminLTE App -->
<script src="<?php echo base_url('dist/js/adminlte.min.js') ?>"></script>
<!-- AdminLTE for demo purposes -->
<script src="<?php echo base_url('dist/js/demo.js') ?>"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment-with-locales.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/plug-ins/1.10.19/sorting/datetime-moment.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/plug-ins/1.10.20/dataRender/datetime.js"></script>
<script>
$(function () {
const lang = $('#picker').data('lang');
const format = lang === 'french' ? 'fr' : 'en';
moment.updateLocale(moment.locale(format), { invalidDate: "" }); // Blank text when is invalid date
$('#listeMembres').DataTable({
"aaSorting": [[ 3, "desc" ]],
"columnDefs": [{
targets: [3,4],
render: $.fn.dataTable.render.moment('YYYY-MM-DD HH:mm:ss', 'D MMMM YYYY HH:mm:ss', format),
}]
});
$('#listeDemandesRapides').DataTable({
searching: false, paging: false, info: false,
"aaSorting": [[ 2, "desc" ]],
"columnDefs": [ {
targets: [2,3],
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
}]
});
$('#listeDemandesTardives').DataTable({
searching: false, paging: false, info: false,
"aaSorting": [[ 3, "desc" ]],
"columnDefs": [ {
targets: [2,3],
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
}]
});
});
</script>
<script type="text/javascript">
var startDate;
var endDate;
function GetURLParameter(sParam)
{
var sPageURL = window.location.search.substring(1);
var sURLVariables = sPageURL.split('&');
for (var i = 0; i < sURLVariables.length; i++)
{
var sParameterName = sURLVariables[i].split('=');
if (sParameterName[0] == sParam)
{
return decodeURIComponent(sParameterName[1]);
}
}
}
$(function() {
var start = moment().subtract(29, 'days');
var end = moment();
startDate = start;
endDate = end;
function cb(start, end) {
$('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
startDate = start;
endDate = end;
}
$('#reportrange').daterangepicker({
startDate: start,
endDate: end,
ranges: {
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}
}, cb);
cb(start, end);
});
$(function() {
const category = $('#picker').data('category');
const lang = $('#picker').data('lang');
$('input[name="daterange"]').daterangepicker({
opens: 'left',
autoUpdateInput: false,
locale: {
format: lang === 'french' ? 'DD-MM-YYYY' : 'YYYY-MM-DD',
cancelLabel: 'Clear'
}
}, function(start, end, label) {
const debut = start.format('YYYY-MM-DD');
const fin = end.format('YYYY-MM-DD');
if(category == 'super'){
window.location.replace("<?php echo base_url('index.php/Superviseur_dash/getDemandesAd')?>"+"?d="+debut+"&f="+fin);
}else if (category == 'hyper'){
window.location.replace("<?php echo base_url('index.php/Hyperviseur_dash/getDemandesAd')?>"+"?d="+debut+"&f="+fin);
}
});
$('input[name="daterange"]').on('cancel.daterangepicker', function(ev, picker) {
//do something, like clearing an input
$('#daterange').val('');
if(category == 'super'){
window.location.replace("<?php echo base_url('index.php/Superviseur_dash/getDemandesAd')?>");
}else if (category == 'hyper'){
window.location.replace("<?php echo base_url('index.php/Hyperviseur_dash/getDemandesAd')?>");
}
});
});
</script>
<script type='text/javascript'>
$(document).ready(function(){
$('#pays').change(function(){
var pays = $(this).val();
$.ajax({
url:'<?php echo base_url('index.php/Admin/getHypByPays')?>',
type: 'post',
data: {pays: pays},
dataType: 'json',
success: function(data){
var len = data.length;
if(len > 0){
var select = document.getElementById('hyper');
if(select===null){
var grpPays = document.getElementById('grp-pays');
$(grpPays).empty();
$(grpPays).append("<select class='form-control input-lg' name='hyper' required id='hyper'></select>");
select = document.getElementById('hyper');
}
$(select).empty();
for (var i in data) {
$(select).append('<option value=' + data[i].code_membre + '>' + data[i].lastname +'-' + data[i].network + ' ('+ data[i].code_membre +')</option>');
}
var code = data[0].code_membre;
$.ajax({
url:'<?php echo base_url('index.php/Admin/getVilleByHyp')?>',
type: 'post',
data: {code: code,pays:pays},
dataType: 'json',
success: function(list){
var len = list.length;
if(len > 0){
var select = document.getElementById('ville');
if(select===null){
var grpVille = document.getElementById('grp-ville');
$(grpVille).empty();
$(grpVille).append("<select class='form-control input-lg' name='ville' required id='ville'></select>");
select = document.getElementById('ville');
}
$(select).empty();
for (var i in list) {
$(select).append('<option value=' + list[i].town_id + '>' + list[i].town +'</option>');
}
}else{
var select = document.getElementById('ville');
$(select).empty();
}
}
});
}else{
var select = document.getElementById('hyper');
$(select).empty();
var select2 = document.getElementById('ville');
$(select2).empty();
}
}
});
});
$('#hyper').change(function(){
var code = $(this).val();
$.ajax({
url:'<?php echo base_url('index.php/Admin/getVilleByHyp')?>',
type: 'post',
data: {code: code},
dataType: 'json',
success: function(list){
var len = list.length;
if(len > 0){
var select = document.getElementById('ville');
$(select).empty();
for (var i in list) {
$(select).append('<option value=' + list[i].town_id + '>' + list[i].town +'</option>');
}
}else{
var select = document.getElementById('ville');
$(select).empty();
}
}
});
});
});
</script>

1290
application/views/demande_credit.php Normal file
View File

File diff suppressed because it is too large Load Diff

8
application/views/gestion_wallet.php
View File

@ -337,12 +337,14 @@ if ($transactions != false) {
<table id="example1" class="table table-bordered table-hover">
<thead>
<tr>
<th>Nom</th>
<?php
echo "<th>Nom</th>
<th>Solde Princ.</th>
<th>Solde Com.</th>
<th>Com. Banque</th>
<th>Dépots</th>
<th>Retraits</th>
<th>".$this->lang->line('DEPOT')."</th>
<th>".$this->lang->line('RETRAIT')."</th>";
?>
</tr>
</thead>
<tbody>

19
application/views/gestion_wallet_sup.php
View File

@ -197,18 +197,6 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
</div>
</div>
<div class="col-lg-4 col-xs-6">
<div class="small-box bg-yellow">
<div class="inner">
<h3><?php echo $fmt->format($totalCommissionBanque); ?><sup style="font-size: 20px">FCFA</sup></h3>
<p>Total commission de la banque</p>
</div>
<div class="icon">
<i class="ion ion-cash"></i>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="box box-success">
<div class="box-header with-border">
@ -244,7 +232,6 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
<th>Nom</th>
<th>Solde Princ.</th>
<th>Solde Com.</th>
<th>Com. Banque</th>
<th>Dépots</th>
<th>Retraits</th>
</tr>
@ -273,21 +260,17 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
<td>".$fmt->format($com)."</td>";
$nb_depots = 0;
$nb_retraits = 0;
$commission_banque = 0;
foreach($depots as $depot){
if($depot->agent_id == $row->agent_id) {
$nb_depots ++;
$commission_banque+= $depot->commission_banque;
}
}
foreach($retraits as $retrait){
if($retrait->agent_id == $row->agent_id) {
$nb_retraits ++;
$commission_banque+= $retrait->commission_banque;
}
}
echo "<td>".$fmt->format($commission_banque)."</td>
<td>".$nb_depots."</td>
echo "<td>".$nb_depots."</td>
<td>".$nb_retraits."</td>
</tr>";
}

35
application/views/historique_transactions.php
View File

@ -48,12 +48,13 @@
<div class="info-box-content">
<span class="info-box-text"><?php echo $this->lang->line('Période') ?> </span>
<span class="info-box-number">
<input
<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') ?>"
value="<?php echo ($startDate!=null & $endDate != null) ? $startDate. ' - '.$endDate : ''?>"/>
</span>
<span> Format : <?php echo $this->session->userdata('site_lang') === 'french' ? 'Jour - Mois - Année ' : 'Year - Month - Day'?> </span>
</div>
</div>
</div>
@ -67,7 +68,6 @@
</div>
<div class="box-body">
<?php
if($transactions){
$numrows = $transactions->num_rows();
$num = 0;
@ -80,11 +80,11 @@
<tr>
<th align='center'>ID</th>
<th align='center'>Type</th>
<th> Montant</th>
<th>Commission de la banque</th>
<th>Commission de l'hyperviseur</th>
<th>Commission du superviseur</th>
<th>Commission de l'agent</th>
<th><?php echo $this->lang->line('Montant') ?></th>
<th><?php echo $this->lang->line('Commission de la banque') ?></th>
<th><?php echo $this->lang->line('Commission de l\'hyperviseur') ?></th>
<th><?php echo $this->lang->line('Commission du superviseur') ?></th>
<th><?php echo $this->lang->line('Commission de l\'agent') ?></th>
<th align='center'>Date</th>
</tr>
</thead>
@ -94,7 +94,7 @@
foreach ($transactions->result() as $row) {
$num++;
$type = $row->type_transac == 'credit' ? 'DEPOT' : 'RETRAIT';
$type = $row->type_transac == 'credit' ? $this->lang->line('DEPOT') : $this->lang->line('RETRAIT');
echo "<tr>
<td align='center' >$row->id</td>
<td>".strtoupper($type)."</td>
@ -145,14 +145,23 @@
<!-- AdminLTE for demo purposes -->
<script src="<?php echo base_url('dist/js/demo.js') ?>"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment-with-locales.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/plug-ins/1.10.19/sorting/datetime-moment.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/plug-ins/1.10.20/dataRender/datetime.js"></script>
<script>
$(function () {
const lang = $('#picker').data('lang');
const format = lang === 'french' ? 'fr' : 'en';
moment.updateLocale(moment.locale(format), { invalidDate: "" }); // Blank text when is invalid date
$('#transactions').DataTable({
"aaSorting": [[ 0, "desc" ]]
"aaSorting": [[ 0, "desc" ]],
"columnDefs": [ {
targets: 7,
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
}]
});
});
</script>
@ -176,6 +185,12 @@
window.location = "<?php echo current_url()?>" + "?id=118&history=true" + "&d=" + debut + "&f=" + fin;
});
$('input[name="daterange"]').on('cancel.daterangepicker', function(ev, picker) {
//do something, like clearing an input
$('#daterange').val('');
window.location = "<?php echo current_url()?>" + "?id=118&history=true";
});
});
</script>

4
application/views/login.php
View File

@ -28,8 +28,8 @@
<div class="login-page">
<div class="img-container">
<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_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_french.png') ?>" class="img-circle img-responsive" onclick="javascript:window.location ='<?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 ='<?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>-->
</div>
<div class="text-center pull-right photo">