Added resume subscription method/added cancel immediately method

src/Subscriber.php

@@ -144,10 +144,23 @@ public function swap(Subscription $subscription, $plan)
      * @param Subscription $subscription
      * @return null
      */
-    public function cancel(Subscription $subscription)
+    public function cancel(Subscription $subscription, $cancelImmediately = false)
     {
         // TODO: Check if subscription is active or in trial
-        return ChargeBee_Subscription::cancel($subscription->subscription_id)->subscription();
+        return ChargeBee_Subscription::cancel($subscription->subscription_id, [
+            'end_of_term' => ! $cancelImmediately
+        ])->subscription();
+    }
+
+    /**
+     * Resume a subscription that has a scheduled cancellation
+     *
+     * @param Subscription $subscription
+     * @return null
+     */
+    public function resume(Subscription $subscription)
+    {
+        return ChargeBee_Subscription::removeScheduledCancellation($subscription->subscription_id)->subscription();
     }
 
     /**

src/Subscription.php

@@ -71,6 +71,41 @@ public function cancel()
         return $this;
     }
 
+    /**
+     * Cancel a subscription immediately
+     *
+     * @return $this
+     */
+    public function cancelImmediately()
+    {
+        $subscriber = new Subscriber();
+        $subscriptionDetails = $subscriber->cancel($this, true);
+
+        $this->ends_at = $subscriptionDetails->cancelledAt;
+        $this->trial_ends_at = $subscriptionDetails->cancelledAt;
+        $this->save();
+
+        return $this;
+    }
+
+    /**
+     * Resume a subscription that has a scheduled cancellation.
+     *
+     * @return $this
+     */
+    public function resume()
+    {
+        $subscriber = new Subscriber();
+        $subscriptionDetails = $subscriber->resume($this);
+
+        $this->ends_at = null;
+        $this->next_billing_at = $subscriptionDetails->currentTermEnd;
+        $this->trial_ends_at = $subscriptionDetails->trialEnd;
+        $this->save();
+
+        return $this;
+    }
+
     /**
      * Reactivate a cancelled subscription
      *

tests/BillableTest.php

@@ -161,10 +161,19 @@ public function it_registers_a_paid_subscription_within_chargebee()
         $subscription->cancel();
         // Test if subscription is cancelled
         $this->assertTrue($subscription->cancelled());
+        // TODO: Check if subscription ends after trial period
+        $this->assertTrue($subscription->ends_at->eq($subscription->trial_ends_at));
 
         // Test if a subscription can be reactivated
-        $subscription->reactivate();
+        $subscription->resume();
         $this->assertFalse($subscription->cancelled());
+        $this->assertTrue($subscription->active());
+        $this->assertTrue($subscription->onTrial());
+
+        $subscription->cancelImmediately();
+        $this->assertTrue(\Carbon\Carbon::now()->gte($subscription->ends_at));
+        $this->assertFalse($subscription->active());
+        $this->assertFalse($subscription->onTrial());
     }
 
     /**