From e4dc4be372ace12e093548c9a9b29646fd94a4b5 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Wed, 1 Sep 2021 09:42:09 +0100 Subject: [PATCH] Fix bugs on export --- application/controllers/Hyperviseur_dash.php | 17 +++++++++++++---- application/views/historique_transactions.php | 6 ++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 9cea6f0d..9ac03472 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -591,14 +591,23 @@ class Hyperviseur_dash extends CI_Controller if (isset($_POST)) { $parrain_id = $this->input->post('parrain_id'); - $start = date('Y-m-d', strtotime($this->input->post('start'))); - $end = date('Y-m-d', strtotime($this->input->post('end'). "+1 day")); + $start = $this->input->post('start'); + $end = $this->input->post('end'); $config = $this->wallet_model->getConfigWallet($this->session->userdata('network_id'))->first_row(); - $sql = "SELECT id, type_transac, numCarte, montant, 0 as bank_deposit , commission_banque, commission_hyp, commission_sup, commission_ag, + if(isset($start) && isset($end)){ + $start = date('Y-m-d', strtotime($start)); + $end = date('Y-m-d', strtotime($end. "+1 day")); + + $sql = "SELECT id, type_transac, numCarte, montant, 0 as bank_deposit , commission_banque, commission_hyp, commission_sup, commission_ag, agent,parrain,date_created FROM infos_transaction WHERE deleted = 0 AND parrain_id = ? AND date_created >= ? AND date_created < ? ORDER BY agent ASC"; - $query = $this->db->query($sql, array($parrain_id,$start,$end)); + $query = $this->db->query($sql, array($parrain_id,$start,$end)); + }else{ + $sql = "SELECT id, type_transac, numCarte, montant, 0 as bank_deposit , commission_banque, commission_hyp, commission_sup, commission_ag, + agent,parrain,date_created FROM infos_transaction WHERE deleted = 0 AND parrain_id = ? ORDER BY agent ASC"; + $query = $this->db->query($sql, array($parrain_id)); + } $data = [['ID', 'Type' , $this->lang->line('cart_number'),$this->lang->line('customer_net_amount'),$this->lang->line('bank_deposit_amount'), $this->lang->line('Commission de la banque'),$this->lang->line('Commission de l\'hyperviseur'),$this->lang->line('Commission du superviseur'), diff --git a/application/views/historique_transactions.php b/application/views/historique_transactions.php index 260b753f..7d274ae9 100755 --- a/application/views/historique_transactions.php +++ b/application/views/historique_transactions.php @@ -403,12 +403,10 @@ data: {"parrain_id": parrain_id , start : start , end : end }, async:true, success : function(data){ - - console.log('data',data) - // Empty workbook object var wb = XLSX.utils.book_new(); - var title = "lang->line('Historique des transactions').(isset($parrain) ? ' _ POS de '.$parrain->lastname : '')?>"+" _ "+start+" - "+end + var title = "lang->line('Historique des transactions').(isset($parrain) ? ' _ POS de '.$parrain->lastname : '')?>" + + (start ? (" _ "+start+" - "+end) : '') wb.Props = { Title: title, Subject: title,