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

Working on scheduled reports

Browse Source
This commit is contained in:
Hillel Coren 2017-11-23 13:50:11 +02:00
parent 415bab8cf4
commit 7e5d488de7
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,9 +115,11 @@ class ReportController extends BaseController
break;
case 'schedule':
self::schedule($params, $config);
return redirect('/reports');
break;
case 'cancel_schedule':
self::cancelSchdule();
return redirect('/reports');
break;
}
} else {
@ -157,7 +159,7 @@ class ReportController extends BaseController
$schedule->send_date = Utils::toSqlDate(request('send_date'));
$schedule->save();
session()->now('message', trans('texts.created_scheduled_report'));
session()->flash('message', trans('texts.created_scheduled_report'));
}
}
@ -168,6 +170,6 @@ class ReportController extends BaseController
->wherePublicId(request('scheduled_report_id'))
->delete();
session()->now('message', trans('texts.deleted_scheduled_report'));
session()->flash('message', trans('texts.deleted_scheduled_report'));
}
}

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

@ -381,12 +381,14 @@
}
function onCancelScheduleClick() {
var reportType = $('#report_type').val();
$('#action').val('cancel_schedule');
$('#frequency').val(frequency);
$('#scheduled_report_id').val(scheduledReportMap[reportType]);
$('#submitButton').click();
$('#action').val('');
sweetConfirm(function() {
var reportType = $('#report_type').val();
$('#action').val('cancel_schedule');
$('#frequency').val(frequency);
$('#scheduled_report_id').val(scheduledReportMap[reportType]);
$('#submitButton').click();
$('#action').val('');
});
}
function setFiltersShown() {