Skip to content

A free open source IT asset/license management system

Added expiring licenses to API and UI

snipe5ceb50d7e5f2
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index 105a20bd86..738311b52b 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
use App\Http\Transformers\LicensesTransformer;
use App\Http\Transformers\SelectlistTransformer;
use App\Models\License;
+use App\Models\Setting;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Http\JsonResponse;
@@ -25,9 +26,12 @@ class LicensesController extends Controller
$this->authorize('view', License::class);
$licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
+ $settings = Setting::getSettings();
if ($request->input('status')=='inactive') {
$licenses->ExpiredLicenses();
+ } elseif ($request->input('status')=='expiring') {
+ $licenses->ExpiringLicenses($settings->alert_interval);
} else {
$licenses->ActiveLicenses();
}
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 8ebbc9fb16..9e74b3cf69 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1605,26 +1605,6 @@
});
@endcan
- @can('create', \App\Models\Component::class)
- // License table buttons
- window.licenseButtons = () => ({
- btnAdd: {
- text: '{{ trans('general.create') }}',
- icon: 'fa fa-plus',
- event () {
- window.location.href = '{{ route('licenses.create') }}';
- },
- attributes: {
- class: 'btn btn-primary',
- title: '{{ trans('general.create') }}',
- @if ($snipeSettings->shortcuts_enabled == 1)
- accesskey: 'n'
- @endif
- }
- },
- });
- @endcan
-
@can('create', \App\Models\Department::class)
// Department table buttons
window.departmentButtons = () => ({
@@ -1787,9 +1767,21 @@
}
},
+ btnShowExpiring: {
+ text: '{{ (request()->input('status') == "expiring") ? trans('general.list_all') : trans('general.show_expiring') }}',
+ icon: 'fas fa-clock {{ (request()->input('status') == "expiring") ? ' text-danger' : '' }}',
+ event () {
+ window.location.href = '{{ (request()->input('status') == "expiring") ? route('licenses.index') : route('licenses.index', ['status' => 'expiring']) }}';
+ },
+ attributes: {
+ title: '{{ (request()->input('status') == "expiring") ? trans('general.list_all') : trans('general.show_expiring') }}',
+
+ }
+ },
+
btnShowInactive: {
text: '{{ (request()->input('status') == "inactive") ? trans('general.list_all') : trans('general.show_inactive') }}',
- icon: 'fas fa-clock {{ (request()->input('status') == "inactive") ? ' text-danger' : '' }}',
+ icon: 'fas fa-history {{ (request()->input('status') == "inactive") ? ' text-danger' : '' }}',
event () {
window.location.href = '{{ (request()->input('status') == "inactive") ? route('licenses.index') : route('licenses.index', ['status' => 'inactive']) }}';
},