svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added signed in place admin info

Browse Source
This commit is contained in:
snipe
2026-04-30 10:34:06 +01:00
parent 2f54f5b051
commit ccd60eb6d0
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Account/AcceptanceController.php
+12
View File
@@ -204,6 +204,18 @@ class AcceptanceController extends Controller
'qty' => $acceptance->qty ?? 1,
];
// If signed in place, add admin info for PDF
if ($acceptance->signed_in_place && $acceptance->signed_in_place_admin) {
$admin = \App\Models\User::find($acceptance->signed_in_place_admin);
if ($admin) {
$data['signed_in_place_admin'] = [
'name' => $admin->display_name,
'username' => $admin->username,
'email' => $admin->email,
];
}
}
// Add custom fields for asset (show_in_email = 1, field_encrypted = 0)
$customFields = [];
if ($item instanceof Asset && $item->model && $item->model->fieldset) {
app/Models/CheckoutAcceptance.php
+12
View File
@@ -295,6 +295,18 @@ class CheckoutAcceptance extends Model
// Add signed in place if present
if (! empty($data['signed_in_place'])) {
$pdf->writeHTML(trans('general.signed_in_place').': '.(filter_var($data['signed_in_place'], FILTER_VALIDATE_BOOLEAN) ? trans('general.yes') : trans('general.no')), true, 0, true, 0, '');
// If signed in place, show admin info
if (!empty($data['signed_in_place_admin'])) {
$admin = $data['signed_in_place_admin'];
$adminLine = trans('general.signed_in_place_admin').': ' . e($admin['name']);
if (!empty($admin['username'])) {
$adminLine .= ' (' . e($admin['username']) . ')';
}
if (!empty($admin['email'])) {
$adminLine .= ' <' . e($admin['email']) . '>';
}
$pdf->writeHTML($adminLine, true, 0, true, 0, '');
}
}
$pdf->Ln();
app/Notifications/AcceptanceItemAcceptedNotification.php
+2
View File
@@ -33,6 +33,7 @@ class AcceptanceItemAcceptedNotification extends Notification
$this->file = $params['file'] ?? null;
$this->qty = $params['qty'] ?? null;
$this->note = $params['note'] ?? null;
$this->signed_in_place_admin = $params['signed_in_place_admin'] ?? null;
}
@@ -76,6 +77,7 @@ class AcceptanceItemAcceptedNotification extends Notification
'assigned_to' => $this->assigned_to,
'company_name' => $this->company_name,
'qty' => $this->qty,
'signed_in_place_admin' => $this->signed_in_place_admin,
'intro_text' => trans('mail.acceptance_accepted_greeting', ['user' => $this->assigned_to, 'item' => $this->item_name]),
])
->subject('✅ '.trans('mail.acceptance_accepted', ['user' => $this->assigned_to, 'item' => $this->item_name]))
resources/lang/en-US/general.php
+2 -3
View File
@@ -750,10 +750,9 @@ return [
],
'months_plural' => '1 month|:count months',
'token_unrevoked' => 'API token reinstated',
// Add these to the array if not present
'assigned_by' => 'Assigned by',
'signed_in_place' => 'Signed in place',
'signed_in_place_admin' => 'Signed in place by :admin',
];
resources/views/notifications/markdown/asset-acceptance.blade.php
+4 -1
View File
@@ -9,7 +9,7 @@
@if (isset($item_name))
| **{{ trans('general.item_name') }}** | {{ $item_name }} |
@endif
| **{{ trans('mail.user') }}** | {{ $assigned_to }} |
| **{{ trans('mail.user') }} | {{ $assigned_to }} |
@if (isset($user->location))
| **{{ trans('general.location') }}** | {{ $user->location->name }} |
@endif
@@ -43,6 +43,9 @@
@if (isset($qty))
| **{{ trans('general.qty') }}** | {{ $qty }} |
@endif
@if(isset($signed_in_place_admin) && is_array($signed_in_place_admin))
| **{{ trans('general.signed_in_place_admin', ['admin' => $signed_in_place_admin['name']]) }}** | {{ $signed_in_place_admin['name'] }}@if(!empty($signed_in_place_admin['username'])) ({{ $signed_in_place_admin['username'] }})@endif@if(!empty($signed_in_place_admin['email'])) &lt;{{ $signed_in_place_admin['email'] }}&gt;@endif |
@endif
@endcomponent
{{ trans('mail.best_regards') }}