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

snipe · Aug 1, 2021 · 976957d · 976957d
1 parent cdc4940
commit 976957d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
@@ -77,6 +77,13 @@ public function index(Request $request)
  $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'));

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
@@ -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">