lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-10-23 04:46:44 -07:00
commit 40c0ba9a95
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/SendExpectedCheckinAlerts.php
View file

@ -58,7 +58,7 @@ class SendExpectedCheckinAlerts extends Command
$recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) { $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
return new AlertRecipient($item); return new AlertRecipient($item);
}); });
Notification::send($recipients, new ExpectedCheckinAdminNotification($assets)); \Notification::send($recipients, new ExpectedCheckinAdminNotification($assets));
} }
} }
} }

4
app/Console/Commands/SendExpirationAlerts.php
View file

@ -55,14 +55,14 @@ class SendExpirationAlerts extends Command
$assets = Asset::getExpiringWarrantee($threshold); $assets = Asset::getExpiringWarrantee($threshold);
if ($assets->count() > 0) { if ($assets->count() > 0) {
$this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold])); $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]));
Notification::send($recipients, new ExpiringAssetsNotification($assets, $threshold)); \Notification::send($recipients, new ExpiringAssetsNotification($assets, $threshold));
} }
// Expiring licenses // Expiring licenses
$licenses = License::getExpiringLicenses($threshold); $licenses = License::getExpiringLicenses($threshold);
if ($licenses->count() > 0) { if ($licenses->count() > 0) {
$this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $threshold])); $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $threshold]));
Notification::send($recipients, new ExpiringLicenseNotification($licenses, $threshold)); \Notification::send($recipients, new ExpiringLicenseNotification($licenses, $threshold));
} }
} else { } else {
if ($settings->alert_email == '') { if ($settings->alert_email == '') {

2
app/Console/Commands/SendInventoryAlerts.php
View file

@ -52,7 +52,7 @@ class SendInventoryAlerts extends Command
return new AlertRecipient($item); return new AlertRecipient($item);
}); });
Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold)); \Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold));
} }
} else { } else {
if ($settings->alert_email == '') { if ($settings->alert_email == '') {

4
resources/views/hardware/view.blade.php
View file

@ -71,7 +71,7 @@
@if (!$asset->model) @if (!$asset->model)
<div class="col-md-12"> <div class="col-md-12">
<div class="callout callout-danger"> <div class="callout callout-danger">
<h2>NO MODEL ASSOCIATED</h4> <h2>NO MODEL ASSOCIATED</h2>
<p>This will break things in weird and horrible ways. Edit this asset now to assign it a model. </p> <p>This will break things in weird and horrible ways. Edit this asset now to assign it a model. </p>
</div> </div>
</div> </div>
@ -735,7 +735,7 @@
@endif @endif
@if (($asset->assignedTo) && ($asset->deleted_at=='')) @if (($asset->assignedTo) && ($asset->deleted_at==''))
<h2>{{ trans('admin/hardware/form.checkedout_to') }}</h4> <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
<p> <p>
@if($asset->checkedOutToUser()) <!-- Only users have avatars currently--> @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->
<img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}"> <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">