Fix expired and not expired attributes

tarentino76 · Apr 23, 2022 · 257e671 · 257e671
1 parent 48a1316
commit 257e671
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Models/Concerns/ExpiresAndHasGraceDays.php b/src/Models/Concerns/ExpiresAndHasGraceDays.php
@@ -24,11 +24,21 @@ public function initializeExpiresAndHasGraceDays()
 
     public function expired()
     {
-        return ! is_null($this->expired_at);
+        if (is_null($this->grace_days_ended_at)) {
+            return $this->expired_at->isPast();
+        }
+
+        return $this->expired_at->isPast()
+            and $this->grace_days_ended_at->isPast();
     }
 
     public function notExpired()
     {
-        return is_null($this->expired_at);
+        if (is_null($this->grace_days_ended_at)) {
+            return $this->expired_at->isFuture();
+        }
+
+        return $this->expired_at->isFuture()
+            or $this->grace_days_ended_at->isFuture();
     }
 }