refactor code

Author: rez1dent3

src/Models/Wallet.php

@@ -75,7 +75,7 @@ public function setNameAttribute(string $name): void
      */
     public function calculateBalance(): bool
     {
-        $balance = $this->holder->transactions()
+        $balance = $this->transactions()
             ->where('wallet_id', $this->getKey())
             ->where('confirmed', true)
             ->sum('amount');

src/Tax.php

@@ -18,7 +18,7 @@ class Tax
     public static function fee(Wallet $wallet, int $amount): int
     {
         if ($wallet instanceof Taxing) {
-            return (int) ($amount * $wallet->getFeePercent() / 100);
+            return (int)($amount * $wallet->getFeePercent() / 100);
         }
 
         return 0;

src/Traits/CanBePaid.php

@@ -102,7 +102,7 @@ public function refund(Product $product, bool $force = false): bool
                 ->setModel($this->transfers()->getMorphClass());
         }
 
-        return DB::transaction(function() use ($product, $transfer, $force) {
+        return DB::transaction(function () use ($product, $transfer, $force) {
             if ($force) {
                 $product->forceTransfer($this, $transfer->deposit->amount, $product->getMetaProduct());
             } else {

src/Traits/HasWallet.php

@@ -5,11 +5,11 @@
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
-use Bavix\Wallet\Tax;
 use Bavix\Wallet\Interfaces\Wallet;
-use Bavix\Wallet\Models\Wallet as WalletModel;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
+use Bavix\Wallet\Models\Wallet as WalletModel;
+use Bavix\Wallet\Tax;
 use Bavix\Wallet\WalletProxy;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -117,7 +117,7 @@ public function canWithdraw(int $amount): bool
      */
     public function transfer(Wallet $wallet, int $amount, ?array $meta = null): Transfer
     {
-        return DB::transaction(function() use ($amount, $wallet, $meta) {
+        return DB::transaction(function () use ($amount, $wallet, $meta) {
             $fee = Tax::fee($wallet, $amount);
             $withdraw = $this->withdraw($amount + $fee, $meta);
             $deposit = $wallet->deposit($amount, $meta);
@@ -153,7 +153,7 @@ public function safeTransfer(Wallet $wallet, int $amount, ?array $meta = null):
      */
     public function forceTransfer(Wallet $wallet, int $amount, ?array $meta = null): Transfer
     {
-        return DB::transaction(function() use ($amount, $wallet, $meta) {
+        return DB::transaction(function () use ($amount, $wallet, $meta) {
             $fee = Tax::fee($wallet, $amount);
             $withdraw = $this->forceWithdraw($amount + $fee, $meta);
             $deposit = $wallet->deposit($amount, $meta);
@@ -198,21 +198,18 @@ protected function assemble(Wallet $wallet, Transaction $withdraw, Transaction $
      */
     protected function change(int $amount, ?array $meta, bool $confirmed): Transaction
     {
-        return DB::transaction(function() use ($amount, $meta, $confirmed) {
+        return DB::transaction(function () use ($amount, $meta, $confirmed) {
 
-            if ($this instanceof WalletModel) {
-                $payable = $this->holder;
-                $wallet = $this;
-            } else {
-                $payable = $this;
+            $wallet = $this;
+            if (!($this instanceof WalletModel)) {
                 $wallet = $this->wallet;
             }
 
             if ($confirmed) {
                 $this->addBalance($wallet, $amount);
             }
 
-            return $payable->transactions()->create([
+            return $this->transactions()->create([
                 'type' => $amount > 0 ? 'deposit' : 'withdraw',
                 'wallet_id' => $wallet->getKey(),
                 'uuid' => Uuid::uuid4()->toString(),
@@ -230,7 +227,8 @@ protected function change(int $amount, ?array $meta, bool $confirmed): Transacti
      */
     public function transactions(): MorphMany
     {
-        return $this->morphMany(config('wallet.transaction.model'), 'payable');
+        return ($this instanceof WalletModel ? $this->holder : $this)
+            ->morphMany(config('wallet.transaction.model'), 'payable');
     }
 
     /**
@@ -241,7 +239,8 @@ public function transactions(): MorphMany
      */
     public function transfers(): MorphMany
     {
-        return $this->morphMany(config('wallet.transfer.model'), 'from');
+        return ($this instanceof WalletModel ? $this->holder : $this)
+            ->morphMany(config('wallet.transfer.model'), 'from');
     }
 
     /**
@@ -252,7 +251,8 @@ public function transfers(): MorphMany
      */
     public function wallet(): MorphOne
     {
-        return $this->morphOne(config('wallet.wallet.model'), 'holder')
+        return ($this instanceof WalletModel ? $this->holder : $this)
+            ->morphOne(config('wallet.wallet.model'), 'holder')
             ->withDefault([
                 'name' => config('wallet.wallet.default.name'),
                 'slug' => config('wallet.wallet.default.slug'),
@@ -289,7 +289,7 @@ public function getBalanceAttribute(): int
         if ($this instanceof WalletModel) {
             $this->exists or $this->save();
             if (!WalletProxy::has($this->getKey())) {
-                WalletProxy::set($this->getKey(), (int) ($this->attributes['balance'] ?? 0));
+                WalletProxy::set($this->getKey(), (int)($this->attributes['balance'] ?? 0));
             }
 
             return WalletProxy::get($this->getKey());

src/WalletProxy.php

@@ -25,7 +25,7 @@ public static function has(int $key): bool
      */
     public static function get(int $key): int
     {
-        return (int) (static::$rows[$key] ?? 0);
+        return (int)(static::$rows[$key] ?? 0);
     }
 
     /**