Merge pull request #16 from ciungulete/compatible-to-use-uuid

Author: sandervanhooft

docs/12-faq.md

@@ -33,7 +33,10 @@ $table->unsignedInteger('owner_id');
 // By this:
 $table->uuid('owner_id');  
 ```
-
+And in your `Billable` model add
+```php
+protected $keyType = 'string';
+```
 ## How is prorating handled?
 
 Cashier Mollie applies prorating by default. With prorating, customers are billed at the start of each billing cycle.

src/Order/Order.php

@@ -64,7 +64,6 @@ class Order extends Model
         'amount_refunded' => 'int',
         'amount_charged_back' => 'int',
         'tax' => 'int',
-        'owner_id' => 'int',
         'subtotal' => 'int',
         'total' => 'int',
         'balance_before' => 'int',

src/Order/OrderItem.php

@@ -39,7 +39,6 @@ class OrderItem extends Model implements InvoicableItem
         'unit_price' => 'int',
         'tax_percentage' => 'float',
         'orderable_id' => 'int',
-        'owner_id' => 'int',
     ];
 
     /**

tests/Order/OrderTest.php

@@ -160,7 +160,7 @@ public function creatingANewOrderSchedulesNextOrderItems()
         $this->assertCarbon(now()->addMonth(), $subscription->cycle_ends_at);
         $this->assertCarbon(now()->addMonth(), $scheduled_item->process_at);
 
-        $this->assertSame(2, $scheduled_item->owner_id);
+        $this->assertEquals(2, $scheduled_item->owner_id);
         $this->assertSame(User::class, $scheduled_item->owner_type);
         $this->assertSame('EUR', $scheduled_item->currency);
         $this->assertSame(1, $scheduled_item->quantity);
@@ -199,7 +199,7 @@ public function handlesOwnerBalance()
 
         $order = Order::createFromItems(new OrderItemCollection([$scheduled_item]))->fresh();
 
-        $this->assertSame(2, $order->owner_id);
+        $this->assertEquals(2, $order->owner_id);
         $this->assertSame(User::class, $order->owner_type);
         $this->assertSame("EUR", $order->currency);
         $this->assertSame(0, $order->tax);
@@ -234,7 +234,7 @@ public function handlesOwnerBalance()
         $this->assertMoneyEURCents(500, $user->credit('EUR')->money());
 
 
-        $this->assertSame(2, $order->owner_id);
+        $this->assertEquals(2, $order->owner_id);
         $this->assertSame(User::class, $order->owner_type);
         $this->assertSame("EUR", $order->currency);
         $this->assertSame(0, $order->tax);

tests/SubscriptionTest.php

@@ -168,7 +168,7 @@ public function yieldsOrderItemsAtSetIntervals()
         $this->assertSame("Laravel\Cashier\Subscription", $item_1->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_1->owner_type);
         $this->assertSame(1, $item_1->orderable_id);
-        $this->assertSame(1, $item_1->owner_id);
+        $this->assertEquals(1, $item_1->owner_id);
         $this->assertSame("Monthly payment", $item_1->description);
         $this->assertSame(null, $item_1->description_extra_lines);
         $this->assertSame("EUR", $item_1->currency);
@@ -193,7 +193,7 @@ public function yieldsOrderItemsAtSetIntervals()
         $this->assertSame("Laravel\Cashier\Subscription", $item_2->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_2->owner_type);
         $this->assertSame(1, $item_2->orderable_id);
-        $this->assertSame(1, $item_2->owner_id);
+        $this->assertEquals(1, $item_2->owner_id);
         $this->assertSame("Monthly payment", $item_2->description);
         $this->assertSame(null, $item_2->description_extra_lines);
         $this->assertSame("EUR", $item_2->currency);
@@ -219,7 +219,7 @@ public function yieldsOrderItemsAtSetIntervals()
         $this->assertSame("Laravel\Cashier\Subscription", $item_3->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_3->owner_type);
         $this->assertSame(1, $item_3->orderable_id);
-        $this->assertSame(1, $item_3->owner_id);
+        $this->assertEquals(1, $item_3->owner_id);
         $this->assertSame("Monthly payment", $item_3->description);
         $this->assertSame(null, $item_3->description_extra_lines);
         $this->assertSame("EUR", $item_3->currency);
@@ -252,7 +252,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGenerator()
         $this->assertSame("Laravel\Cashier\Subscription", $item_1->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_1->owner_type);
         $this->assertSame(1, $item_1->orderable_id);
-        $this->assertSame(1, $item_1->owner_id);
+        $this->assertEquals(1, $item_1->owner_id);
         $this->assertSame("Monthly payment", $item_1->description);
         $this->assertSame(null, $item_1->description_extra_lines);
         $this->assertSame("EUR", $item_1->currency);
@@ -277,7 +277,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGenerator()
         $this->assertSame("Laravel\Cashier\Subscription", $item_2->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_2->owner_type);
         $this->assertSame(1, $item_2->orderable_id);
-        $this->assertSame(1, $item_2->owner_id);
+        $this->assertEquals(1, $item_2->owner_id);
         $this->assertSame("Monthly payment", $item_2->description);
         $this->assertSame(null, $item_2->description_extra_lines);
         $this->assertSame("EUR", $item_2->currency);
@@ -303,7 +303,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGenerator()
         $this->assertSame("Laravel\Cashier\Subscription", $item_3->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_3->owner_type);
         $this->assertSame(1, $item_3->orderable_id);
-        $this->assertSame(1, $item_3->owner_id);
+        $this->assertEquals(1, $item_3->owner_id);
         $this->assertSame("Monthly payment", $item_3->description);
         $this->assertSame(null, $item_3->description_extra_lines);
         $this->assertSame("EUR", $item_3->currency);
@@ -336,7 +336,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGeneratorLastDayOfTheM
         $this->assertSame("Laravel\Cashier\Subscription", $item_1->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_1->owner_type);
         $this->assertSame(1, $item_1->orderable_id);
-        $this->assertSame(1, $item_1->owner_id);
+        $this->assertEquals(1, $item_1->owner_id);
         $this->assertSame("Monthly payment", $item_1->description);
         $this->assertSame(null, $item_1->description_extra_lines);
         $this->assertSame("EUR", $item_1->currency);
@@ -361,7 +361,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGeneratorLastDayOfTheM
         $this->assertSame("Laravel\Cashier\Subscription", $item_2->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_2->owner_type);
         $this->assertSame(1, $item_2->orderable_id);
-        $this->assertSame(1, $item_2->owner_id);
+        $this->assertEquals(1, $item_2->owner_id);
         $this->assertSame("Monthly payment", $item_2->description);
         $this->assertSame(null, $item_2->description_extra_lines);
         $this->assertSame("EUR", $item_2->currency);
@@ -387,7 +387,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGeneratorLastDayOfTheM
         $this->assertSame("Laravel\Cashier\Subscription", $item_3->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_3->owner_type);
         $this->assertSame(1, $item_3->orderable_id);
-        $this->assertSame(1, $item_3->owner_id);
+        $this->assertEquals(1, $item_3->owner_id);
         $this->assertSame("Monthly payment", $item_3->description);
         $this->assertSame(null, $item_3->description_extra_lines);
         $this->assertSame("EUR", $item_3->currency);
@@ -412,7 +412,7 @@ public function yieldsOrderItemsAtSetIntervalsWithIntervalGeneratorLastDayOfTheM
         $this->assertSame("Laravel\Cashier\Subscription", $item_4->orderable_type);
         $this->assertSame("Laravel\Cashier\Tests\Fixtures\User", $item_4->owner_type);
         $this->assertSame(1, $item_4->orderable_id);
-        $this->assertSame(1, $item_4->owner_id);
+        $this->assertEquals(1, $item_4->owner_id);
         $this->assertSame("Monthly payment", $item_4->description);
         $this->assertSame(null, $item_4->description_extra_lines);
         $this->assertSame("EUR", $item_4->currency);