Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance

Adds a note text area to asset acceptances/declines

resources/lang/en-US/admin/settings/general.php

@@ -49,6 +49,7 @@ return [
     'default_eula_text'			=> 'Default EULA',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

resources/lang/en-US/general.php

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

resources/views/account/accept/create.blade.php

@@ -64,6 +64,15 @@
                             </label>
 
                         </div>
+                        <div class="col-md-12">
+                            <br>
+                            <div class="col-md-12" style="display:block;">
+                                <label id="note_label" for="note" style="text-align:center;" >{{trans('admin/settings/general.acceptance_note')}}</label>
+                            </div>
+                            <div class="col-md-12">
+                                <textarea id="note" name="note" rows="4" cols="50" value="note" style="width:100%" ></textarea>
+                            </div>
+                        </div>
 
                         @if ($snipeSettings->require_accept_signature=='1')
                             <div class="col-md-12">
@@ -133,5 +142,6 @@
             }
         });
 
+
     </script>
 @stop

resources/views/notifications/markdown/asset-acceptance.blade.php

@@ -13,6 +13,9 @@
 @if (isset($declined_date))
 | **{{ ucfirst(trans('general.declined')) }}** | {{ $declined_date }} |
 @endif
+@if (isset($note))
+| **{{ trans('general.notes') }}** | {{ $note }} |
+@endif
 @if ((isset($item_tag)) && ($item_tag!=''))
 | **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |
 @endif