From 2ad9e3d20dedd21610a5a72dc97be58619377f66 Mon Sep 17 00:00:00 2001 From: DJERY-TOM Date: Thu, 7 May 2020 00:36:01 +0100 Subject: [PATCH] + Add detect timezone for client browser --- application/controllers/Gestion.php | 1 + application/controllers/Hyperviseur_dash.php | 1 + application/controllers/Superviseur_dash.php | 1 + application/controllers/Users.php | 2 + application/views/codeg.php | 545 ++++++------ application/views/demande_adhesion.php | 46 +- application/views/demande_credit.php | 155 +--- application/views/historique_recharges.php | 14 +- application/views/historique_transactions.php | 14 +- application/views/login.php | 18 +- application/views/membreCodeAdmin.php | 810 +++++++++--------- composer.json | 3 +- 12 files changed, 795 insertions(+), 815 deletions(-) diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index d03393bb..3a1da68e 100644 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -9,6 +9,7 @@ class Gestion extends CI_Controller { parent::_contruct(); $this->load->model('user_model'); + date_default_timezone_set ($this->session->userdata('timezone')); } public function index() diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 904718aa..b12bfd26 100644 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -13,6 +13,7 @@ class Hyperviseur_dash extends CI_Controller { parent::_contruct(); $this->load->model('user_model'); + date_default_timezone_set ($this->session->userdata('timezone')); } public function index() diff --git a/application/controllers/Superviseur_dash.php b/application/controllers/Superviseur_dash.php index 58be8fef..be48171a 100644 --- a/application/controllers/Superviseur_dash.php +++ b/application/controllers/Superviseur_dash.php @@ -8,6 +8,7 @@ class Superviseur_dash extends CI_Controller parent::__construct(); $this->load->model('Users_simple'); $this->load->model('User_model'); + date_default_timezone_set ($this->session->userdata('timezone')); } public function index() diff --git a/application/controllers/Users.php b/application/controllers/Users.php index 5c931543..774a02cc 100644 --- a/application/controllers/Users.php +++ b/application/controllers/Users.php @@ -77,6 +77,8 @@ $data = $this->user_model->login_user($user_login['user_email'], $user_login['user_password'], $user_login['user_role']); if ($data) { + $this->session->set_userdata('timezone' ,$this->input->post('timezone') ); + date_default_timezone_set ($this->session->userdata('timezone')); $hyper = "hyper"; $super = "super"; diff --git a/application/views/codeg.php b/application/views/codeg.php index d84f9a03..f2b4f458 100644 --- a/application/views/codeg.php +++ b/application/views/codeg.php @@ -1,267 +1,278 @@ - - -
-
- -
- -

Error!

- -
- - -
- -

Success!

- -
- - -

lang->line('Codes générés'); ?>

-
- -
-
-
-

lang->line('Générateur de codes'); ?>

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

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

-
-
- - num_rows(); - $num=0; - - if ($numrows > 0) { - - - ?> - - - - - - - - - - - - - - result() as $row) { - $num ++; - $statut = $this->lang->line('Non attribué'); - if($row->etat==1){ - $statut = $this->lang->line('Attribué'); - } - - - - echo " - - - - - - - - - "; - - } - - ?> - - db->close(); - - ?> - -
N°lang->line('Code'); ?>lang->line('Catégorie'); ?>lang->line('Créer le'); ?>lang->line('Statut'); ?>lang->line('Supprimer'); ?>
$num $row->code_membre $row->category$row->date_creation$statut - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - + + +
+
+ setTimezone($timezone); + return $carbon->toDateTimeString(); + } + return $date; + } + ?> + +
+ +

Error!

+ +
+ + +
+ +

Success!

+ +
+ + +

lang->line('Codes générés'); ?>

+
+ +
+
+
+

lang->line('Générateur de codes'); ?>

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

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

+
+
+ + num_rows(); + $num=0; + + if ($numrows > 0) { + + + ?> + + + + + + + + + + + + + + result() as $row) { + $num ++; + $statut = $this->lang->line('Non attribué'); + if($row->etat==1){ + $statut = $this->lang->line('Attribué'); + } + + + + echo " + + + + + + + + + "; + + } + + ?> + + db->close(); + + ?> + +
N°lang->line('Code'); ?>lang->line('Catégorie'); ?>lang->line('Créer le'); ?>lang->line('Statut'); ?>lang->line('Supprimer'); ?>
$num $row->code_membre $row->category".toLocateDate($row->date_creation,$this->session->userdata('timezone'))."$statut + + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + diff --git a/application/views/demande_adhesion.php b/application/views/demande_adhesion.php index df1f410d..76458f1c 100644 --- a/application/views/demande_adhesion.php +++ b/application/views/demande_adhesion.php @@ -5,6 +5,7 @@
86400, "h" => 3600, @@ -58,6 +59,14 @@ return duree($time); } } + function toLocateDate($date , $timezone){ + if($date){ + $carbon = Carbon::createFromFormat('Y-m-d H:i:s', $date, 'UTC'); + $carbon->setTimezone($timezone); + return $carbon->toDateTimeString(); + } + return $date; + } ?>
@@ -88,12 +97,12 @@
- session->userdata('category') == "super"){ - if(isset($nameOfcurentGeolocatedUser)) - echo "".$nameOfcurentGeolocatedUser.""; - } - ?> +session->userdata('category') == "super"){ +// if(isset($nameOfcurentGeolocatedUser)) +// echo "".$nameOfcurentGeolocatedUser.""; +// } +// ?> lang->line('Période') ?> $row->phone Super $row->code_membre - $row->date_creation - $row->date_modified + ".toLocateDate($row->date_creation,$this->session->userdata('timezone'))." + ".toLocateDate($row->date_modified,$this->session->userdata('timezone'))." $etat ".traitementTemps($row->temps,$row->date_creation)." @@ -237,8 +246,8 @@ $num $row->emetteur $superviseur - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." ".duree($row->temps)." "; @@ -305,29 +314,16 @@ if($row->superviseur==$this->session->userdata('member_code')){ $superviseur = $this->lang->line('Vous'); } - if($type==$this->lang->line('Adhésion')){ echo " $num $row->emetteur $superviseur - $row->dateA - $row->dateM - ".duree($row->temps)." - - ";}else{ - echo " - - $num - $row->emetteur - $superviseur - $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." ".duree($row->temps)." "; - } } ?> diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php index d8068802..86102d37 100644 --- a/application/views/demande_credit.php +++ b/application/views/demande_credit.php @@ -5,6 +5,7 @@
86400, @@ -61,6 +62,15 @@ } } + function toLocateDate($date , $timezone){ + if($date){ + $carbon = Carbon::createFromFormat('Y-m-d H:i:s', $date, 'UTC'); + $carbon->setTimezone($timezone); + return $carbon->toDateTimeString(); + } + return $date; + } + ?>
@@ -216,26 +226,6 @@ // output data of each row foreach ($result->result() as $row) { $num++; - if ($type == $this->lang->line('Adhésion')) { - $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 " - - $row->phone - $code - $row->dateAjout - $row->dateModif - $etat - " . traitementTemps($row->temps, $row->dateAjout) . " - - "; - } else { $etat = $this->lang->line("Non traitée"); if ($row->statut == 1) { $etat = $this->lang->line("Acceptée"); @@ -251,17 +241,16 @@ $destination = $this->lang->line('Vous'); } echo " - $row->phone $origin $row->montant - $row->dateAjout - $row->dateModif + ".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))." $etat " . traitementTemps($row->temps, $row->dateAjout) . " "; - } + } ?> @@ -325,27 +314,7 @@ // output data of each row foreach ($result->result() as $row) { $num++; - if ($type == $this->lang->line('Adhésion')) { - $etat = $this->lang->line("Non traitée"); - if ($row->etat == 1) { - $etat = $this->lang->line("traitée"); - } - $code = $row->code; - if ($row->code == $this->session->userdata('member_code')) { - $code = $this->lang->line('Vous'); - } - echo " - - $row->phone - $row->categorie - $code - $row->dateAjout - $row->dateModif - $etat - " . traitementTemps($row->temps, $row->dateAjout) . " - - "; - } else { + $etat = $this->lang->line("Non traitée"); if ($row->statut == 1) { $etat = $this->lang->line("Acceptée"); @@ -363,13 +332,13 @@ echo " $row->montant - $row->dateAjout - $row->dateModif + ".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))." $etat " . traitementTemps($row->temps, $row->dateAjout) . " "; - } + } ?> @@ -439,35 +408,19 @@ if ($row->superviseur == $this->session->userdata('member_code')) { $superviseur = $this->lang->line('Vous'); } - if ($type == $this->lang->line('Adhésion')) { - $etat = $this->lang->line("Non traitée"); - if ($row->etat == 1) { - $etat = $this->lang->line("traitée"); - } echo " - $num - $row->emetteur - $superviseur - $row->dateA - $row->dateM - " . duree($row->temps) . " - - "; - } else { - echo " - $num $row->emetteur $superviseur $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." " . duree($row->temps) . " "; - } + } ?> @@ -535,31 +488,19 @@ if ($row->superviseur == $this->session->userdata('member_code')) { $superviseur = $this->lang->line('Vous'); } - if ($type == $this->lang->line('Adhésion')) { echo " - $num - $row->emetteur - $superviseur - $row->dateA - $row->dateM - " . duree($row->temps) . " - - "; - } else { - echo " - $num $row->emetteur $superviseur $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." " . duree($row->temps) . " "; - } + } ?> @@ -629,30 +570,19 @@ if ($row->superviseur == $this->session->userdata('member_code')) { $superviseur = $this->lang->line('Vous'); } - if ($type == $this->lang->line('Adhésion')) { - echo " - - $num - $row->emetteur - $superviseur - $row->dateA - $row->dateM - " . duree($row->temps) . " - - "; - } else { + echo " $num $row->emetteur $superviseur $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." " . duree($row->temps) . " "; - } + } ?> @@ -732,30 +662,19 @@ if ($row->superviseur == $this->session->userdata('member_code')) { $superviseur = $this->lang->line('Vous'); } - if ($type == $this->lang->line('Adhésion')) { - echo " - - $num - $row->emetteur - $superviseur - $row->dateA - $row->dateM - " . duree($row->temps) . " - - "; - } else { + echo " $num $row->emetteur $superviseur $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." " . duree($row->temps) . " "; - } + } ?> @@ -843,8 +762,8 @@ $origin $destination $row->montant - $row->dateAjout - $row->dateModif + ".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))." $etat " . traitementTemps($row->temps, $row->dateAjout) . " @@ -923,8 +842,8 @@ $row->emetteur $superviseur $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." " . duree($row->temps) . " "; @@ -1001,8 +920,8 @@ $row->emetteur $superviseur $row->montant - $row->dateA - $row->dateM + ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." + ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." " . duree($row->temps) . " "; diff --git a/application/views/historique_recharges.php b/application/views/historique_recharges.php index 4b7f373e..86e76169 100755 --- a/application/views/historique_recharges.php +++ b/application/views/historique_recharges.php @@ -4,7 +4,17 @@
- + setTimezone($timezone); + return $carbon->toDateTimeString(); + } + return $date; + } + ?>
@@ -92,7 +102,7 @@ echo " $num ".$fmt->format($row->montant)." - $row->date + ".toLocateDate($row->date,$this->session->userdata('timezone'))." "; } ?> diff --git a/application/views/historique_transactions.php b/application/views/historique_transactions.php index 67228c6f..1a6bedb6 100755 --- a/application/views/historique_transactions.php +++ b/application/views/historique_transactions.php @@ -4,7 +4,17 @@
- +setTimezone($timezone); + return $carbon->toDateTimeString(); + } + return $date; + } +?>
@@ -103,7 +113,7 @@ ".$fmt->format( $row->commission_hyp)." ".$fmt->format( $row->commission_sup)." ".$fmt->format( $row->commission_ag)." - $row->date_created + ".toLocateDate($row->date_created,$this->session->userdata('timezone'))." "; } diff --git a/application/views/login.php b/application/views/login.php index 73c51e55..4c218683 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -60,7 +60,7 @@ } ?> -
+
@@ -164,6 +164,22 @@ + + + - - - - - - - - - - - - - - - - \ No newline at end of file + +
+ +
+ setTimezone($timezone); + return $carbon->toDateTimeString(); + } + return $date; + } + ?> + + +
+ +

Error!

+ +
+ + +
+ +

Success!

+ +
+ + +

+ lang->line("Demandes d'adhésions et codes valides"); ?> +

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

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

+
+ +
+ num_rows(); + $num = 3000; + if ($numrows > 0) { + + + + ?> + + + + + + + + + + + + + + + result() as $row) { + $etat = $this->lang->line("Non traitée"); + if($row->etat==1){ + $etat = $this->lang->line("traitée"); + } + $num ++; + //$member_code = randomString1(10); + echo " + + + + + "; + if($row->etat==0){ + echo " + "; + } + echo ""; + + } + + ?> + +
lang->line("Téléphone"); ?>lang->line("Parrain"); ?>lang->line("Reseau"); ?>lang->line("Statut"); ?>lang->line("Date de la demande"); ?>lang->line("Supprimer"); ?>
$row->phone$row->code_membre $row->network$etat".toLocateDate($row->date_creation,$this->session->userdata('timezone'))." + + +
+ + lang->line('Aucune demande'); + } + } + ?> + + + + +
+ +
+ +
+
+ + +
+
+

lang->line("Codes valides"); ?>

+
+ +
+ num_rows(); + $num = 0; + + if ($numrows > 0) { + ?> + + + + + + + + + + + + + + + result() as $row) { + $etat = $this->lang->line("Non assigné"); + if($row->etat==1){ + $etat = $this->lang->line("assigné"); + } + + $num ++; + echo " + + + + + + "; + + } + + echo " "; + } + + ?> + + +
lang->line("Code"); ?>lang->line("Catégorie"); ?>lang->line("Statut"); ?>lang->line("Créer le"); ?>lang->line("Parrain"); ?>lang->line("Supprimer"); ?>
$row->code_membre$row->category $etat".toLocateDate($row->date_creation,$this->session->userdata('timezone'))."$row->code_parrain"; + if($row->etat==0){ + echo " + + +
+ + +
+
+
+ + lang->line("Aucun membre validé"); + } + } + + $this->db->close(); + + ?> + + + + + +
+ +
+ +
+ +
+ +
+ + + +
+ + + + + + + + + + + + + + + + + + + diff --git a/composer.json b/composer.json index 2bb6c754..3085f106 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ }, "require": { "php": ">=5.4", - "spatie/async": "^1.4" + "spatie/async": "^1.4", + "nesbot/carbon": "^2.33" }, "suggest": { "paragonie/random_compat": "Provides better randomness in PHP 5.x"