adds status to check in and out

Godmartinz · Jul 30, 2024 · eb6f330 · eb6f330
1 parent 99741db
commit eb6f330
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
@@ -162,6 +162,7 @@ public function toMail()
         $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,

diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
@@ -209,7 +209,7 @@ public function toMail()
             [
                 'item'          => $this->item,
                 'admin'         => $this->admin,
-                'status'        => $this->item->assetstatus(),
+                'status'        => $this->item->assetstatus->name ?: '',
                 'note'          => $this->note,
                 'target'        => $this->target,
                 'fields'        => $fields,

diff --git a/resources/views/notifications/markdown/checkin-asset.blade.php b/resources/views/notifications/markdown/checkin-asset.blade.php
@@ -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() } }} |