Merge remote-tracking branch 'origin/develop'

snipe · May 7, 2024 · 204de99 · 204de99
2 parents d36a06d + fd929f5
commit 204de99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/app/Console/Commands/SendUpcomingAuditReport.php b/app/Console/Commands/SendUpcomingAuditReport.php
@@ -43,12 +43,11 @@ public function __construct()
  */
  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');
 

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
@@ -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>