Release v1.6.0 (#111)

* redeemCoupon docs

* Test Order.findByPaymentId

* Test Order.findByPaymentId null

* Order status check fix

* Order findByPaymentIdOrFail

* Simplify Order.findByPaimentId

* guardMollieMandate

* helper money_to_decimal

* guardMollieMandate

* restartCycle

* improved Mandate retrieval and validation

* Use temporary payment_id to fix race condition

* SubscriptionBuilders skipTrial

* Improved mandate retrieval - status 410

* Preparing release v1.5.0

* Prefix temporary uuid

* Actually test findByPaymentIdOrFail

* Handle removing inexistent scheduled items

* MandateClearedFromBillable fix #109

* Use SerializesModels trait

* Prepare release v1.6.0

src/Billable.php

@@ -459,7 +459,7 @@ public function clearMollieMandate()
         $this->fill(['mollie_mandate_id' => null]);
         $this->save();
 
-        dispatch(new MandateClearedFromBillable($this, $previousId));
+        event(new MandateClearedFromBillable($this, $previousId));
 
         return $this;
     }

src/CashierServiceProvider.php

@@ -14,7 +14,7 @@
 
 class CashierServiceProvider extends ServiceProvider
 {
-    const PACKAGE_VERSION = '1.5.0';
+    const PACKAGE_VERSION = '1.6.0';
 
     /**
      * Bootstrap the application services.

src/Events/BalanceTurnedStale.php

@@ -2,10 +2,13 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
 use Laravel\Cashier\Credit\Credit;
 
 class BalanceTurnedStale
 {
+    use SerializesModels;
+
     /**
      * @var \Laravel\Cashier\Credit\Credit
      */

src/Events/CouponApplied.php

@@ -2,11 +2,14 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
 use Laravel\Cashier\Coupon\AppliedCoupon;
 use Laravel\Cashier\Coupon\RedeemedCoupon;
 
 class CouponApplied
 {
+    use SerializesModels;
+
     /**
      * @var \Laravel\Cashier\Coupon\RedeemedCoupon
      */

src/Events/FirstPaymentFailed.php

@@ -2,10 +2,13 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
 use Mollie\Api\Resources\Payment;
 
 class FirstPaymentFailed
 {
+    use SerializesModels;
+
     /**
      * @var \Mollie\Api\Resources\Payment
      */

src/Events/MandateClearedFromBillable.php

@@ -2,8 +2,12 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
+
 class MandateClearedFromBillable
 {
+    use SerializesModels;
+
     /**
      * @var \Illuminate\Database\Eloquent\Model
      */
@@ -17,7 +21,7 @@ class MandateClearedFromBillable
     /**
      * ClearedMandate constructor.
      *
-     * @param \Illuminate\Database\Eloquent\Model $owner
+     * @param mixed $owner
      * @param string $oldMandateId
      */
     public function __construct($owner, string $oldMandateId)

src/Events/MandateUpdated.php

@@ -3,9 +3,12 @@
 namespace Laravel\Cashier\Events;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Queue\SerializesModels;
 
 class MandateUpdated
 {
+    use SerializesModels;
+
     /** @var \Illuminate\Database\Eloquent\Model */
     public $owner;
 

src/Events/SubscriptionPlanSwapped.php

@@ -2,10 +2,13 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
 use Laravel\Cashier\Subscription;
 
 class SubscriptionPlanSwapped
 {
+    use SerializesModels;
+
     /**
      * @var \Laravel\Cashier\Subscription
      */

src/Events/SubscriptionQuantityUpdated.php

@@ -2,10 +2,13 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
 use Laravel\Cashier\Subscription;
 
 class SubscriptionQuantityUpdated
 {
+    use SerializesModels;
+
     /**
      * @var \Laravel\Cashier\Subscription
      */

src/Events/SubscriptionStarted.php

@@ -2,10 +2,13 @@
 
 namespace Laravel\Cashier\Events;
 
+use Illuminate\Queue\SerializesModels;
 use Laravel\Cashier\Subscription;
 
 class SubscriptionStarted
 {
+    use SerializesModels;
+
     /**
      * @var \Laravel\Cashier\Subscription
      */

src/Subscription.php

@@ -282,7 +282,7 @@ protected function removeScheduledOrderItem($save = false)
     {
         $item = $this->scheduledOrderItem;
 
-        if($item->isProcessed(false)) {
+        if($item && $item->isProcessed(false)) {
             $item->delete();
         }
 

tests/BaseTestCase.php

@@ -241,6 +241,11 @@ protected function getCustomerUser($persist = true, $overrides = [])
         ], $overrides));
     }
 
+    /**
+     * @param bool $persist
+     * @param array $overrides
+     * @return User
+     */
     protected function getUser($persist = true, $overrides = [])
     {
         $user = factory(User::class)->make($overrides);

tests/BillableTest.php

@@ -2,9 +2,10 @@
 
 namespace Laravel\Cashier\Tests;
 
+use Illuminate\Support\Facades\Event;
 use Laravel\Cashier\Coupon\RedeemedCoupon;
 use Laravel\Cashier\Coupon\RedeemedCouponCollection;
-use Laravel\Cashier\Subscription;
+use Laravel\Cashier\Events\MandateClearedFromBillable;
 use Laravel\Cashier\SubscriptionBuilder\FirstPaymentSubscriptionBuilder;
 use Laravel\Cashier\SubscriptionBuilder\MandatedSubscriptionBuilder;
 use Laravel\Cashier\Tests\Fixtures\User;
@@ -111,4 +112,23 @@ public function canRedeemCouponAndRevokeOtherCoupons()
         $this->assertEquals(0, $subscription->appliedCoupons()->count());
     }
 
+    /** @test */
+    public function clearMollieMandate()
+    {
+        Event::fake();
+        $this->withPackageMigrations();
+        $user = $this->getUser(true, ['mollie_mandate_id' => 'foo-bar']);
+        $this->assertEquals('foo-bar', $user->mollieMandateId());
+
+        $user->clearMollieMandate();
+
+        $this->assertNull($user->mollieMandateId());
+        Event::assertDispatched(MandateClearedFromBillable::class, function ($e) use ($user) {
+            $this->assertEquals('foo-bar', $e->oldMandateId);
+            $this->assertTrue($e->owner->is($user));
+
+            return true;
+        });
+    }
+
 }