Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug export report #1596

Browse Source
This commit is contained in:
Hillel Coren 2017-07-30 20:18:04 +03:00
parent 191b0a3138
commit b9d981781f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/ReportController.php
View File

@ -104,7 +104,7 @@ class ReportController extends BaseController
$params['report'] = $report;
$params = array_merge($params, $report->results());
if ($isExport) {
self::export($reportType, $params['displayData'], $params['columns'], $params['reportTotals']);
return self::export($reportType, $params['displayData'], $params['columns'], $params['reportTotals']);
}
} else {
$params['columns'] = [];
@ -122,23 +122,23 @@ class ReportController extends BaseController
* @param $columns
* @param $totals
*/
private function export($reportType, $data, $columns, $totals)
{
private function export($reportType, $data, $columns, $totals)
{
if (! Auth::user()->hasPermission('view_all')) {
exit;
}
$output = fopen('php://output', 'w') or Utils::fatalError();
$date = date('Y-m-d');
$columns = array_map(function($key, $val) {
return is_array($val) ? $key : $val;
}, array_keys($columns), $columns);
$callback = function() use ($data, $columns) {
$output = fopen('php://output', 'w') or Utils::fatalError();
header('Content-Type:application/csv');
header("Content-Disposition:attachment;filename={$date}-invoiceninja-{$reportType}-report.csv");
$columns = array_map(function($key, $val) {
return is_array($val) ? $key : $val;
}, array_keys($columns), $columns);
Utils::exportData($output, $data, Utils::trans($columns));
Utils::exportData($output, $data, Utils::trans($columns));
};
/*
fwrite($output, trans('texts.totals'));
@ -159,7 +159,14 @@ class ReportController extends BaseController
}
*/
fclose($output);
exit;
$headers = [
'Cache-Control' => 'must-revalidate, post-check=0, pre-check=0',
'Content-type' => 'text/csv',
'Content-Disposition' => "attachment; filename={$date}-invoiceninja-{$reportType}-report.csv",
'Expires' => '0',
'Pragma' => 'public'
];
return response()->stream($callback, 200, $headers);
}
}