Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

This commit is contained in:
David Bomba
2026-01-23 07:29:12 +11:00
2 changed files with 9 additions and 0 deletions

View File

@@ -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);
}
}
});

View File

@@ -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];