From 41c4920d45e3a2a68eb01e16d8dcf4a0f1c77618 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 7 Jul 2025 16:58:36 +0100 Subject: [PATCH] Show only assigned in license tab Signed-off-by: snipe --- app/Http/Controllers/Api/LicenseSeatsController.php | 9 +++++++++ resources/views/licenses/view.blade.php | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index babca4a319..92db79fe34 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -29,6 +29,15 @@ class LicenseSeatsController extends Controller $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department') ->where('license_seats.license_id', $licenseId); + if ($request->input('status') == 'available') { + $seats->whereNull('license_seats.assigned_to'); + } + + if ($request->input('status') == 'assigned') { + $seats->whereNotNull('license_seats.assigned_to'); + } + + $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; if ($request->input('sort') == 'department') { diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 41e6bf4220..40ee7d2702 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -31,8 +31,8 @@ - - {{ number_format($license->availCount()->count()) }} / {{ number_format($license->seats) }} + + {{ number_format($license->assignedCount()->count()) }} / {{ number_format($license->seats) }} @@ -443,7 +443,7 @@ data-sort-order="asc" data-sort-name="name" class="table table-striped snipe-table" - data-url="{{ route('api.licenses.seats.index', $license->id) }}" + data-url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'assigned']) }}" data-export-options='{ "fileName": "export-seats-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]