DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

deleted_msg saves to db

Browse source
This commit is contained in:
Godfrey M 2024-03-18 10:45:47 -07:00
parent 4588393b76
commit 57f5d4a570
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Account/AcceptanceController.php
View file

@ -325,7 +325,7 @@ class AcceptanceController extends Controller
Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output()); Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output());
} }
$acceptance->decline($sig_filename); $acceptance->decline($sig_filename, $request->input('declined_msg'));
$acceptance->notify(new AcceptanceAssetDeclinedNotification($data)); $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
event(new CheckoutDeclined($acceptance)); event(new CheckoutDeclined($acceptance));
$return_msg = trans('admin/users/message.declined'); $return_msg = trans('admin/users/message.declined');

2
resources/lang/en-US/general.php
View file

@ -293,7 +293,7 @@ return [
'user' => 'User', 'user' => 'User',
'accepted' => 'accepted', 'accepted' => 'accepted',
'declined' => 'declined', 'declined' => 'declined',
'declined_notes' => 'Declined Notes', 'declined_note' => 'Declined Notes',
'unassigned' => 'Unassigned', 'unassigned' => 'Unassigned',
'unaccepted_asset_report' => 'Unaccepted Assets', 'unaccepted_asset_report' => 'Unaccepted Assets',
'users' => 'Users', 'users' => 'Users',

2
resources/views/notifications/markdown/asset-acceptance.blade.php
View file

@ -14,7 +14,7 @@
| **{{ ucfirst(trans('general.declined')) }}** | {{ $declined_date }} | | **{{ ucfirst(trans('general.declined')) }}** | {{ $declined_date }} |
@endif @endif
@if (isset($declined_msg)) @if (isset($declined_msg))
| **{{ trans('mail.declined_note') }}** | {{ $declined_msg }} | | **{{ trans('general.declined_note') }}** | {{ $declined_msg }} |
@endif @endif
@if ((isset($item_tag)) && ($item_tag!='')) @if ((isset($item_tag)) && ($item_tag!=''))
| **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} | | **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |