Simplify cancelation check (#1283)

laravel · Nov 19, 2021 · 517385e · 517385e
1 parent 4bd3b24
commit 517385e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Subscription.php b/src/Subscription.php
@@ -224,7 +224,7 @@ public function scopePastDue($query)
      */
     public function active()
     {
-        return (is_null($this->ends_at) || $this->onGracePeriod()) &&
+        return ! $this->ended() &&
             $this->stripe_status !== StripeSubscription::STATUS_INCOMPLETE &&
             $this->stripe_status !== StripeSubscription::STATUS_INCOMPLETE_EXPIRED &&
             (! Cashier::$deactivatePastDue || $this->stripe_status !== StripeSubscription::STATUS_PAST_DUE) &&