From 57f5d4a570575c57984c90a56ed9c3cde6457c6d Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 18 Mar 2024 10:45:47 -0700 Subject: [PATCH] deleted_msg saves to db --- app/Http/Controllers/Account/AcceptanceController.php | 2 +- resources/lang/en-US/general.php | 2 +- .../views/notifications/markdown/asset-acceptance.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 16a3bb292f..8339df8fef 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -325,7 +325,7 @@ class AcceptanceController extends Controller 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)); event(new CheckoutDeclined($acceptance)); $return_msg = trans('admin/users/message.declined'); diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 3498af23b5..5131452e89 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -293,7 +293,7 @@ return [ 'user' => 'User', 'accepted' => 'accepted', 'declined' => 'declined', - 'declined_notes' => 'Declined Notes', + 'declined_note' => 'Declined Notes', 'unassigned' => 'Unassigned', 'unaccepted_asset_report' => 'Unaccepted Assets', 'users' => 'Users', diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.php index 2f073fe8d7..ab767c821c 100644 --- a/resources/views/notifications/markdown/asset-acceptance.blade.php +++ b/resources/views/notifications/markdown/asset-acceptance.blade.php @@ -14,7 +14,7 @@ | **{{ ucfirst(trans('general.declined')) }}** | {{ $declined_date }} | @endif @if (isset($declined_msg)) -| **{{ trans('mail.declined_note') }}** | {{ $declined_msg }} | +| **{{ trans('general.declined_note') }}** | {{ $declined_msg }} | @endif @if ((isset($item_tag)) && ($item_tag!='')) | **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |