diff --git a/resources/views/notifications/markdown/checkin-asset.blade.php b/resources/views/notifications/markdown/checkin-asset.blade.php index 01ab12f32c49..22f97799cef2 100644 --- a/resources/views/notifications/markdown/checkin-asset.blade.php +++ b/resources/views/notifications/markdown/checkin-asset.blade.php @@ -13,14 +13,16 @@ @if ((isset($item->name)) && ($item->name!='')) | **{{ trans('mail.asset_name') }}** | {{ $item->name }} | @endif +@if (($item->name!=$item->asset_tag)) | **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} | +@endif @if (isset($item->manufacturer)) | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} | @endif @if (isset($item->model)) | **{{ trans('general.asset_model') }}** | {{ $item->model->name }} | @endif -@if (isset($item->model->model_number)) +@if ((isset($item->model->model_number)) && ($item->model->name!=$item->model->model_number)) | **{{ trans('general.model_no') }}** | {{ $item->model->model_number }} | @endif @if (isset($item->serial)) diff --git a/resources/views/notifications/markdown/checkout-asset.blade.php b/resources/views/notifications/markdown/checkout-asset.blade.php index 8e6297897de4..4646cef48264 100644 --- a/resources/views/notifications/markdown/checkout-asset.blade.php +++ b/resources/views/notifications/markdown/checkout-asset.blade.php @@ -13,14 +13,16 @@ @if ((isset($item->name)) && ($item->name!='')) | **{{ trans('mail.asset_name') }}** | {{ $item->name }} | @endif +@if (($item->name!=$item->asset_tag)) | **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} | +@endif @if (isset($item->manufacturer)) | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} | @endif @if (isset($item->model)) | **{{ trans('general.asset_model') }}** | {{ $item->model->name }} | @endif -@if (isset($item->model->model_number)) +@if ((isset($item->model->model_number)) && ($item->model->name!=$item->model->model_number)) | **{{ trans('general.model_no') }}** | {{ $item->model->model_number }} | @endif @if (isset($item->serial))