From 89e9f5d5038e0ffceb59b220f4643be73eda247f Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Thu, 16 Jul 2020 17:27:32 +0100 Subject: [PATCH] + Add total commission and total principal balance while export etats des soldes --- .../config_wallet_ilink_hyp/etat_soldes.php | 210 ++++++++++++------ .../views/historique_transactions_ilink.php | 20 +- .../historique_transferts_commission.php | 1 + 3 files changed, 158 insertions(+), 73 deletions(-) diff --git a/application/views/config_wallet_ilink_hyp/etat_soldes.php b/application/views/config_wallet_ilink_hyp/etat_soldes.php index 8117ac47..d198e9c9 100755 --- a/application/views/config_wallet_ilink_hyp/etat_soldes.php +++ b/application/views/config_wallet_ilink_hyp/etat_soldes.php @@ -5,35 +5,38 @@
-setTimezone($timezone); return $carbon->toDateTimeString(); } return $date; } -?> + + ?>

- lang->line('Gestion des wallets') ; echo ' '.$network.' - '.$country - .' :: '.$this->lang->line('balance_statement'); ?> - - + lang->line('Gestion des wallets'); + echo ' ' . $network . ' - ' . $country + . ' :: ' . $this->lang->line('balance_statement'); ?> + +

num_rows(); - $num = 0; - if ($numrows > 0) { - $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL ); - ?> - - - - - - - - - - - - - - - result() as $row) { - $num++; - echo " - - - - - - "; - ?> - - - - - - lang->line('Aucune transaction'); - } - }else { - echo $this->lang->line('Aucune transaction'); - } + if ($wallets){ + $numrows = $wallets->num_rows(); + $num = 0; + if ($numrows > 0) { + $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); ?> +
IDlang->line('Solde Principal')?>lang->line('Solde Commission')?>lang->line('Telephone')?>lang->line('code membre')?>Agent
$num".Money::of(round($row->balance_princ,2), $row->currency_code,$context)->formatTo('fr_FR')."".Money::of(round($row->balance_com,2), $row->currency_code,$context)->formatTo('fr_FR')."".$row->transactionNumber."".$row->codeMembre."".$row->lastname."
+ + + + + + + + + + + + + result() as $row) { + $num++; + echo " + + + + + + "; + ?> + + + + + + lang->line('Aucune transaction'); + } + } else { + echo $this->lang->line('Aucune transaction'); + } + ?> +
IDlang->line('Solde Principal') ?>lang->line('Solde Commission') ?>lang->line('Telephone') ?>lang->line('code membre') ?>Agent
$num" . Money::of(round($row->balance_princ, 2), $row->currency_code, $context)->formatTo('fr_FR') . "" . Money::of(round($row->balance_com, 2), $row->currency_code, $context)->formatTo('fr_FR') . "" . $row->transactionNumber . "" . $row->codeMembre . "" . $row->lastname . "
@@ -182,31 +188,97 @@ use Brick\Money\Money; diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php index bd47d3a4..70b26bdf 100755 --- a/application/views/historique_transactions_ilink.php +++ b/application/views/historique_transactions_ilink.php @@ -252,6 +252,7 @@ use Brick\Money\Money; + @@ -269,20 +270,31 @@ use Brick\Money\Money; }], dom: 'Bfrtip', "buttons": [ + 'pageLength', { extend: 'excelHtml5', - title: 'Histrotique des transactions' + title: 'Histrotique des transactions', + exportOptions: { + columns: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17] + } }, { extend: 'csvHtml5', - title: 'Histrotique des transactions' + title: 'Histrotique des transactions', + exportOptions: { + columns: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17] + } }, { extend: 'pdfHtml5', orientation: 'landscape', pageSize: 'LEGAL', - title: 'Histrotique des transactions' - } + title: 'Histrotique des transactions', + exportOptions: { + columns: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17] + } + }, + // 'colvis' ] }); diff --git a/application/views/historique_transferts_commission.php b/application/views/historique_transferts_commission.php index e5c01f24..be54a776 100755 --- a/application/views/historique_transferts_commission.php +++ b/application/views/historique_transferts_commission.php @@ -214,6 +214,7 @@ use Brick\Money\Money; }], dom: 'Bfrtip', "buttons": [ + 'pageLength', { extend: 'excelHtml5', title: 'Histrotique des transferts de commission'