shared multi wallet with wallet

Author: rez1dent3

src/Traits/CanBePaidFloat.php

@@ -18,8 +18,6 @@ trait CanBePaidFloat
         CanBePaid::change insteadof HasWalletFloat;
         CanBePaid::transactions insteadof HasWalletFloat;
         CanBePaid::transfers insteadof HasWalletFloat;
-        CanBePaid::wallets insteadof HasWalletFloat;
-        CanBePaid::getWallet insteadof HasWalletFloat;
         CanBePaid::wallet insteadof HasWalletFloat;
         CanBePaid::getBalanceAttribute insteadof HasWalletFloat;
         CanBePaid::addBalance insteadof HasWalletFloat;

src/Traits/HasWallet.php

@@ -30,15 +30,6 @@
 trait HasWallet
 {
 
-    /**
-     * The variable is used for the cache, so as not to request wallets many times.
-     * WalletProxy keeps the money wallets in the memory to avoid errors when you
-     * purchase/transfer, etc.
-     *
-     * @var array
-     */
-    private $_wallets = [];
-
     /**
      * The amount of checks for errors
      *
@@ -255,42 +246,6 @@ public function transfers(): MorphMany
         return $this->morphMany(config('wallet.transfer.model'), 'from');
     }
 
-    /**
-     * method of obtaining all wallets
-     *
-     * @return MorphMany
-     */
-    public function wallets(): MorphMany
-    {
-        return $this->morphMany(config('wallet.wallet.model'), 'holder');
-    }
-
-    /**
-     * Get wallet by slug
-     *
-     *  $user->wallet->balance // 200
-     *  or short recording $user->balance; // 200
-     *
-     *  $defaultSlug = config('wallet.wallet.default.slug');
-     *  $user->getWallet($defaultSlug)->balance; // 200
-     *
-     *  $user->getWallet('usd')->balance; // 50
-     *  $user->getWallet('rub')->balance; // 100
-     *
-     * @param string $slug
-     * @return WalletModel|null
-     */
-    public function getWallet(string $slug): ?WalletModel
-    {
-        if (!\array_key_exists($slug, $this->_wallets)) {
-            $this->_wallets[$slug] = $this->wallets()
-                ->where('slug', $slug)
-                ->first();
-        }
-
-        return $this->_wallets[$slug];
-    }
-
     /**
      * Get default Wallet
      * this method is used for Eager Loading

src/Traits/HasWallets.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Bavix\Wallet\Traits;
+
+use Bavix\Wallet\Models\Wallet as WalletModel;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Support\Collection;
+
+/**
+ * Trait HasWallets
+ * To use a trait, you must add HasWallet trait.
+ *
+ * @package Bavix\Wallet\Traits
+ *
+ * @property-read Collection|WalletModel[] $wallets
+ */
+trait HasWallets
+{
+
+    /**
+     * The variable is used for the cache, so as not to request wallets many times.
+     * WalletProxy keeps the money wallets in the memory to avoid errors when you
+     * purchase/transfer, etc.
+     *
+     * @var array
+     */
+    private $_wallets = [];
+
+    /**
+     * method of obtaining all wallets
+     *
+     * @return MorphMany
+     */
+    public function wallets(): MorphMany
+    {
+        return $this->morphMany(config('wallet.wallet.model'), 'holder');
+    }
+
+    /**
+     * Get wallet by slug
+     *
+     *  $user->wallet->balance // 200
+     *  or short recording $user->balance; // 200
+     *
+     *  $defaultSlug = config('wallet.wallet.default.slug');
+     *  $user->getWallet($defaultSlug)->balance; // 200
+     *
+     *  $user->getWallet('usd')->balance; // 50
+     *  $user->getWallet('rub')->balance; // 100
+     *
+     * @param string $slug
+     * @return WalletModel|null
+     */
+    public function getWallet(string $slug): ?WalletModel
+    {
+        if (!\array_key_exists($slug, $this->_wallets)) {
+            $this->_wallets[$slug] = $this->wallets()
+                ->where('slug', $slug)
+                ->first();
+        }
+
+        return $this->_wallets[$slug];
+    }
+
+}

tests/MultiWalletTest.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Bavix\Wallet\Test;
+
+class MultiWalletTest extends TestCase
+{
+
+}