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

Merge pull request #17510 from grokability/fixes-#17498-add-serial-to-acceptance

Browse Source 
Fixed #17498 - added serial to user acceptance
This commit is contained in:
snipe
2025-08-02 14:46:46 +01:00
committed by GitHub
parent a9fc8b79fd f811352c79
commit fa546ddc5b
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/account/accept/create.blade.php
+12 -10
View File
@@ -42,17 +42,20 @@
<div class="row">
<div class="col-sm-12 col-sm-offset-1 col-md-10 col-md-offset-1">
<div class="panel box box-default">
<div class="box-header with-border">
<h2 class="box-title">
{{$acceptance->checkoutable->present()->name()}}
{{ (($acceptance->checkoutable) && ($acceptance->checkoutable->serial)) ? ' - '.trans('general.serial_number').': '.$acceptance->checkoutable->serial : '' }}
</h2>
</div>
<div class="box-body">
<div class="col-md-12" style="padding-top: 20px;">
<div class="col-md-12" style="padding-top: 20px; padding-bottom: 15px;">
@if ($acceptance->checkoutable->getEula())
<div id="eula_div" style="padding-bottom: 20px">
<div id="eula_div" style="background-color: rgba(211,211,211,0.25); padding: 10px; border: lightgrey 1px solid;">
{!! $acceptance->checkoutable->getEula() !!}
</div>
@endif
</div>
<div class="col-md-12">
<h3>{{$acceptance->checkoutable->present()->name()}}</h3>
</div>
<div class="col-md-12">
<label class="form-control">
<input type="radio" name="asset_acceptance" id="accepted" value="accepted">
@@ -66,12 +69,11 @@
</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" value="note" class="form-control" style="width:100%"></textarea>
</div>
<br>
<textarea id="note" name="note" rows="4" class="form-control" style="width:100%">{{ old('note') }}</textarea>
</div>
@if ($snipeSettings->require_accept_signature=='1')
resources/views/account/accept/index.blade.php
+2
View File
@@ -31,6 +31,7 @@
<thead>
<tr>
<th>{{ trans('general.name')}}</th>
<th>{{ trans('general.serial_number')}}</th>
<th>{{ trans('table.actions')}}</th>
</tr>
</thead>
@@ -39,6 +40,7 @@
<tr>
@if ($acceptance->checkoutable)
<td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>
<td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->serial : '' }}</td>
<td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">{{ trans('general.accept_decline') }}</a></td>
@else
<td> ----- </td>