From 4fbfaf6b9fd82c5c85414d5e34f9c223100dcad3 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 21 Oct 2025 10:22:34 -0700 Subject: [PATCH] add admin to decline, fix asset and model name translations --- app/Notifications/AcceptanceAssetDeclinedNotification.php | 4 +++- .../views/notifications/markdown/asset-acceptance.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Notifications/AcceptanceAssetDeclinedNotification.php b/app/Notifications/AcceptanceAssetDeclinedNotification.php index 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.php index 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 }} |