diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 9724d33673..934261e97a 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -34,7 +34,7 @@ class LicenseSeatsController extends Controller } if ($request->input('status') == 'assigned') { - $seats->whereNotNull('license_seats.assigned_to')->whereNotNull('license_seats.asset_id'); + $seats->ByAssigned(); } diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php index d4f2b13ad5..2ca67839c6 100755 --- a/app/Models/LicenseSeat.php +++ b/app/Models/LicenseSeat.php @@ -130,4 +130,19 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild ->whereNotNull('license_seats.assigned_to') ->orderBy('license_user_dept.name', $order); } + + + public function scopeByAssigned($query) + { + + return $query->where(function ($query) { + $query->whereNotNull('assigned_to') + ->orWhere(function($query) + { + $query->whereNotNull('asset_id'); + }); + }); + + } + }