Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Api/LicenseSeatsController.php

@@ -34,7 +34,7 @@ public function index(Request $request, $licenseId) : JsonResponse | array
             }
 
             if ($request->input('status') == 'assigned') {
-                $seats->whereNotNull('license_seats.assigned_to')->whereNotNull('license_seats.asset_id');
+                $seats->ByAssigned();
             }
 
 

app/Models/LicenseSeat.php

@@ -130,4 +130,19 @@ public function scopeOrderDepartments($query, $order)
             ->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');
+                });
+        });
+
+    }
+
 }