mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-10-29 19:31:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18115 from marcusmoore/fixes/rb-20449-remove-admin-from-acceptance-email

Browse Source 
Fixed #18112 - fix consumable and license acceptances
This commit is contained in:
snipe 2025-10-28 20:26:59 +00:00 committed by GitHub
commit ac8e341b37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Account/AcceptanceController.php
View File

@ -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,
];

2
app/Notifications/AcceptanceAssetAcceptedNotification.php
View File

@ -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'),
])

2
app/Notifications/AcceptanceAssetAcceptedToUserNotification.php
View File

@ -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]),
])

3
resources/views/notifications/markdown/asset-acceptance.blade.php
View File

@ -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') }}