From 3594ed67d1c1a560653f8a272fadadcfd9af9ad2 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 6 May 2024 20:48:32 +0100 Subject: [PATCH 1/3] Removed back buttons on settings index Signed-off-by: snipe --- resources/views/settings/index.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 9ff9c94f71..9af1931730 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -20,8 +20,6 @@ - {{ trans('general.back') }} - From 6f639f7bf019d241d802c40573731361aca8fa60 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 May 2024 16:44:14 -0700 Subject: [PATCH 2/3] Load settings properly in SendUpcomingAuditReport command --- app/Console/Commands/SendUpcomingAuditReport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/SendUpcomingAuditReport.php b/app/Console/Commands/SendUpcomingAuditReport.php index fc06785cfe..b87ad986cc 100644 --- a/app/Console/Commands/SendUpcomingAuditReport.php +++ b/app/Console/Commands/SendUpcomingAuditReport.php @@ -43,7 +43,7 @@ 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); From 7e9c8ba2906ecc245aa89a4c38f7f816776223b6 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 6 May 2024 17:08:16 -0700 Subject: [PATCH 3/3] Remove duplicate settings call --- app/Console/Commands/SendUpcomingAuditReport.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Console/Commands/SendUpcomingAuditReport.php b/app/Console/Commands/SendUpcomingAuditReport.php index b87ad986cc..40ebb64c50 100644 --- a/app/Console/Commands/SendUpcomingAuditReport.php +++ b/app/Console/Commands/SendUpcomingAuditReport.php @@ -48,7 +48,6 @@ class SendUpcomingAuditReport extends Command $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');