Merge branch 'develop'

README.md

@@ -239,6 +239,7 @@ Alternatively you can use the following methods available in the subscription mo
 ```php
 $user->subscription('main')->active();
 $user->subscription('main')->canceled();
+$user->subscription('main')->canceledImmediately();
 $user->subscription('main')->ended();
 $user->subscription('main')->onTrial();
 ```

src/Laraplans/Models/PlanSubscription.php

@@ -55,6 +55,15 @@ class PlanSubscription extends Model implements PlanSubscriptionInterface
         'canceled_at', 'trial_ends_at', 'ends_at', 'starts_at'
     ];
 
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'canceled_immediately' => 'boolean',
+    ];
+
     /**
      * Subscription Ability Manager instance.
      *
@@ -136,7 +145,7 @@ public function getStatusAttribute()
      */
     public function isActive()
     {
-        if (! $this->isEnded() or $this->onTrial()) {
+        if ((! $this->isEnded() or $this->onTrial()) and ! $this->isCanceledImmediately()) {
             return true;
         }
 
@@ -167,6 +176,16 @@ public function isCanceled()
         return  ! is_null($this->canceled_at);
     }
 
+    /**
+     * Check if subscription is canceled immediately.
+     *
+     * @return bool
+     */
+    public function isCanceledImmediately()
+    {
+        return  (! is_null($this->canceled_at) and $this->canceled_immediately === true);
+    }
+
     /**
      * Check if subscription period has ended.
      *
@@ -190,7 +209,7 @@ public function cancel($immediately = false)
         $this->canceled_at = Carbon::now();
 
         if ($immediately) {
-            $this->ends_at = $this->canceled_at;
+            $this->canceled_immediately = true;
         }
 
         if ($this->save()) {

src/database/migrations/2016_08_15_190033_create_plan_subscriptions_table.php

@@ -20,6 +20,7 @@ public function up()
             $table->string('subscribable_type')->index();
             $table->integer('plan_id')->unsigned();
             $table->string('name');
+            $table->boolean('canceled_immediately')->nullable();
             $table->timestamp('trial_ends_at')->nullable();
             $table->timestamp('starts_at')->nullable();
             $table->timestamp('ends_at')->nullable();

tests/integration/Models/PlanSubscriptionTest.php

@@ -109,13 +109,15 @@ public function it_cancels()
         $this->subscription->trial_ends_at = null;
 
         $this->assertTrue($this->subscription->isCanceled());
+        $this->assertFalse($this->subscription->isCanceledImmediately());
         $this->assertTrue($this->subscription->isActive());
         $this->assertEquals(PlanSubscription::STATUS_ACTIVE, $this->subscription->status);
 
         // Cancel subscription immediately...
         $this->subscription->cancel(true);
 
         $this->assertTrue($this->subscription->isCanceled());
+        $this->assertTrue($this->subscription->isCanceledImmediately());
         $this->assertFalse($this->subscription->isActive());
         $this->assertEquals(PlanSubscription::STATUS_CANCELED, $this->subscription->status);