Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit 63a4d1ad33e4 · 2025-09-17T11:44:41.000+01:00
diff --git a/app/Models/License.php b/app/Models/License.php
@@ -724,7 +724,7 @@ public function freeSeats()
     public static function getExpiringLicenses($days = 60)
     {
 
-        return self::whereNull('deleted_at')
+        return self::whereNull('licenses.deleted_at')
 
             // The termination date is null or within range
             ->where(function ($query) use ($days) {
@@ -752,7 +752,7 @@ public static function getExpiringLicenses($days = 60)
     public function scopeActiveLicenses($query)
     {
 
-        return $query->whereNull('deleted_at')
+        return $query->whereNull('licenses.deleted_at')
 
             // The termination date is null or within range
             ->where(function ($query)  {
@@ -768,7 +768,7 @@ public function scopeActiveLicenses($query)
     public function scopeExpiredLicenses($query)
     {
 
-        return $query->whereNull('deleted_at')
+        return $query->whereNull('licenses.deleted_at')
 
             // The termination date is null or within range
             ->where(function ($query)  {

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ public function freeSeats()`
`724`	`724`	`public static function getExpiringLicenses($days = 60)`
`725`	`725`	`{`
`726`	`726`
`727`		`- return self::whereNull('deleted_at')`
	`727`	`+ return self::whereNull('licenses.deleted_at')`
`728`	`728`
`729`	`729`	`// The termination date is null or within range`
`730`	`730`	`->where(function ($query) use ($days) {`
`@@ -752,7 +752,7 @@ public static function getExpiringLicenses($days = 60)`
`752`	`752`	`public function scopeActiveLicenses($query)`
`753`	`753`	`{`
`754`	`754`
`755`		`- return $query->whereNull('deleted_at')`
	`755`	`+ return $query->whereNull('licenses.deleted_at')`
`756`	`756`
`757`	`757`	`// The termination date is null or within range`
`758`	`758`	`->where(function ($query) {`
`@@ -768,7 +768,7 @@ public function scopeActiveLicenses($query)`
`768`	`768`	`public function scopeExpiredLicenses($query)`
`769`	`769`	`{`
`770`	`770`
`771`		`- return $query->whereNull('deleted_at')`
	`771`	`+ return $query->whereNull('licenses.deleted_at')`
`772`	`772`
`773`	`773`	`// The termination date is null or within range`
`774`	`774`	`->where(function ($query) {`