Merge pull request #52 from adibnaya/master

Update Carboon usage
gerardojbaez · Sep 27, 2019 · a8897b8 · a8897b8
2 parents db200ab + cf4c24c
commit a8897b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Laraplans/Models/PlanSubscription.php b/src/Laraplans/Models/PlanSubscription.php
@@ -202,7 +202,7 @@ public function isEnded()
     {
         $endsAt = Carbon::instance($this->ends_at);
 
-        return Carbon::now()->gt($endsAt) or Carbon::now()->eq($endsAt);
+        return Carbon::now()->gte($endsAt);
     }
 
     /**

diff --git a/src/Laraplans/Models/PlanSubscriptionUsage.php b/src/Laraplans/Models/PlanSubscriptionUsage.php
@@ -71,6 +71,6 @@ public function isExpired()
             return false;
         }
 
-        return Carbon::now()->gt($this->valid_until) or Carbon::now()->eq($this->valid_until);
+        return Carbon::now()->gte($this->valid_until);
     }
 }