diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index 1a98a2ab..ea39efd6 100644 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -640,29 +640,22 @@ class Invoice extends BaseController public function general_inv_rp() { - if($this->request->getmethod() == 'get') + $model = new InvoiceModel(); + if($this->request->is('get')) { - $model = new InvoiceModel(); $data['report_data'] = $model->get_general_invoice_data(); - $this->logger->info("Invoice Report "); - $data['page_name'] = 'General Invoice Report'; - $this->render_page('report_general_invoice', $data); + $data['selected_data'] = ""; } else { $dateParts = explode(' - ', $this->request->getVar('date') ); $fromDate = $dateParts[0]; $toDate = $dateParts[1]; - - $dateTime = \DateTime::createFromFormat('m/d/Y', $fromDate); - $dateTime1 = \DateTime::createFromFormat('m/d/Y', $toDate); - $model = new InvoiceModel(); - $data['report_data'] = $model->get_general_invoice_data( $dateTime->format('Y-m-d') , $dateTime1->format('Y-m-d') ); - $this->logger->info("Invoice Report "); - $data['page_name'] = 'General Invoice Report'; + $data['report_data'] = $model->get_general_invoice_data( date("Y-m-d", strtotime($fromDate)) , date("Y-m-d", strtotime($toDate)) ); $data['selected_data'] = $this->request->getVar('date'); - $this->render_page('report_general_invoice', $data); } + $data['page_name'] = 'General Invoice Report'; + $this->render_page('report_general_invoice', $data); } public function general_membership_inv_rp() diff --git a/app/Views/report_general_invoice.php b/app/Views/report_general_invoice.php index e2165d42..78eeb169 100644 --- a/app/Views/report_general_invoice.php +++ b/app/Views/report_general_invoice.php @@ -80,29 +80,29 @@