From 55d86da84679bfa4c81b43483feaf6a973b58753 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 28 Oct 2025 13:07:00 -0700 Subject: [PATCH] Remove references to administrator in acceptance notification --- app/Http/Controllers/Account/AcceptanceController.php | 4 ---- app/Notifications/AcceptanceAssetAcceptedNotification.php | 2 -- .../AcceptanceAssetAcceptedToUserNotification.php | 2 -- .../views/notifications/markdown/asset-acceptance.blade.php | 3 --- 4 files changed, 11 deletions(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 2f1027e0e5..7324abf63c 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -115,9 +115,6 @@ class AcceptanceController extends Controller } $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id); - $lastCheckout = $item->checkouts()->latest()->first(); - $admin = $lastCheckout?->adminuser; - // If signatures are required, make sure we have one if (Setting::getSettings()->require_accept_signature == '1') { @@ -165,7 +162,6 @@ class AcceptanceController extends Controller 'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null, 'logo' => ($encoded_logo) ?? null, 'date_settings' => $settings->date_display_format, - 'admin' => $admin?->present()->fullName, 'qty' => $acceptance->qty ?? 1, ]; diff --git a/app/Notifications/AcceptanceAssetAcceptedNotification.php b/app/Notifications/AcceptanceAssetAcceptedNotification.php index 6e33a8a823..0a4882c048 100644 --- a/app/Notifications/AcceptanceAssetAcceptedNotification.php +++ b/app/Notifications/AcceptanceAssetAcceptedNotification.php @@ -34,7 +34,6 @@ use Illuminate\Notifications\Notification; $this->file = $params['file'] ?? null; $this->qty = $params['qty'] ?? null; $this->note = $params['note'] ?? null; - $this->admin = $params['admin'] ?? null; } @@ -77,7 +76,6 @@ use Illuminate\Notifications\Notification; 'accepted_date' => $this->accepted_date, 'assigned_to' => $this->assigned_to, 'company_name' => $this->company_name, - 'admin' => $this->admin, 'qty' => $this->qty, 'intro_text' => trans('mail.acceptance_asset_accepted'), ]) diff --git a/app/Notifications/AcceptanceAssetAcceptedToUserNotification.php b/app/Notifications/AcceptanceAssetAcceptedToUserNotification.php index 1f53443449..e745a5b8db 100644 --- a/app/Notifications/AcceptanceAssetAcceptedToUserNotification.php +++ b/app/Notifications/AcceptanceAssetAcceptedToUserNotification.php @@ -32,7 +32,6 @@ use Illuminate\Notifications\Notification; $this->settings = Setting::getSettings(); $this->file = $params['file'] ?? null; $this->qty = $params['qty'] ?? null; - $this->admin = $params['admin'] ?? null; } /** @@ -70,7 +69,6 @@ use Illuminate\Notifications\Notification; 'accepted_date' => $this->accepted_date, 'assigned_to' => $this->assigned_to, 'company_name' => $this->company_name, - 'admin' => $this->admin, 'qty' => $this->qty, 'intro_text' => trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]), ]) diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.php index 32b76e5b58..1b010691a1 100644 --- a/resources/views/notifications/markdown/asset-acceptance.blade.php +++ b/resources/views/notifications/markdown/asset-acceptance.blade.php @@ -43,9 +43,6 @@ @if (isset($qty)) | **{{ trans('general.qty') }}** | {{ $qty }} | @endif -@if (isset($admin)) -| **{{ trans('general.administrator') }}** | {{ $admin }} | -@endif @endcomponent {{ trans('mail.best_regards') }}