DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add Maintained filed in licenses view and api. + Expires in API

Browse source
This commit is contained in:
NMC 2021-08-01 14:30:16 -04:00
parent cdc4940338
commit 976957ddd4
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Api/LicensesController.php
View file

@ -77,6 +77,13 @@ class LicensesController extends Controller
$licenses->where('supplier_id','=',$request->input('supplier_id'));
}
if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {
$licenses->where('maintained','=',1);
}
if (($request->filled('expires')) && ($request->input('expires')=='true')) {
$licenses->whereNotNull('expiration_date');
}
if ($request->filled('search')) {
$licenses = $licenses->TextSearch($request->input('search'));

11
resources/views/licenses/view.blade.php
View file

@ -285,6 +285,17 @@
</div>
@endif
<div class="row">
<div class="col-md-4">
<strong>
{{ trans('admin/licenses/form.maintained') }}
</strong>
</div>
<div class="col-md-8">
{{ $license->maintained ? 'Yes' : 'No' }}
</div>
</div>
@if (($license->seats) && ($license->seats) > 0)
<div class="row">
<div class="col-md-4">