mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-01 00:47:27 -08:00
Merge pull request #15854 from NebelKreis/feature/add-category-to-asset-mails
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Added #15803: Category Field to Asset Related Mails
This commit is contained in:
commit
5522def054
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue