Skip to content

Commit

Permalink
Merge pull request #15854 from NebelKreis/feature/add-category-to-ass…
Browse files Browse the repository at this point in the history
…et-mails

Added #15803: Category Field to Asset Related Mails
  • Loading branch information
snipe authored Nov 20, 2024
2 parents 8cd4b33 + 7618169 commit 5522def
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions resources/views/mail/markdown/checkin-asset.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
@if (($item->name!=$item->asset_tag))
| **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
@endif
@if (isset($item->model->category))
| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
@endif
@if (isset($item->manufacturer))
| **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
@endif
Expand Down
3 changes: 3 additions & 0 deletions resources/views/mail/markdown/checkout-asset.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
@if (($item->name!=$item->asset_tag))
| **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
@endif
@if (isset($item->model->category))
| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
@endif
@if (isset($item->manufacturer))
| **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
@endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
@if ((isset($item_tag)) && ($item_tag!=''))
| **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |
@endif
@if (isset($item->model->category))
| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
@endif
@if ((isset($item_model)) && ($item_model!=''))
| **{{ trans('mail.asset_name') }}** | {{ $item_model }} |
@endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
@if ((isset($item->asset_tag)) && ($item->asset_tag!=''))
| **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
@endif
@if (isset($item->model->category))
| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
@endif
@if ((isset($item->name)) && ($item->name!=''))
| **{{ trans('mail.asset_name') }}** | {{ $item->name }} |
@endif
Expand Down

0 comments on commit 5522def

Please sign in to comment.