From 61eff02fcb64710fda8630e0481088138e807eed Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Wed, 20 Nov 2024 10:27:22 +0100 Subject: [PATCH 1/4] Feature: Added category to asset checkout email --- resources/views/mail/markdown/checkout-asset.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/mail/markdown/checkout-asset.blade.php b/resources/views/mail/markdown/checkout-asset.blade.php index aae0b21584..72e5860e2c 100644 --- a/resources/views/mail/markdown/checkout-asset.blade.php +++ b/resources/views/mail/markdown/checkout-asset.blade.php @@ -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 From 4304af0508784ecc9b0e2d67d0d3617aac028a42 Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Wed, 20 Nov 2024 10:27:37 +0100 Subject: [PATCH 2/4] Feature: Added category to asset checkin email --- resources/views/mail/markdown/checkin-asset.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/mail/markdown/checkin-asset.blade.php b/resources/views/mail/markdown/checkin-asset.blade.php index 523ba66aa1..82e0137914 100644 --- a/resources/views/mail/markdown/checkin-asset.blade.php +++ b/resources/views/mail/markdown/checkin-asset.blade.php @@ -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 From eb026248a8534bf30c12ab72df37fef11eeeebc5 Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Wed, 20 Nov 2024 10:59:59 +0100 Subject: [PATCH 3/4] Feature: Added category to asset acceptance/decline email --- .../views/notifications/markdown/asset-acceptance.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.php index c5c2a2fa27..65446f8a30 100644 --- a/resources/views/notifications/markdown/asset-acceptance.blade.php +++ b/resources/views/notifications/markdown/asset-acceptance.blade.php @@ -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 From 7618169d7906f2cff00951a366155d2ef70359ac Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Wed, 20 Nov 2024 11:22:19 +0100 Subject: [PATCH 4/4] Feature: Added category to asset requested email --- .../views/notifications/markdown/asset-requested.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/notifications/markdown/asset-requested.blade.php b/resources/views/notifications/markdown/asset-requested.blade.php index 56ceefb4a7..a634993f99 100644 --- a/resources/views/notifications/markdown/asset-requested.blade.php +++ b/resources/views/notifications/markdown/asset-requested.blade.php @@ -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