fix for excelreport
This commit is contained in:
@@ -68,9 +68,9 @@ class ReportsController extends MY_Controller {
|
|||||||
$this->json( $invoiceReport );
|
$this->json( $invoiceReport );
|
||||||
}
|
}
|
||||||
|
|
||||||
public function createInvoicesSpreadsheet( $year = FALSE )
|
public function createInvoicesSpreadsheet( $year = FALSE, $orderType, $orderDirection, $archive )
|
||||||
{
|
{
|
||||||
$invoices = new Invoices( $year );
|
$invoices = new Invoices( $year, $orderType, $orderDirection, $archive );
|
||||||
|
|
||||||
$invoiceReport = $invoices->getInvoiceReport();
|
$invoiceReport = $invoices->getInvoiceReport();
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class MY_Controller extends CI_Controller {
|
|||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
$this->version = '1.00.02';
|
$this->version = '1.00.03';
|
||||||
|
|
||||||
$this->load->library( 'beheer/session/RetrieveUserSession' );
|
$this->load->library( 'beheer/session/RetrieveUserSession' );
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class MonthForecast {
|
|||||||
|
|
||||||
private function setInitialsForecastMonths()
|
private function setInitialsForecastMonths()
|
||||||
{
|
{
|
||||||
for ( $i = 0; $i <= 12; $i ++ )
|
for ( $i = 0; $i < 12; $i ++ )
|
||||||
{
|
{
|
||||||
$this->forecastMonths[ $i ] = ['forecastamount' => 0];
|
$this->forecastMonths[ $i ] = ['forecastamount' => 0];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -229,7 +229,11 @@ dbo.invoicereportInit = function () {
|
|||||||
|
|
||||||
createSpreadsheet: function () {
|
createSpreadsheet: function () {
|
||||||
var vm = dbo.invoicereport;
|
var vm = dbo.invoicereport;
|
||||||
var url = 'index.php/reports/reportsController/createInvoicesSpreadsheet/' + vm.selectedYear();
|
|
||||||
|
var orderDirection = vm.orderDirection ? 'ASC' : 'DESC';
|
||||||
|
var archive = vm.archive() ? 'T' : 'F';
|
||||||
|
|
||||||
|
var url = 'index.php/reports/reportsController/createInvoicesSpreadsheet/' + vm.selectedYear() + '/' + vm.orderType + '/' + orderDirection + '/' + archive;
|
||||||
window.open( url, '_blank' );
|
window.open( url, '_blank' );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user