Merge pull request #51 from bavix/3.1

Exchangeable

Author: rez1dent3

.phpstorm.meta.php

@@ -2,20 +2,24 @@
 
 namespace PHPSTORM_META {
 
+    use Bavix\Wallet\Interfaces\Rateable;
     use Bavix\Wallet\Models\Transaction;
     use Bavix\Wallet\Models\Transfer;
     use Bavix\Wallet\Models\Wallet;
     use Bavix\Wallet\Services\CommonService;
+    use Bavix\Wallet\Services\ExchangeService;
     use Bavix\Wallet\Services\ProxyService;
     use Bavix\Wallet\Services\WalletService;
 
     override(\app(0), map([
+        ExchangeService::class => ExchangeService::class,
         CommonService::class => CommonService::class,
         ProxyService::class => ProxyService::class,
         WalletService::class => WalletService::class,
         Wallet::class => Wallet::class,
         Transfer::class => Transfer::class,
         Transaction::class => Transaction::class,
+        Rateable::class => Rateable::class,
     ]));
 
 }

README.md

@@ -23,7 +23,7 @@ laravel-wallet - Easy work with virtual wallet.
 * **Package**: laravel-wallet
 * **Version**: [![Latest Stable Version](https://poser.pugx.org/bavix/laravel-wallet/v/stable)](https://packagist.org/packages/bavix/laravel-wallet)
 * **PHP Version**: 7.1+ 
-* **Laravel Version**: `5.5`, `5.6`, `5.7`, `5.8`
+* **Laravel Version**: `5.5`, `5.6`, `5.7`, `5.8`, `5.9`
 * **[Composer](https://getcomposer.org/):** `composer require bavix/laravel-wallet`
 
 ### Upgrade Guide

changelog.md

@@ -6,6 +6,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.0] - 2019-07-27
+### Added
+- Add exchange method's.
+- Add confirm method's.
+- Add method `hasWallet`, sometimes required to verify wallet existence.
+- Add currency service (create usd, eur,...).
+- Add `MinimalTaxable`.
+- Add `Taxable`.
+- New exception's.
+- Add decimal places (replacement ratio).
+
+### Changed
+- Updated dependencies (composer.json).
+- New status `exchange`.
+
+### Fixed
+- Wallet is not always created. #63 #51 
+- Migration mariadb, pgsql, mysql. 
+- Fix documentation.
+- Optimize code, fasted 1.1x.
+
+### Deprecated
+- class `Taxing`.
+
+### Remove
+- The ability to change the ratio  `coefficient`.
+- Removed private and protected methods, the traits turned out to be more clean.
+
 ## [3.0.4] - 2019-07-22
 ### Fixed
 - fixed PostgresSQL 11
@@ -313,7 +341,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.0.4...HEAD
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/bavix/laravel-wallet/compare/3.0.4...3.1.0
 [3.0.4]: https://github.com/bavix/laravel-wallet/compare/3.0.3...3.0.4
 [3.0.3]: https://github.com/bavix/laravel-wallet/compare/3.0.2...3.0.3
 [3.0.2]: https://github.com/bavix/laravel-wallet/compare/3.0.1...3.0.2

composer.json

@@ -31,8 +31,8 @@
   },
   "require-dev": {
     "orchestra/testbench": "^3.7",
-    "phpstan/phpstan": "^0.11.7",
-    "phpunit/phpunit": "^7.5|^8.1"
+    "phpstan/phpstan": "^0.11",
+    "phpunit/phpunit": "^7.5|^8.2"
   },
   "autoload": {
     "psr-4": {

config/config.php

@@ -2,9 +2,10 @@
 
 return [
     'package' => [
-        'coefficient' => 100.,
+        'rateable' => \Bavix\Wallet\Simple\Rate::class,
     ],
     'services' => [
+        'exchange' => \Bavix\Wallet\Services\ExchangeService::class,
         'common' => \Bavix\Wallet\Services\CommonService::class,
         'proxy' => \Bavix\Wallet\Services\ProxyService::class,
         'wallet' => \Bavix\Wallet\Services\WalletService::class,

database/migrations_v2/2019_06_25_103755_add_exchange_status_transfers_table.php

@@ -0,0 +1,101 @@
+<?php
+
+use Bavix\Wallet\Models\Transfer;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\MySqlConnection;
+use Illuminate\Database\PostgresConnection;
+use Illuminate\Support\Facades\DB;
+
+class AddExchangeStatusTransfersTable extends Migration
+{
+
+    /**
+     * @return string
+     */
+    protected function table(): string
+    {
+        return (new Transfer())->getTable();
+    }
+
+    /**
+     * @return void
+     */
+    public function up(): void
+    {
+        $enums = [
+            Transfer::STATUS_EXCHANGE,
+            Transfer::STATUS_TRANSFER,
+            Transfer::STATUS_PAID,
+            Transfer::STATUS_REFUND,
+            Transfer::STATUS_GIFT,
+        ];
+
+        if (DB::connection() instanceof MySqlConnection) {
+            $table = $this->table();
+            $enumString = implode('\', \'', $enums);
+            $default = Transfer::STATUS_TRANSFER;
+            DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'");
+            DB::statement("ALTER TABLE $table CHANGE COLUMN status_last status_last ENUM('$enumString') NULL");
+            return;
+        }
+
+        if (DB::connection() instanceof PostgresConnection) {
+            $this->alterEnum($this->table(), 'status', $enums);
+            $this->alterEnum($this->table(), 'status_last', $enums);
+            return;
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function down(): void
+    {
+        $enums = [
+            Transfer::STATUS_TRANSFER,
+            Transfer::STATUS_PAID,
+            Transfer::STATUS_REFUND,
+            Transfer::STATUS_GIFT,
+        ];
+
+        if (DB::connection() instanceof MySqlConnection) {
+            $table = $this->table();
+            $enumString = implode('\', \'', $enums);
+            $default = Transfer::STATUS_TRANSFER;
+            DB::statement("ALTER TABLE $table CHANGE COLUMN status status ENUM('$enumString') NOT NULL DEFAULT '$default'");
+            DB::statement("ALTER TABLE $table CHANGE COLUMN status_last status_last ENUM('$enumString') NULL");
+            return;
+        }
+
+        if (DB::connection() instanceof PostgresConnection) {
+            $this->alterEnum($this->table(), 'status', $enums);
+            $this->alterEnum($this->table(), 'status_last', $enums);
+            return;
+        }
+    }
+
+    /**
+     * Alter an enum field constraints
+     * @param $table
+     * @param $field
+     * @param array $options
+     */
+    protected function alterEnum($table, $field, array $options): void
+    {
+        $check = "${table}_${field}_check";
+
+        $enumList = [];
+
+        foreach ($options as $option) {
+            $enumList[] = sprintf("'%s'::CHARACTER VARYING", $option);
+        }
+
+        $enumString = implode(', ', $enumList);
+
+        DB::transaction(function () use ($table, $field, $check, $options, $enumString) {
+            DB::statement(sprintf('ALTER TABLE %s DROP CONSTRAINT %s;', $table, $check));
+            DB::statement(sprintf('ALTER TABLE %s ADD CONSTRAINT %s CHECK (%s::TEXT = ANY (ARRAY[%s]::TEXT[]))', $table, $check, $field, $enumString));
+        });
+    }
+
+}

database/migrations_v2/2019_07_29_184926_decimal_places_wallets_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Bavix\Wallet\Models\Wallet;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class DecimalPlacesWalletsTable extends Migration
+{
+
+    /**
+     * @return string
+     */
+    protected function table(): string
+    {
+        return (new Wallet())->getTable();
+    }
+
+    /**
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::table($this->table(), function (Blueprint $table) {
+            $table->smallInteger('decimal_places')
+                ->default(2)
+                ->after('balance');
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::table($this->table(), function (Blueprint $table) {
+            $table->dropColumn('decimal_places');
+        });
+    }
+
+}

docs/_sidebar.md

@@ -12,15 +12,25 @@
     - [Withdraw](withdraw)
     - [Transfer](transfer)
     - [Refresh balance](refresh)
+    - [Confirm](confirm)
+<!--    - [Exchange](exchange)-->
+    - [Withdraw taxing](taxing)
 
 - Purchases
 
     - [Payment](payment)
-    - [Cart](cart)
     - [Payment Free](pay-free)
     - [Refund](refund)
+    - [Gift](gift)
+    - [Cart](cart)
 
 - Multi Wallets
 
     - [New Wallet](new-wallet)
     - [Transfer](wallet-transfer)
+
+<!--- Currencies-->
+
+<!--    - [Rate Service](rate)-->
+<!--    - [Create Wallet](rate-wallet)-->
+<!--    - [Taxing](rate-taxing)-->

docs/confirm.md

@@ -0,0 +1,34 @@
+## User Model
+
+Add the `CanConfirm` trait and `Confirmable` interface to your User model.
+
+```php
+use Bavix\Wallet\Interfaces\Confirmable;
+use Bavix\Wallet\Interfaces\Wallet;
+use Bavix\Wallet\Traits\CanConfirm;
+use Bavix\Wallet\Traits\HasWallet;
+
+class UserConfirm extends Model implements Wallet, Confirmable
+{
+    use HasWallet, CanConfirm;
+}
+```
+
+### Example:
+
+Sometimes you need to create an operation and confirm its field. 
+That is what this trey does.
+
+```php
+$user->balance; // int(0)
+$transaction = $user->deposit(100, null, false); // not confirm
+$transaction->confirmed; // bool(false)
+$user->balance; // int(0)
+
+$user->confirm($transaction); // bool(true)
+$transaction->confirmed; // bool(true)
+
+$user->balance; // int(100) 
+```
+
+It worked! 

docs/exchange.md

@@ -0,0 +1,4 @@
+### Exchange
+
+A description of this feature will appear later. Wait! 
+For now you can study to see the code in the unit test.