From d61422b016c0235afa3de90d26ff12fc8c272f76 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Fri, 13 Nov 2020 17:39:13 +0100 Subject: [PATCH] + Timezone of dates is now providing by user --- application/controllers/Gestion.php | 2 - application/controllers/Hyperviseur_dash.php | 2 - application/controllers/Superviseur_dash.php | 2 - application/controllers/Users.php | 2 - .../pagination/WalletIlinkTransaction.php | 11 +--- application/views/codeg.php | 13 +---- .../config_wallet_ilink_hyp/etat_soldes.php | 11 ---- application/views/demande_adhesion.php | 21 +++----- application/views/demande_credit.php | 54 +++++++++---------- application/views/historique_recharges.php | 14 +---- .../views/historique_remboursement.php | 13 +---- application/views/historique_transactions.php | 15 +----- .../views/historique_transactions_ilink.php | 9 ---- .../historique_transferts_commission.php | 11 +--- application/views/login.php | 15 ------ application/views/membreCodeAdmin.php | 15 +----- .../nano_credit/historique_nano_credit.php | 17 ++---- .../views/nano_credit/historique_savings.php | 17 ++---- 18 files changed, 47 insertions(+), 197 deletions(-) diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index 62c8f3c7..52642f12 100755 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -11,8 +11,6 @@ class Gestion extends CI_Controller parent::__construct(); $this->load->model('wallet_model'); $this->load->model('nano_credit_model'); - if($this->session->userdata('timezone')) - 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 5b171734..fcda618b 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -17,8 +17,6 @@ class Hyperviseur_dash extends CI_Controller parent::__construct(); $this->load->model('wallet_model'); $this->load->model('nano_credit_model'); - if($this->session->userdata('timezone')) - 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 98613e80..5f6af3db 100755 --- a/application/controllers/Superviseur_dash.php +++ b/application/controllers/Superviseur_dash.php @@ -15,8 +15,6 @@ class Superviseur_dash extends CI_Controller $this->load->model('nano_credit_model'); $this->load->model('Users_simple'); $this->load->model('User_model'); - if($this->session->userdata('timezone')) - date_default_timezone_set($this->session->userdata('timezone')); } public function index() diff --git a/application/controllers/Users.php b/application/controllers/Users.php index 50f00a9d..5db48b31 100755 --- a/application/controllers/Users.php +++ b/application/controllers/Users.php @@ -77,8 +77,6 @@ $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/controllers/pagination/WalletIlinkTransaction.php b/application/controllers/pagination/WalletIlinkTransaction.php index 6f87dfb9..e464d820 100755 --- a/application/controllers/pagination/WalletIlinkTransaction.php +++ b/application/controllers/pagination/WalletIlinkTransaction.php @@ -7,7 +7,6 @@ use Brick\Money\ExchangeRateProvider\BaseCurrencyProvider; use Brick\Money\ExchangeRateProvider\PDOProvider; use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration; use Brick\Money\Money; -use Carbon\Carbon; class WalletIlinkTransaction extends CI_Controller { @@ -46,14 +45,6 @@ class WalletIlinkTransaction extends CI_Controller } - 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; - } function getLists() { @@ -65,7 +56,7 @@ class WalletIlinkTransaction extends CI_Controller $i = $_POST['start']; foreach ($witData as $row) { $i++; - $created = $this->toLocateDate($row->date,$this->session->userdata('timezone')) ; //date('jS M Y', strtotime($row->date)); + $created = $row->date ; //date('jS M Y', strtotime($row->date)); // $status = ($row->status == 1)?'Active':'Inactive'; $operation = strtoupper($row->acteur) . ' - ' . ($this->session->userdata('site_lang') === 'french' ? $row->operation_fr : $row->operation_en); $numero_carte = join(" ", str_split($row->numero_carte, 4)); diff --git a/application/views/codeg.php b/application/views/codeg.php index b6f8a549..d103a8aa 100755 --- a/application/views/codeg.php +++ b/application/views/codeg.php @@ -2,17 +2,6 @@
- setTimezone($timezone); - return $carbon->toDateTimeString(); - } - return $date; - } - ?> $num $row->code_membre $row->category - ".toLocateDate($row->date_creation,$this->session->userdata('timezone'))." + ".$row->date_creation." $statut diff --git a/application/views/config_wallet_ilink_hyp/etat_soldes.php b/application/views/config_wallet_ilink_hyp/etat_soldes.php index fda0565e..3aa72339 100755 --- a/application/views/config_wallet_ilink_hyp/etat_soldes.php +++ b/application/views/config_wallet_ilink_hyp/etat_soldes.php @@ -13,17 +13,6 @@ use Brick\Money\ExchangeRateProvider\PDOProvider; use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration; use Brick\Money\Money; - use Carbon\Carbon; - - 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; - } ?> diff --git a/application/views/demande_adhesion.php b/application/views/demande_adhesion.php index f450c470..d27829c8 100755 --- a/application/views/demande_adhesion.php +++ b/application/views/demande_adhesion.php @@ -5,7 +5,6 @@
86400, "h" => 3600, @@ -59,14 +58,6 @@ 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; - } ?>
@@ -171,8 +162,8 @@ $row->phone Super $row->code_membre - ".toLocateDate($row->date_creation,$this->session->userdata('timezone'))." - ".toLocateDate($row->date_modified,$this->session->userdata('timezone'))." + ".$row->date_creation." + ".$row->date_modified." $etat ".traitementTemps($row->temps,$row->date_creation)." @@ -246,8 +237,8 @@ $num $row->emetteur $superviseur - ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." - ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." + ".$row->dateA." + ".$row->dateM." ".duree($row->temps)." "; @@ -319,8 +310,8 @@ $num $row->emetteur $superviseur - ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." - ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." + ".$row->dateA." + ".$row->dateM." ".duree($row->temps)." "; diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php index f07c4602..eb54978e 100755 --- a/application/views/demande_credit.php +++ b/application/views/demande_credit.php @@ -7,7 +7,7 @@ setTimezone($timezone); - return $carbon->toDateTimeString(); - } - return $date; - } +// 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; +// } ?> @@ -246,8 +246,8 @@ $row->phone $origin $row->montant - " . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . " + " . $row->dateAjout . " + " . $row->dateModif . " $etat " . traitementTemps($row->temps, $row->dateAjout) . " @@ -335,8 +335,8 @@ echo " $row->montant - " . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . " + " . $row->dateAjout . " + " . $row->dateModif . " $etat " . traitementTemps($row->temps, $row->dateAjout) . " @@ -421,8 +421,8 @@ $row->agent $superviseur $row->montant - " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . $row->dateA . " + " . $row->dateM . " " . duree($row->temps) . " "; @@ -499,8 +499,8 @@ $num $row->montant - " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . $row->dateA . " + " . $row->dateM . " " . duree($row->temps) . " "; @@ -584,8 +584,8 @@ $row->agent $superviseur $row->montant - " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . $row->dateA . " + " . $row->dateM . " " . duree($row->temps) . " "; @@ -662,8 +662,8 @@ $num $row->montant - " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . $row->dateA . " + " . $row->dateM . " " . duree($row->temps) . " "; @@ -759,8 +759,8 @@ $origin $destination $row->montant - " . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . " + " . $row->dateAjout . " + " . $row->dateModif . " $etat " . traitementTemps($row->temps, $row->dateAjout) . " "; @@ -840,8 +840,8 @@ $row->emetteur $superviseur $row->montant - " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . $row->dateA . " + " . $row->dateM . " " . duree($row->temps) . " "; @@ -920,8 +920,8 @@ $row->emetteur $superviseur $row->montant - " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " - " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . $row->dateA . " + " . $row->dateM . " " . duree($row->temps) . " "; diff --git a/application/views/historique_recharges.php b/application/views/historique_recharges.php index c56e1186..437e6e8e 100755 --- a/application/views/historique_recharges.php +++ b/application/views/historique_recharges.php @@ -4,19 +4,7 @@
- setTimezone($timezone); - return $carbon->toDateTimeString(); - } - return $date; - } - ?>
@@ -104,7 +92,7 @@ echo " $num ".$fmt->format($row->montant)." - ".toLocateDate($row->date,$this->session->userdata('timezone'))." + ".$row->date." "; } ?> diff --git a/application/views/historique_remboursement.php b/application/views/historique_remboursement.php index eb9b81c3..f9788a68 100755 --- a/application/views/historique_remboursement.php +++ b/application/views/historique_remboursement.php @@ -12,7 +12,6 @@ use Brick\Money\ExchangeRateProvider\PDOProvider; use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration; use Brick\Money\Money; - use Carbon\Carbon; // set to whatever your rates are relative to $baseCurrency = 'USD'; @@ -37,16 +36,6 @@ $converter = new CurrencyConverter($provider); $context = new AutoContext(); - 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; - } - ?>
@@ -144,7 +133,7 @@ " . Money::of(round($row->montant_restant, 2), $row->currency_code, $context)->formatTo('fr_FR') . " " . $row->network . " " . $row->country . " - " . toLocateDate($row->date, $this->session->userdata('timezone')) . " + " . $row->date . " "; } ?> diff --git a/application/views/historique_transactions.php b/application/views/historique_transactions.php index f39760b6..539bc631 100755 --- a/application/views/historique_transactions.php +++ b/application/views/historique_transactions.php @@ -5,19 +5,6 @@
-setTimezone($timezone); - return $carbon->toDateTimeString(); - } - return $date; - } -?>
@@ -140,7 +127,7 @@ function toLocateDate($date , $timezone){ ".$fmt->format( $row->commission_sup)." ".$fmt->format( $row->commission_ag)." ".$row->agent." - ".toLocateDate($row->date_created,$this->session->userdata('timezone')).""; + ".$row->date_created.""; ?> session->userdata('category') != 'super') { ?> diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php index 88ecbe55..602b0873 100755 --- a/application/views/historique_transactions_ilink.php +++ b/application/views/historique_transactions_ilink.php @@ -12,16 +12,7 @@ use Brick\Money\CurrencyConverter; use Brick\Money\ExchangeRateProvider\BaseCurrencyProvider; use Brick\Money\ExchangeRateProvider\PDOProvider; use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration; -use Carbon\Carbon; -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; - } ?>
diff --git a/application/views/historique_transferts_commission.php b/application/views/historique_transferts_commission.php index e926ec4a..5817b9bf 100755 --- a/application/views/historique_transferts_commission.php +++ b/application/views/historique_transferts_commission.php @@ -13,16 +13,7 @@ use Brick\Money\ExchangeRateProvider\BaseCurrencyProvider; use Brick\Money\ExchangeRateProvider\PDOProvider; use Brick\Money\ExchangeRateProvider\PDOProviderConfiguration; use Brick\Money\Money; -use Carbon\Carbon; -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; - } ?>
@@ -141,7 +132,7 @@ function toLocateDate($date , $timezone){ ".Money::of(round($row->balance_princ_final,2), $row->currency_code,$context)->formatTo('fr_FR')." ".Money::of(round($row->balance_com_final,2), $row->currency_code,$context)->formatTo('fr_FR')." ".$row->agent." - ".toLocateDate($row->date,$this->session->userdata('timezone')).""; + ".$row->date.""; ?> diff --git a/application/views/login.php b/application/views/login.php index 4c218683..61357549 100755 --- a/application/views/login.php +++ b/application/views/login.php @@ -164,22 +164,7 @@ - -