Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe 2024-05-07 08:12:31 +01:00
commit 204de99a64
2 changed files with 1 additions and 4 deletions

View file

@ -43,12 +43,11 @@ class SendUpcomingAuditReport extends Command
*/
public function handle()
{
$settings = Setting::getSettings();
$interval = $settings->audit_warning_days ?? 0;
$today = Carbon::now();
$interval_date = $today->copy()->addDays($interval);
$settings = Setting::getSettings();
$assets = Asset::whereNull('deleted_at')->DueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'desc')->get();
$this->info($assets->count().' assets must be audited in on or before '.$interval_date.' is deadline');

View file

@ -20,8 +20,6 @@
<span id="searchclear" class="fas fa-times" aria-hidden="true"></span>
<button type="submit" disabled style="display: none" aria-hidden="true"></button>
</div>
<a href="{{ route('settings.index') }}" class="btn btn-primary pull-right" style="margin-left: 10px;">{{ trans('general.back') }}</a>
</form>