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

+ Timezone of dates is now providing by user

This commit is contained in:
Djery-Tom 2020-11-13 17:39:13 +01:00
parent 0968cb101b
commit d61422b016
18 changed files with 47 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Gestion.php
View File

@ -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()

2
application/controllers/Hyperviseur_dash.php
View File

@ -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()

2
application/controllers/Superviseur_dash.php
View File

@ -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()

2
application/controllers/Users.php
View File

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

11
application/controllers/pagination/WalletIlinkTransaction.php
View File

@ -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));

13
application/views/codeg.php
View File

@ -2,17 +2,6 @@
<link rel="stylesheet" href="bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
<div class="content-wrapper">
<div class="content-header">
<?php
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;
}
?>
<?php
if($alert=="ok") {
if(!$success=="ok"){
@ -107,7 +96,7 @@
<td>$num</td>
<td> $row->code_membre </td>
<td >$row->category</td>
<td>".toLocateDate($row->date_creation,$this->session->userdata('timezone'))."</td>
<td>".$row->date_creation."</td>
<td>$statut</td>
<td>
<a href='#myModal-2".$num."' role='button' data-toggle='modal'><i class='fa fa-remove'></i></a>

11
application/views/config_wallet_ilink_hyp/etat_soldes.php
View File

@ -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;
}
?>
<!-- Content Header (Page header) -->

21
application/views/demande_adhesion.php
View File

@ -5,7 +5,6 @@
<div class="content-wrapper">
<?php
use Carbon\Carbon;
function duree($time) {
$tabTemps = array("jours" => 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;
}
?>
<section class="content">
@ -171,8 +162,8 @@
<td> $row->phone </td>
<td >Super </td>
<td>$row->code_membre</td>
<td>".toLocateDate($row->date_creation,$this->session->userdata('timezone'))."</td>
<td > ".toLocateDate($row->date_modified,$this->session->userdata('timezone'))."</td>
<td>".$row->date_creation."</td>
<td > ".$row->date_modified."</td>
<td>$etat</td>
<td>".traitementTemps($row->temps,$row->date_creation)."</td>
@ -246,8 +237,8 @@
<td>$num</td>
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>".toLocateDate($row->dateA,$this->session->userdata('timezone'))."</td>
<td > ".toLocateDate($row->dateM,$this->session->userdata('timezone'))."</td>
<td>".$row->dateA."</td>
<td > ".$row->dateM."</td>
<td>".duree($row->temps)."</td>
</tr>";
@ -319,8 +310,8 @@
<td>$num</td>
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>".toLocateDate($row->dateA,$this->session->userdata('timezone'))."</td>
<td> ".toLocateDate($row->dateM,$this->session->userdata('timezone'))."</td>
<td>".$row->dateA."</td>
<td> ".$row->dateM."</td>
<td>".duree($row->temps)."</td>
</tr>";

54
application/views/demande_credit.php
View File

@ -7,7 +7,7 @@
<?php
use Carbon\Carbon;
// use Carbon\Carbon;
function duree($time)
{
@ -65,14 +65,14 @@
}
}
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 toLocateDate($date , $timezone){
// if($date){
// $carbon = Carbon::createFromFormat('Y-m-d H:i:s', $date, 'UTC');
// $carbon->setTimezone($timezone);
// return $carbon->toDateTimeString();
// }
// return $date;
// }
?>
<!-- Content Header (Page header) -->
@ -246,8 +246,8 @@
<td> $row->phone</td>
<td >$origin </td>
<td > $row->montant</td>
<td>" . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . "</td>
<td > " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateAjout . "</td>
<td > " . $row->dateModif . "</td>
<td>$etat</td>
<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
@ -335,8 +335,8 @@
echo "<tr>
<td > $row->montant</td>
<td>" . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . "</td>
<td > " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateAjout . "</td>
<td > " . $row->dateModif . "</td>
<td>$etat</td>
<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
@ -421,8 +421,8 @@
<td>$row->agent</td>
<td>$superviseur</td>
<td>$row->montant</td>
<td>" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateA . "</td>
<td> " . $row->dateM . "</td>
<td>" . duree($row->temps) . "</td>
</tr>";
@ -499,8 +499,8 @@
<td>$num</td>
<td>$row->montant</td>
<td>" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateA . "</td>
<td> " . $row->dateM . "</td>
<td>" . duree($row->temps) . "</td>
</tr>";
@ -584,8 +584,8 @@
<td>$row->agent</td>
<td>$superviseur</td>
<td>$row->montant</td>
<td>" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateA . "</td>
<td> " . $row->dateM . "</td>
<td>" . duree($row->temps) . "</td>
</tr>";
@ -662,8 +662,8 @@
<td>$num</td>
<td>$row->montant</td>
<td>" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateA . "</td>
<td> " . $row->dateM . "</td>
<td>" . duree($row->temps) . "</td>
</tr>";
@ -759,8 +759,8 @@
<td >$origin </td>
<td>$destination</td>
<td > $row->montant</td>
<td>" . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateAjout . "</td>
<td> " . $row->dateModif . "</td>
<td>$etat</td>
<td>" . traitementTemps($row->temps, $row->dateAjout) . "</td>
</tr>";
@ -840,8 +840,8 @@
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>$row->montant</td>
<td>" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateA . "</td>
<td> " . $row->dateM . "</td>
<td>" . duree($row->temps) . "</td>
</tr>";
@ -920,8 +920,8 @@
<td>$row->emetteur</td>
<td>$superviseur</td>
<td>$row->montant</td>
<td>" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . "</td>
<td> " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "</td>
<td>" . $row->dateA . "</td>
<td> " . $row->dateM . "</td>
<td>" . duree($row->temps) . "</td>
</tr>";

14
application/views/historique_recharges.php
View File

@ -4,19 +4,7 @@
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css"/>
<div class="content-wrapper">
<?php
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;
}
?>
<!-- Content Header (Page header) -->
<section class="content-header">
@ -104,7 +92,7 @@
echo "<tr>
<td align='center' >$num</td>
<td>".$fmt->format($row->montant)."</td>
<td>".toLocateDate($row->date,$this->session->userdata('timezone'))."</td>
<td>".$row->date."</td>
</tr>";
}
?>

13
application/views/historique_remboursement.php
View File

@ -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;
}
?>
<!-- Content Header (Page header) -->
<section class="content-header">
@ -144,7 +133,7 @@
<td>" . Money::of(round($row->montant_restant, 2), $row->currency_code, $context)->formatTo('fr_FR') . "</td>
<td>" . $row->network . "</td>
<td>" . $row->country . "</td>
<td>" . toLocateDate($row->date, $this->session->userdata('timezone')) . "</td>
<td>" . $row->date . "</td>
</tr>";
}
?>

15
application/views/historique_transactions.php
View File

@ -5,19 +5,6 @@
<link rel="stylesheet" href="<?php echo base_url('bower_components/toastr/toastr.css') ?>">
<div class="content-wrapper">
<?php
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;
}
?>
<!-- Content Header (Page header) -->
<section class="content-header">
@ -140,7 +127,7 @@ function toLocateDate($date , $timezone){
<td>".$fmt->format( $row->commission_sup)."</td>
<td>".$fmt->format( $row->commission_ag)."</td>
<td>".$row->agent."</td>
<td>".toLocateDate($row->date_created,$this->session->userdata('timezone'))."</td>";
<td>".$row->date_created."</td>";
?>
<?php if ($this->session->userdata('category') != 'super') { ?>
<td>

9
application/views/historique_transactions_ilink.php
View File

@ -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;
}
?>
<!-- Content Header (Page header) -->
<section class="content-header">

11
application/views/historique_transferts_commission.php
View File

@ -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;
}
?>
<!-- Content Header (Page header) -->
<section class="content-header">
@ -141,7 +132,7 @@ function toLocateDate($date , $timezone){
<td>".Money::of(round($row->balance_princ_final,2), $row->currency_code,$context)->formatTo('fr_FR')."</td>
<td>".Money::of(round($row->balance_com_final,2), $row->currency_code,$context)->formatTo('fr_FR')."</td>
<td>".$row->agent."</td>
<td>".toLocateDate($row->date,$this->session->userdata('timezone'))."</td>";
<td>".$row->date."</td>";
?>
</tr>

15
application/views/login.php
View File

@ -164,22 +164,7 @@
<script src="<?php echo base_url('bower_components/bootstrap/dist/js/bootstrap.min.js') ?>"></script>
<!-- iCheck -->
<script src="<?php echo base_url('plugins/iCheck/icheck.min.js') ?>"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.7/jstz.min.js"></script>
<script>
$(document).ready(function(){
var tz = jstz.determine(); // Determines the time zone of the browser client
var timezone = tz.name(); //For e.g.:"Asia/Kolkata" for the Indian Time.
// Insert client timezone on login
$("#loginForm").submit( function(eventObj) {
$("<input />").attr("type", "hidden")
.attr("name", "timezone")
.attr("value", timezone)
.appendTo("#loginForm");
return true;
});
});
</script>
<script>
$(function () {
$('input').iCheck({

15
application/views/membreCodeAdmin.php
View File

@ -2,17 +2,6 @@
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<?php
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;
}
?>
<?php
$site_url = base_url();
@ -98,7 +87,7 @@
<td >$row->code_membre </td>
<td>$row->network</td>
<td>$etat</td>
<td >".toLocateDate($row->date_creation,$this->session->userdata('timezone'))."</td>";
<td >".$row->date_creation."</td>";
if($row->etat==0){
echo "
<td>
@ -198,7 +187,7 @@
<td> $row->code_membre</td>
<td>$row->category </td>
<td>$etat</td>
<td >".toLocateDate($row->date_creation,$this->session->userdata('timezone'))."</td>
<td >".$row->date_creation."</td>
<td>$row->code_parrain</td>
<td>";
if($row->etat==0){

17
application/views/nano_credit/historique_nano_credit.php
View File

@ -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;
}
?>
<!-- Content Header (Page header) -->
@ -169,9 +158,9 @@
<td>" . $row->agent . "</td>
<td>" . $emetteur . "</td>
<td>" . $retrait . "</td>
<td>" . toLocateDate($row->date_validation, $this->session->userdata('timezone')) . "</td>
<td>" . toLocateDate($row->date_remboursement, $this->session->userdata('timezone')) . "</td>
<td>" . toLocateDate($row->date_creation, $this->session->userdata('timezone')) . "</td>";
<td>" . $row->date_validation . "</td>
<td>" . $row->date_remboursement . "</td>
<td>" . $row->date_creation . "</td>";
?>
</tr>

17
application/views/nano_credit/historique_savings.php
View File

@ -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;
}
?>
<!-- Content Header (Page header) -->
@ -157,9 +146,9 @@
<td>" . Money::of(round($row->interet, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>
<td>" . Money::of(round($row->taxe, 2), $currency_code, $context)->formatTo('fr_FR') . "</td>
<td>" . $emetteur. "</td>
<td>" . toLocateDate($row->date_creation, $this->session->userdata('timezone')) . "</td>
<td>" . toLocateDate($row->date_cassation, $this->session->userdata('timezone')) . "</td>
<td>" . toLocateDate($row->date_fin, $this->session->userdata('timezone')) . "</td>";
<td>" . $row->date_creation . "</td>
<td>" . $row->date_cassation . "</td>
<td>" . $row->date_fin . "</td>";
?>
</tr>