diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index c273d36e3afd..73e26422f60b 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -232,6 +232,7 @@ public function store(Request $request, $id) : RedirectResponse 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null, 'logo' => $path_logo, 'date_settings' => $branding_settings->date_display_format, + 'admin' => auth()->user()->present()?->fullName, ]; if ($pdf_view_route!='') { diff --git a/app/Notifications/AcceptanceAssetAcceptedNotification.php b/app/Notifications/AcceptanceAssetAcceptedNotification.php index 7798dbc0d51d..6c4e2e99e029 100644 --- a/app/Notifications/AcceptanceAssetAcceptedNotification.php +++ b/app/Notifications/AcceptanceAssetAcceptedNotification.php @@ -29,6 +29,7 @@ public function __construct($params) $this->assigned_to = $params['assigned_to']; $this->note = $params['note']; $this->company_name = $params['company_name']; + $this->admin = $params['admin'] ?? null; $this->settings = Setting::getSettings(); } @@ -72,6 +73,7 @@ public function toMail() 'assigned_to' => $this->assigned_to, 'company_name' => $this->company_name, 'intro_text' => trans('mail.acceptance_asset_accepted'), + 'admin' => $this->admin, ]) ->subject(trans('mail.acceptance_asset_accepted')); diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.php index 1a9569609e8d..85bc110ffa4f 100644 --- a/resources/views/notifications/markdown/asset-acceptance.blade.php +++ b/resources/views/notifications/markdown/asset-acceptance.blade.php @@ -37,6 +37,9 @@ @if (isset($item_serial)) | **{{ trans('mail.serial') }}** | {{ $item_serial }} | @endif +@if (isset($admin)) +| **{{ trans('general.checked_out').' '.trans('general.by')}}** | {{ $admin }} | +@endif @endcomponent {{ trans('mail.best_regards') }}