DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'status_labels_check_emails' of github.com:Godmartinz/snipe-it into status_labels_check_emails

Browse source
This commit is contained in:
Godfrey M 2024-07-31 12:03:56 -07:00
parent b6cac4baae f19e58b352
commit 868f117b67
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Notifications/CheckinAssetNotification.php
View file

@ -162,6 +162,7 @@ class CheckinAssetNotification extends Notification
$message = (new MailMessage)->markdown('notifications.markdown.checkin-asset',
[
'item' => $this->item,
'status' => $this->item->assetstatus->name ?: '',
'admin' => $this->admin,
'note' => $this->note,
'target' => $this->target,

2
app/Notifications/CheckoutAssetNotification.php
View file

@ -209,7 +209,7 @@ public function toGoogleChat()
[
'item' => $this->item,
'admin' => $this->admin,
'status' => $this->item->assetstatus(),
'status' => $this->item->assetstatus->name ?: '',
'note' => $this->note,
'target' => $this->target,
'fields' => $fields,

3
resources/views/notifications/markdown/checkin-asset.blade.php
View file

@ -31,6 +31,9 @@
@if (isset($last_checkout))
| **{{ trans('mail.checkout_date') }}** | {{ $last_checkout }} |
@endif
@if (isset($status))
| **{{ trans('general.status') }}** | {{ $status }} |
@endif
@foreach($fields as $field)
@if (($item->{ $field->db_column_name() }!='') && ($field->show_in_email) && ($field->field_encrypted=='0'))
| **{{ $field->name }}** | {{ $item->{ $field->db_column_name() } }} |