@@ -714,105 +657,12 @@ $context = new \Brick\Money\Context\AutoContext();
Pie = JSON.parse(Pie);
}
-
-
-
diff --git a/application/views/gestion_wallet_sup_ilink.php b/application/views/gestion_wallet_sup_ilink.php
new file mode 100755
index 00000000..d85f692b
--- /dev/null
+++ b/application/views/gestion_wallet_sup_ilink.php
@@ -0,0 +1,391 @@
+
+
+
+
+
+
+
+date));
+ $year = date("Y",strtotime($trans->date));
+ return $month == $months[$i-1] && $year == $years[$i-1] && $trans->type_transaction == 'retrait' ;
+ });
+ $retraits_data[] = sizeof($retraits_query_mounth);
+ }
+
+ $startDate = (new DateTime('01-'.$months[11].'-'.$years[11]))-> format('Y-m-d H:i:s');
+ $endDate = date_create_from_format ('m/Y',$months[0].'/'.$years[0])-> format('Y-m-d H:i:s');
+
+ $retraits = array_filter($transactions, function ($trans) use ($i, $endDate ,$startDate){
+ $date = strtotime($trans->date);
+// return $date >= strtotime($startDate) && $date <= strtotime($endDate) && $trans->type == 'debit' ;
+ return $trans->type_transaction == 'retrait' ;
+
+ });
+
+ /**
+ ** Dépots
+ **/
+ $date = date("Y");
+
+ $depots_data[] = '';
+ $depots_data =array();
+ for ($i = 1; $i <= 12; $i++) {
+ $depots_query_mounth= array_filter($transactions, function ($trans) use ($i, $months ,$years){
+ $month = date("m",strtotime($trans->date));
+ $year = date("Y",strtotime($trans->date));
+ return $month == $months[$i-1] && $year == $years[$i-1] && $trans->type_transaction == 'depot' ;
+ });
+ $depots_data[] = sizeof($depots_query_mounth);
+ }
+ $depots = array_filter($transactions, function ($trans) use ($i, $endDate ,$startDate){
+ $date = strtotime($trans->date);
+// return $date >= strtotime($startDate) && $date <= strtotime($endDate) && $trans->type == 'credit' ;
+ return $trans->type_transaction == 'depot' ;
+
+ });
+
+ if($transactions!=false){
+ $transac=sizeof($transactions);
+ $array_transac = array();
+ $num = 0;
+ if ($transac > 0) {
+ foreach($transactions as $row) {
+ $num++;
+ $array_transac[] = $row->type_transaction;
+ }
+ $vals_transac = array_count_values($array_transac);
+ $pieChart = array();
+ foreach(array_keys($vals_transac) as $paramName) {
+ $color = dechex(rand(0x000000, 0xFFFFFF));
+ $trash = array("value" => $vals_transac[$paramName],
+ "color" => "#".$color,
+ "highlight" => "#".$color,
+ "label" => $paramName);
+
+ $pieChart[]= $trash;
+ }
+ }
+ }else{
+ $pieChart = array();
+ }
+$fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
+?>
+
+
+
+
+
+
+
+
+
+
+
+
lang->line('Solde Principal') ?>
+
+
+
+
+
+
+
+
+
+
+
+
lang->line('Solde Commission') ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ".$this->lang->line('Nom')."
+ | ".$this->lang->line('Solde Principal')." |
+ ".$this->lang->line('Solde Commission')." |
+ ".$this->lang->line('DEPOT'). 's'." |
+ ".$this->lang->line('RETRAIT').'s'." | ";
+ ?>
+
+
+
+ result() as $row) {
+ $wallet = null;
+ foreach ($agentWalletInfos->result() as $value) {
+ if ($value->agent_id == $row->agent_id) {
+ $wallet = $value;
+ break;
+ }
+ }
+ $com = 0;
+ $princ = 0;
+ if($wallet) {
+ $com = $wallet->balance_com;
+ $princ = $wallet->balance_princ;
+ }
+ echo "
+ | ".$row->lastname." |
+ ".Money::of(round($princ,2), $this->session->userdata('currency_code'),$context)->formatTo('fr_FR')." |
+ ".Money::of(round($com,2), $this->session->userdata('currency_code'),$context)->formatTo('fr_FR')." | ";
+ $nb_depots = 0;
+ $nb_retraits = 0;
+ foreach($depots as $depot){
+ if($depot->agent_id == $row->agent_id) {
+ $nb_depots ++;
+ }
+ }
+ foreach($retraits as $retrait){
+ if($retrait->agent_id == $row->agent_id) {
+ $nb_retraits ++;
+ }
+ }
+ echo "".$nb_depots." |
+ ".$nb_retraits." |
+
";
+ }
+
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php
index abcf2f24..bd47d3a4 100755
--- a/application/views/historique_transactions_ilink.php
+++ b/application/views/historique_transactions_ilink.php
@@ -2,8 +2,8 @@
+
-
- lang->line('Gestion des wallets') ; echo ' '.$network.' - '.$country; ?>
+ lang->line('Gestion des wallets') ; echo ' '.$network.' - '.$country
+ .' :: '.$this->lang->line('Historique des transactions'); ?>
@@ -107,7 +108,7 @@ use Brick\Money\Money;
+
+
+
+
+
+
@@ -254,13 +261,33 @@ use Brick\Money\Money;
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({
+ var table = $('#transactions').DataTable({
"aaSorting": [[ 17, "desc" ]],
"columnDefs": [ {
targets: 17,
render: $.fn.dataTable.render.moment( 'YYYY-MM-DD HH:mm:ss' , 'D MMMM YYYY HH:mm:ss', format)
- }]
+ }],
+ dom: 'Bfrtip',
+ "buttons": [
+ {
+ extend: 'excelHtml5',
+ title: 'Histrotique des transactions'
+ },
+ {
+ extend: 'csvHtml5',
+ title: 'Histrotique des transactions'
+ },
+ {
+ extend: 'pdfHtml5',
+ orientation: 'landscape',
+ pageSize: 'LEGAL',
+ title: 'Histrotique des transactions'
+ }
+ ]
});
+
+ table.buttons().container()
+ .appendTo( '#example_wrapper .col-sm-6:eq(0)' );
});
diff --git a/application/views/historique_transferts_commission.php b/application/views/historique_transferts_commission.php
new file mode 100755
index 00000000..e5c01f24
--- /dev/null
+++ b/application/views/historique_transferts_commission.php
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+setTimezone($timezone);
+ return $carbon->toDateTimeString();
+ }
+ return $date;
+ }
+?>
+
+
+
+
+
+
+
+
+ lang->line('Période') ?>
+
+
+
+
+ Format : session->userdata('site_lang') === 'french' ? 'Jour - Mois - Année ' : 'Year - Month - Day'?>
+
+
+
+
+
+
+
+
+
+ num_rows();
+ $num = 0;
+ if ($numrows > 0) {
+ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
+ ?>
+
+
+
+
+ | ID |
+ lang->line('init_balance_princ').' ' ?> |
+ lang->line('init_balance_com') ?> |
+ lang->line('final_balance_princ') ?> |
+ lang->line('final_balance_com') ?> |
+ session->userdata('category') == 'super' ? 'Agent': $this->lang->line('Superviseur') ?> |
+ Date |
+
+
+
+
+ result() as $row) {
+ $num++;
+ echo "
+ | $num |
+ ".Money::of(round($row->balance_princ_init,2), $row->currency_code,$context)->formatTo('fr_FR')." |
+ ".Money::of(round($row->balance_com_init,2), $row->currency_code,$context)->formatTo('fr_FR')." |
+ ".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'))." | ";
+ ?>
+
+
+
+
+
+ lang->line('Aucune transaction');
+ }
+ }else {
+ echo $this->lang->line('Aucune transaction');
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+