Merge pull request #88 from bavix/cashier

Add support Cashier

Author: rez1dent3

.travis.yml

@@ -13,11 +13,6 @@ matrix:
 
 before_script:
   - composer install
-  - wget https://github.com/infection/infection/releases/download/0.13.0/infection.phar
-  - wget https://github.com/infection/infection/releases/download/0.13.0/infection.phar.asc
-  - gpg --keyserver hkps.pool.sks-keyservers.net --recv-keys 493B4AA0
-  - gpg --with-fingerprint --verify infection.phar.asc infection.phar
-  - chmod +x infection.phar
 
 script:
-  - ./infection.phar --min-msi=48 -j$(nproc)
+  - ./vendor/bin/infection --min-msi=60 -j$(nproc)

changelog.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.6] - 2019-08-08
+### Added
+- Add support laravel cashier #87 @imhuso
+
 ## [3.1.5] - 2019-08-07
 ### Fixed 
 - Fixed math rounding (mantissa) #85 @anthoz69
@@ -380,7 +384,8 @@ The operation is now executed in the transaction and updates the new `refund` fi
 - Exceptions: AmountInvalid, BalanceIsEmpty.
 - Models: Transfer, Transaction.
 
-[Unreleased]: https://github.com/bavix/laravel-wallet/compare/3.1.5...HEAD
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/3.1.6...HEAD
+[3.1.6]: https://github.com/bavix/laravel-wallet/compare/3.1.5...3.1.6
 [3.1.5]: https://github.com/bavix/laravel-wallet/compare/3.1.4...3.1.5
 [3.1.4]: https://github.com/bavix/laravel-wallet/compare/3.1.3...3.1.4
 [3.1.3]: https://github.com/bavix/laravel-wallet/compare/3.1.2...3.1.3

composer.json

@@ -30,9 +30,11 @@
     "ramsey/uuid": "^3.0"
   },
   "require-dev": {
+    "infection/infection": "^0.13",
     "orchestra/testbench": "^3.7|^4.0",
     "phpstan/phpstan": "^0.11",
-    "phpunit/phpunit": "^7.5|^8.2"
+    "phpunit/phpunit": "^7.5|^8.2",
+    "laravel/cashier": "*"
   },
   "suggest": {
     "bavix/laravel-wallet-swap": "Addition to the laravel-wallet library for quick setting of exchange rates"

src/Traits/HasWallet.php

@@ -21,13 +21,14 @@
  *
  * @package Bavix\Wallet\Traits
  *
- * @property-read WalletModel $wallet
  * @property-read Collection|WalletModel[] $wallets
  * @property-read int $balance
  */
 trait HasWallet
 {
 
+    use MorphOneWallet;
+
     /**
      * The input means in the system
      *
@@ -201,22 +202,4 @@ public function transfers(): MorphMany
             ->morphMany(config('wallet.transfer.model'), 'from');
     }
 
-    /**
-     * Get default Wallet
-     * this method is used for Eager Loading
-     *
-     * @return MorphOne|WalletModel
-     */
-    public function wallet(): MorphOne
-    {
-        return ($this instanceof WalletModel ? $this->holder : $this)
-            ->morphOne(config('wallet.wallet.model'), 'holder')
-            ->where('slug', config('wallet.wallet.default.slug'))
-            ->withDefault([
-                'name' => config('wallet.wallet.default.name'),
-                'slug' => config('wallet.wallet.default.slug'),
-                'balance' => 0,
-            ]);
-    }
-
 }

src/Traits/HasWallets.php

@@ -91,8 +91,10 @@ public function createWallet(array $data): WalletModel
 
         /**
          * Create a default wallet
+         * @var $walletModel WalletModel
          */
-        $this->getBalanceAttribute();
+        $walletModel = $this->wallet;
+        $walletModel->getBalanceAttribute();
 
         return $wallet;
     }

src/Traits/MorphOneWallet.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Bavix\Wallet\Traits;
+
+use Bavix\Wallet\Models\Wallet as WalletModel;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
+
+/**
+ * Trait MorphOneWallet
+ * @package Bavix\Wallet\Traits
+ * @property-read WalletModel $wallet
+ */
+trait MorphOneWallet
+{
+
+    /**
+     * Get default Wallet
+     * this method is used for Eager Loading
+     *
+     * @return MorphOne|WalletModel
+     */
+    public function wallet(): MorphOne
+    {
+        return ($this instanceof WalletModel ? $this->holder : $this)
+            ->morphOne(config('wallet.wallet.model'), 'holder')
+            ->where('slug', config('wallet.wallet.default.slug'))
+            ->withDefault([
+                'name' => config('wallet.wallet.default.name'),
+                'slug' => config('wallet.wallet.default.slug'),
+                'balance' => 0,
+            ]);
+    }
+
+}

tests/Models/UserCashier.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Bavix\Wallet\Test\Models;
+
+use Bavix\Wallet\Traits\HasWallets;
+use Bavix\Wallet\Traits\MorphOneWallet;
+use Illuminate\Database\Eloquent\Model;
+use Laravel\Cashier\Billable;
+
+/**
+ * Class User
+ *
+ * @package Bavix\Wallet\Test\Models
+ * @property string $name
+ * @property string $email
+ */
+class UserCashier extends Model
+{
+    use Billable, HasWallets, MorphOneWallet;
+
+    /**
+     * @return string
+     */
+    public function getTable(): string
+    {
+        return 'users';
+    }
+}

tests/MultiWalletTest.php

@@ -4,8 +4,10 @@
 
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
+use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Test\Models\Item;
+use Bavix\Wallet\Test\Models\UserCashier;
 use Bavix\Wallet\Test\Models\UserMulti;
 use Illuminate\Database\QueryException;
 use function compact;
@@ -406,4 +408,35 @@ public function testPay(): void
         $this->assertEquals($b->balance, $product->getAmountProduct());
     }
 
+    /**
+     * @return void
+     */
+    public function testUserCashier(): void
+    {
+        /**
+         * @var UserCashier $user
+         */
+        $user = factory(UserCashier::class)->create();
+        $default = $user->wallet;
+
+        $this->assertEquals($default->balance, 0);
+
+        $transaction = $default->deposit(100);
+        $this->assertEquals($transaction->type, Transaction::TYPE_DEPOSIT);
+        $this->assertEquals($transaction->amount, 100);
+        $this->assertEquals($default->balance, 100);
+
+        $newWallet = $user->createWallet(['name' => 'New Wallet']);
+
+        $transfer = $default->transfer($newWallet, 100);
+        $this->assertEquals($default->balance, 0);
+        $this->assertEquals($newWallet->balance, 100);
+
+        $this->assertEquals($transfer->withdraw->type, Transaction::TYPE_WITHDRAW);
+        $this->assertEquals($transfer->withdraw->amount, -100);
+
+        $this->assertEquals($transfer->deposit->type, Transaction::TYPE_DEPOSIT);
+        $this->assertEquals($transfer->deposit->amount, 100);
+    }
+
 }

tests/factories/UserCashierFactory.php

@@ -0,0 +1,22 @@
+<?php
+
+use Bavix\Wallet\Test\Models\UserCashier;
+use Faker\Generator as Faker;
+
+/*
+|--------------------------------------------------------------------------
+| Model Factories
+|--------------------------------------------------------------------------
+|
+| This directory should contain each of the model factory definitions for
+| your application. Factories provide a convenient way to generate new
+| model instances for testing / seeding your application's database.
+|
+*/
+
+$factory->define(UserCashier::class, function (Faker $faker) {
+    return [
+        'name' => $faker->name,
+        'email' => $faker->unique()->safeEmail,
+    ];
+});