Merge pull request #102 from bavix/fee-fix

Fee fix

Author: rez1dent3

.scrutinizer.yml

@@ -1,5 +1,4 @@
 build:
-
   environment:
     php:
       version: 7.2
@@ -19,6 +18,7 @@ build:
           coverage:
             file: 'some-file'
             format: 'clover'
+          idle_timeout: 900
 
 filter:
   excluded_paths: [tests/*, database/*, config/*]

.travis.yml

@@ -15,6 +15,8 @@ matrix:
     - php: 'nightly'
 
 before_script:
+  - mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d
+  - bash <(curl -s https://raw.githubusercontent.com/php-cache/cache/master/build/php/7.1/Memcached.sh)
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - if [ $(phpenv version-name) = "7.3" ]; then ./cc-test-reporter before-build; fi

changelog.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.2.1] - 2019-09-10
+### Fixed
+- Fixed calculation of commission for exchange #101 @haojingliu 
+- Update docs #99 @abishekrsrikaanth 
+
 ## [3.2.0] - 2019-08-16
 ### Added
 - Race condition problem resolved #82 @kak2z7702 #22 @sidor555 

docs/basic-usage.md

@@ -30,6 +30,9 @@ $user->balance; // int(-191)
 ## Purchases
 
 Add the `CanPay` trait and `Customer` interface to your `User` model.
+
+> The trait `CanPay` already inherits `HasWallet`, reuse will cause an error.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;

docs/cart.md

@@ -2,6 +2,8 @@
 
 Add the `CanPay` trait and `Customer` interface to your User model.
 
+> The trait `CanPay` already inherits `HasWallet`, reuse will cause an error.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;

docs/gift.md

@@ -2,6 +2,8 @@
 
 Add the `CanPay` trait and `Customer` interface to your User model.
 
+> The trait `CanPay` already inherits `HasWallet`, reuse will cause an error.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;

docs/pay-free.md

@@ -2,6 +2,8 @@
 
 Add the `CanPay` trait and `Customer` interface to your User model.
 
+> The trait `CanPay` already inherits `HasWallet`, reuse will cause an error.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;

docs/payment.md

@@ -2,6 +2,8 @@
 
 Add the `CanPay` trait and `Customer` interface to your User model.
 
+> The trait `CanPay` already inherits `HasWallet`, reuse will cause an error.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;

docs/refund.md

@@ -2,6 +2,8 @@
 
 Add the `CanPay` trait and `Customer` interface to your User model.
 
+> The trait `CanPay` already inherits `HasWallet`, reuse will cause an error.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;

docs/ru/basic-usage.md

@@ -32,6 +32,8 @@ $user->balance; // int(-191)
 Добавим `CanPay` trait и `Customer` interface в модель `User`.
 Это наш покупатель.
 
+> Трейт `CanPay` уже наследует `HasWallet`, повторное использование вызовет ошибку.
+
 ```php
 use Bavix\Wallet\Traits\CanPay;
 use Bavix\Wallet\Interfaces\Customer;