Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:44:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on scheduled reports

Browse Source
This commit is contained in:
Hillel Coren 2017-11-23 13:42:58 +02:00
parent 92936246aa
commit 415bab8cf4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/RunReport.php
View File

@ -78,7 +78,7 @@ class RunReport extends Job
'endDate' => $endDate, 'endDate' => $endDate,
'report' => $report, 'report' => $report,
]; ];
$report->exportParams = array_merge($params, $report->results()); $report->exportParams = array_merge($params, $report->results());
return $report; return $report;

2
resources/views/reports/report_builder.blade.php
View File

@ -436,6 +436,7 @@
$('#format').change(function() { $('#format').change(function() {
var val = $('#format').val(); var val = $('#format').val();
$('#scheduleButton').prop('disabled', val == 'zip');
if (isStorageSupported() && val != 'zip') { if (isStorageSupported() && val != 'zip') {
localStorage.setItem('last:report_format', val); localStorage.setItem('last:report_format', val);
} }
@ -446,6 +447,7 @@
setFiltersShown(); setFiltersShown();
setDocumentZipShown(); setDocumentZipShown();
setScheduleButton(); setScheduleButton();
$('#scheduleButton').prop('disabled', $('#format').val() == 'zip');
if (isStorageSupported()) { if (isStorageSupported()) {
localStorage.setItem('last:report_type', val); localStorage.setItem('last:report_type', val);
} }