Merge pull request #79 from bavix/relations

#78 Relations
bavix · Aug 3, 2019 · 39de5d3 · 39de5d3
2 parents 2e43659 + 4913c76
commit 39de5d3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.4] - 2019-08-03
+### Added
+- Add support `barryvdh/laravel-ide-helper`
+
+### Fixed 
+- Fixed receiving `wallets.transfers` relationship @imhuso
+
 ## [3.1.3] - 2019-07-31
 ### Added
 - Add support SQLite on command `RefreshBalance` 
@@ -369,7 +376,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.3...HEAD
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/3.1.4...HEAD
+[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
 [3.1.2]: https://github.com/bavix/laravel-wallet/compare/3.1.1...3.1.2
 [3.1.1]: https://github.com/bavix/laravel-wallet/compare/3.1.0...3.1.1

diff --git a/src/Services/WalletService.php b/src/Services/WalletService.php
@@ -68,9 +68,10 @@ public function checkAmount(int $amount): void
 
     /**
      * @param Wallet $object
+     * @param bool $autoSave
      * @return WalletModel
      */
-    public function getWallet(Wallet $object): WalletModel
+    public function getWallet(Wallet $object, bool $autoSave = true): WalletModel
     {
         /**
          * @var WalletModel $wallet
@@ -84,7 +85,10 @@ public function getWallet(Wallet $object): WalletModel
             $wallet = $object->wallet;
         }
 
-        $wallet->exists or $wallet->save();
+        if ($autoSave) {
+            $wallet->exists or $wallet->save();
+        }
+
         return $wallet;
     }
 

diff --git a/src/Traits/HasWallet.php b/src/Traits/HasWallet.php
@@ -197,7 +197,7 @@ public function forceTransfer(Wallet $wallet, int $amount, ?array $meta = null):
     public function transfers(): MorphMany
     {
         return app(WalletService::class)
-            ->getWallet($this)
+            ->getWallet($this, false)
             ->morphMany(config('wallet.transfer.model'), 'from');
     }