A free open source IT asset/license management system
add admin to decline, fix asset and model name translations
Godfrey M4fbfaf6b9fd8
diff --git a/app/Notifications/AcceptanceAssetDeclinedNotification.php b/app/Notifications/AcceptanceAssetDeclinedNotification.phpindex 6ff06c7094..6a235404cc 100644--- a/app/Notifications/AcceptanceAssetDeclinedNotification.php+++ b/app/Notifications/AcceptanceAssetDeclinedNotification.php@@ -31,6 +31,7 @@ class AcceptanceAssetDeclinedNotification extends Notification$this->company_name = $params['company_name'];$this->settings = Setting::getSettings();$this->qty = $params['qty'] ?? null;+ $this->admin = $params['admin'] ?? null;}/**@@ -70,7 +71,8 @@ class AcceptanceAssetDeclinedNotification extends Notification'declined_date' => $this->declined_date,'assigned_to' => $this->assigned_to,'company_name' => $this->company_name,- 'qty' => $this->qty,+ 'qty' => $this->qty,+ 'admin' => $this->admin,'intro_text' => trans('mail.acceptance_asset_declined'),])->subject(trans('mail.acceptance_asset_declined'));diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.phpindex 52c13500d0..32b76e5b58 100644--- a/resources/views/notifications/markdown/asset-acceptance.blade.php+++ b/resources/views/notifications/markdown/asset-acceptance.blade.php@@ -7,7 +7,7 @@| | || ------------- | ------------- |@if (isset($item_name))-| **{{ trans('general.name') }}** | {{ $item_name }} |+| **{{ trans('general.asset_name') }}** | {{ $item_name }} |@endif| **{{ trans('mail.user') }}** | {{ $assigned_to }} |@if (isset($user->location))@@ -32,7 +32,7 @@| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |@endif@if ((isset($item_model)) && ($item_model!=''))-| **{{ trans('mail.asset_name') }}** | {{ $item_model }} |+| **{{ trans('general.model_name') }}** | {{ $item_model }} |@endif@if (isset($item->model))| **{{ trans('general.asset_model') }}** | {{ $item->model->name }} |