mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2026-03-03 02:57:01 +00:00
Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop
This commit is contained in:
@@ -64,7 +64,12 @@ class TaskScheduler implements ShouldQueue
|
||||
//@var \App\Models\Schedule $scheduler
|
||||
$scheduler->service()->runTask();
|
||||
} catch (\Throwable $e) {
|
||||
|
||||
nlog("Exception:: TaskScheduler:: Doing job :: {$scheduler->id} :: {$scheduler->name}" . $e->getMessage());
|
||||
|
||||
if (app()->bound('sentry')) {
|
||||
app('sentry')->captureException($e);
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@@ -58,6 +58,10 @@ class EmailReport
|
||||
|
||||
$start_end_dates = $this->calculateStartAndEndDates($this->scheduler->parameters, $this->scheduler->company);
|
||||
$data = $this->scheduler->parameters;
|
||||
|
||||
if(!isset($data['user_id'])) {
|
||||
$data['user_id'] = $this->scheduler->user_id;
|
||||
}
|
||||
|
||||
$data['start_date'] = $start_end_dates[0];
|
||||
$data['end_date'] = $start_end_dates[1];
|
||||
|
||||
Reference in New Issue
Block a user