DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/add_decline_note_to_acceptance' into add_decline_note_to_acceptance

Browse source
This commit is contained in:
Godfrey M 2024-04-03 11:37:05 -07:00
parent ce1d677cdc bcdda551b3
commit e3ef8d295f
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +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.',
'decline_message' => 'Add details to why you can\'t accept this (Optional)',
'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',

19
resources/views/account/accept/create.blade.php
View file

@ -67,7 +67,7 @@
<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.decline_message')}}</label>
<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>
@ -103,24 +103,7 @@
@section('moar_scripts')
<script nonce="{{ csrf_token() }}">
$(document).ready(function(){
$('#note').hide();
$('#note_label').hide();
$('input[id="declined"]').change(function(){
if($(this).is(':checked')){
$('#note_label').show();
$('#note').show();
}
else {
$('#note_label').hide();
$('#note').hide();
}
});
});
var wrapper = document.getElementById("signature-pad"),
clearButton = wrapper.querySelector("[data-action=clear]"),
saveButton = wrapper.querySelector("[data-action=save]"),