Merge pull request #40 from bavix/3.0

3.0-Dev: Architecture correction

Author: rez1dent3

.gitignore

@@ -3,3 +3,5 @@ composer.phar
 composer.lock
 .idea/
 build/
+.phpunit.result.cache
+.php_cs_cache

.phpstorm.meta.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace PHPSTORM_META {
+
+    use Bavix\Wallet\Models\Transaction;
+    use Bavix\Wallet\Models\Transfer;
+    use Bavix\Wallet\Models\Wallet;
+    use Bavix\Wallet\Services\CommonService;
+    use Bavix\Wallet\Services\ProxyService;
+    use Bavix\Wallet\Services\WalletService;
+
+    override(\app(0), map([
+        CommonService::class => CommonService::class,
+        ProxyService::class => ProxyService::class,
+        WalletService::class => WalletService::class,
+        Wallet::class => Wallet::class,
+        Transfer::class => Transfer::class,
+        Transaction::class => Transaction::class,
+    ]));
+
+}

.scrutinizer.yml

@@ -2,7 +2,7 @@ build:
 
   environment:
     php:
-      version: 7.1
+      version: 7.2
 
   nodes:
     analysis:

README.md

@@ -13,11 +13,11 @@
 
 laravel-wallet - Easy work with virtual wallet.
 
-[[Documentation](https://laravel-wallet.bavix.ru/)] 
-[[Get Started](https://laravel-wallet.bavix.ru/2.2/basic-usage)] 
+[[Documentation](https://bavix.github.io/laravel-wallet/)] 
+[[Get Started](https://bavix.github.io/laravel-wallet/#/basic-usage)] 
 
-[[Документация](https://laravel-wallet.bavix.ru/2.2-ru)] 
-[[Как начать](https://laravel-wallet.bavix.ru/2.2-ru/basic-usage)] 
+[[Документация](https://bavix.github.io/laravel-wallet/#/ru/)] 
+[[Как начать](https://bavix.github.io/laravel-wallet/#/ru/basic-usage)] 
 
 * **Vendor**: bavix
 * **Package**: laravel-wallet
@@ -28,19 +28,7 @@ laravel-wallet - Easy work with virtual wallet.
 
 ### Upgrade Guide
 
-To perform the migration, you will be [helped by the instruction](https://laravel-wallet.bavix.ru/2.2/upgrade-guide).
-
-### Run Migrations
-Publish the migrations with this artisan command:
-```bash
-php artisan vendor:publish --tag=laravel-wallet-migrations
-```
-
-### Configuration
-You can publish the config file with this artisan command:
-```bash
-php artisan vendor:publish --tag=laravel-wallet-config
-```
+To perform the migration, you will be [helped by the instruction](https://bavix.github.io/laravel-wallet/#/upgrade-guide).
 
 ### Usage
 Add the `HasWallet` trait and `Wallet` interface to model.
@@ -93,7 +81,7 @@ class Item extends Model implements Product
 {
     use HasWallet;
 
-    public function canBuy(Customer $customer, bool $force = false): bool
+    public function canBuy(Customer $customer, int $quantity = 1, bool $force = null): bool
     {
         /**
          * If the service can be purchased once, then
@@ -115,6 +103,11 @@ class Item extends Model implements Product
             'price' => $this->getAmountProduct(),
         ];
     }
+    
+    public function getUniqueId(): string
+    {
+        return (string)$this->getKey();
+    }
 }
 ```
 

changelog.md

@@ -5,6 +5,48 @@ 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 service `CommonService`
+- Add service `ProxyService`
+- Add service `WalletService`
+- Add object Bring (simple transfer)
+- Add object Operation (simple transaction)
+- Add feature Cart (multi pay + quantity)
+- Add method `payFreeCart`
+- Add method `safePayCart`
+- Add method `payCart`
+- Add method `forcePayCart`
+- Add method `safeRefundCart`
+- Add method `refundCart`
+- Add method `forceRefundCart`
+- Add method `safeRefundGiftCart`
+- Add method `refundGiftCart`
+- Add method `forceRefundGiftCart`
+- Add method `getUniqueId` to Interface `Product`
+
+### Changed
+- applied fixes from cs-fixer
+- change singleton path `bavix.wallet::transaction` to `Bavix\Wallet\Models\Transaction::class`
+- change singleton path `bavix.wallet::transfer` to `Bavix\Wallet\Models\Transfer::class`
+- change singleton path `bavix.wallet::wallet` to `Bavix\Wallet\Models\Wallet::class`
+- change method `canBuy`. Added parameter `$quantity`
+
+### Removed
+- method `calculateBalance`.
+- method `holderTransfers`.
+- attribute `$status` from Interfaces/Wallet::transfer
+- attribute `$status` from Interfaces/Wallet::safeTransfer
+- attribute `$status` from Interfaces/Wallet::forceTransfer
+- attribute `$status` from Interfaces/WalletFloat::transfer
+- attribute `$status` from Interfaces/WalletFloat::safeTransfer
+- attribute `$status` from Interfaces/WalletFloat::forceTransfer
+- class `Tax`
+- class `WalletProxy`
+- protected method `checkAmount`
+- protected method `assemble`
+- protected method `change`
+- protected method `holderTransfers`
+- protected method `addBalance`
 
 ## [2.4.1] - 2019-05-17
 ### Fixed

composer.json

@@ -25,13 +25,14 @@
   "require": {
     "php": "^7.1",
     "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
+    "nesbot/carbon": "^1.20|^2.0",
     "doctrine/dbal": "^2.8",
     "ramsey/uuid": "^3.0"
   },
   "require-dev": {
-    "mockery/mockery": "^1.2",
     "orchestra/testbench": "^3.7",
-    "phpunit/phpunit": "^7.5"
+    "phpstan/phpstan": "^0.11.7",
+    "phpunit/phpunit": "^7.5|^8.1"
   },
   "autoload": {
     "psr-4": {

config/config.php

@@ -4,6 +4,11 @@
     'package' => [
         'coefficient' => 100.,
     ],
+    'services' => [
+        'common' => \Bavix\Wallet\Services\CommonService::class,
+        'proxy' => \Bavix\Wallet\Services\ProxyService::class,
+        'wallet' => \Bavix\Wallet\Services\WalletService::class,
+    ],
     'transaction' => [
         'table' => 'transactions',
         'model' => \Bavix\Wallet\Models\Transaction::class,

database/migrations_v2/2018_11_15_124230_create_wallets_table.php

@@ -2,6 +2,7 @@
 
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Wallet;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
@@ -47,8 +48,8 @@ public function up(): void
             ->selectRaw('? as name', [$default])
             ->selectRaw('? as slug', [$slug])
             ->selectRaw('sum(amount) as balance')
-            ->selectRaw('? as created_at', [\Carbon\Carbon::now()])
-            ->selectRaw('? as updated_at', [\Carbon\Carbon::now()])
+            ->selectRaw('? as created_at', [Carbon::now()])
+            ->selectRaw('? as updated_at', [Carbon::now()])
             ->groupBy('holder_type', 'holder_id')
             ->orderBy('holder_type');
 

database/migrations_v2/2019_05_13_111553_update_status_transfers_table.php

@@ -2,6 +2,8 @@
 
 use Bavix\Wallet\Models\Transfer;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\MySqlConnection;
+use Illuminate\Database\PostgresConnection;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
@@ -29,16 +31,16 @@ public function up(): void
             Transfer::STATUS_GIFT,
         ];
 
-        if (DB::connection() instanceof \Illuminate\Database\MySqlConnection) {
+        if (DB::connection() instanceof MySqlConnection) {
             $table = $this->table();
-            $enumString = \implode('\', \'', $enums);
+            $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 \Illuminate\Database\PostgresConnection) {
+        if (DB::connection() instanceof PostgresConnection) {
             $this->alterEnum($this->table(), 'status', $enums);
             $this->alterEnum($this->table(), 'status_last', $enums);
             return;
@@ -74,16 +76,16 @@ public function down(): void
             Transfer::STATUS_GIFT,
         ];
 
-        if (DB::connection() instanceof \Illuminate\Database\MySqlConnection) {
+        if (DB::connection() instanceof MySqlConnection) {
             $table = $this->table();
-            $enumString = \implode('\', \'', $enums);
+            $enumString = implode('\', \'', $enums);
             $default = Transfer::STATUS_PAID;
             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 \Illuminate\Database\PostgresConnection) {
+        if (DB::connection() instanceof PostgresConnection) {
             $this->alterEnum($this->table(), 'status', $enums);
             $this->alterEnum($this->table(), 'status_last', $enums);
             return;
@@ -112,7 +114,7 @@ protected function alterEnum($table, $field, array $options): void
 
         $enumList = [];
 
-        foreach($options as $option) {
+        foreach ($options as $option) {
             $enumList[] = sprintf("'%s'::CHARACTER VARYING", $option);
         }