Merge pull request #31 from bavix/2.4

2.4

Author: rez1dent3

changelog.md

@@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Add zh-CN trans. @MoeCasts
+- Add ru trans
+- Add method `holderTransfers`
+
+### Changed
+- optimize `getWallet` method
+- optimize relations wallets
+
+### Fixed
+- fixed getting a default wallet @MoeCasts
 
 ## [2.3.2] - 2019-05-13
 ### Fixed

resources/lang/ru/errors.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'price_positive' => 'Цена должна быть положительной',
+    'product_stock' => 'Товар отсутствует',
+    'wallet_empty' => 'Кошелёк пуст',
+    'insufficient_funds' => 'Недостаточно средств',
+];

resources/lang/zh-CN/errors.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'price_positive' => '价格不能为负数',
+    'product_stock' => '库存不足',
+    'wallet_empty' => '钱包为空',
+    'insufficient_funds' => '余额不足',
+];

src/Traits/CanPay.php

@@ -5,6 +5,7 @@
 use Bavix\Wallet\Exceptions\ProductEnded;
 use Bavix\Wallet\Interfaces\Product;
 use Bavix\Wallet\Models\Transfer;
+use Bavix\Wallet\Models\Wallet;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\DB;
@@ -156,7 +157,7 @@ public function paid(Product $product, bool $gifts = false): ?Transfer
          * @var Model $product
          * @var Transfer $query
          */
-        $query = $this->transfers();
+        $query = $this->holderTransfers();
         return $query
             ->where('to_type', $product->getMorphClass())
             ->where('to_id', $product->getKey())

src/Traits/CanPayFloat.php

@@ -17,6 +17,7 @@ trait CanPayFloat
         CanPay::assemble insteadof HasWalletFloat;
         CanPay::change insteadof HasWalletFloat;
         CanPay::transactions insteadof HasWalletFloat;
+        CanPay::holderTransfers insteadof HasWalletFloat;
         CanPay::transfers insteadof HasWalletFloat;
         CanPay::wallet insteadof HasWalletFloat;
         CanPay::getBalanceAttribute insteadof HasWalletFloat;

src/Traits/HasWallet.php

@@ -296,6 +296,20 @@ public function forceTransfer(Wallet $wallet, int $amount, ?array $meta = null,
         });
     }
 
+    /**
+     * holder transfers
+     *
+     * @return MorphMany
+     */
+    public function holderTransfers(): MorphMany
+    {
+        if ($this instanceof WalletModel) {
+            return $this->holder->transfers();
+        }
+
+        return $this->transfers();
+    }
+
     /**
      * the transfer table is used to confirm the payment
      * this method receives all transfers
@@ -304,8 +318,7 @@ public function forceTransfer(Wallet $wallet, int $amount, ?array $meta = null,
      */
     public function transfers(): MorphMany
     {
-        return ($this instanceof WalletModel ? $this->holder : $this)
-            ->morphMany(config('wallet.transfer.model'), 'from');
+        return $this->morphMany(config('wallet.transfer.model'), 'from');
     }
 
     /**
@@ -318,6 +331,7 @@ 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'),

src/Traits/HasWallets.php

@@ -26,6 +26,11 @@ trait HasWallets
      */
     private $_wallets = [];
 
+    /**
+     * @var bool
+     */
+    private $_loadedWallets = false;
+
     /**
      * Get wallet by slug
      *
@@ -43,6 +48,14 @@ trait HasWallets
      */
     public function getWallet(string $slug): ?WalletModel
     {
+        if (!$this->_loadedWallets && $this->relationLoaded('wallets')) {
+            $this->_loadedWallets = true;
+            $wallets = $this->getRelation('wallets');
+            foreach ($wallets as $wallet) {
+                $this->_wallets[$wallet->slug] = $wallet;
+            }
+        }
+
         if (!\array_key_exists($slug, $this->_wallets)) {
             $this->_wallets[$slug] = $this->wallets()
                 ->where('slug', $slug)