add gift's

Author: rez1dent3

changelog.md

@@ -6,10 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added 
-- File changelog.md
+- File changelog.
+- Add `HasGift` trait.
+- Added status column to the `transfers` table.
+- Added status_last column to the `transfers` table.
+
+### Fixed
+- Due to the addition of new functionality "gifts" 
+there are possible problems that need to be addressed. 
+Namely, when returning the goods, 
+the funds would not be returned to 
+the person who paid for it. 
+Which would raise a lot of questions.
 
 ### Changed
 - Composer.json: add new keywords.
+- the $gifts argument (Boolean type) is added to 
+the paid, refund, safeRefund, forceRefund method's.
+
+### Removed
+- Removed column `refund` from `transfers` table. 
+Now it has been replaced by the status column.
 
 ## [2.0.1] - 2018-11-21
 ### Added 

database/migrations_v2/2018_11_22_131953_add_status_transfers_table.php

@@ -0,0 +1,63 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Bavix\Wallet\Models\Transfer;
+
+class AddStatusTransfersTable extends Migration
+{
+
+    /**
+     * @return string
+     */
+    protected function table(): string
+    {
+        return (new Transfer())->getTable();
+    }
+
+    /**
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::table($this->table(), function(Blueprint $table) {
+            $enums = [
+                Transfer::STATUS_PAID,
+                Transfer::STATUS_REFUND,
+                Transfer::STATUS_GIFT,
+            ];
+
+            $table->enum('status', $enums)
+                ->default(Transfer::STATUS_PAID)
+                ->after('to_id');
+
+            $table->enum('status_last', $enums)
+                ->nullable()
+                ->after('status');
+        });
+
+        DB::table($this->table())
+            ->where('refund', true)
+            ->update([
+                'status' => Transfer::STATUS_REFUND,
+                'status_last' => Transfer::STATUS_PAID,
+            ]);
+    }
+
+    /**
+     * @return void
+     */
+    public function down(): void
+    {
+        DB::table($this->table())
+            ->where('status', Transfer::STATUS_REFUND)
+            ->update(['refund' => true,]);
+
+        Schema::table($this->table(), function (Blueprint $table) {
+            $table->dropColumn(['status', 'status_last']);
+        });
+    }
+
+}

database/migrations_v2/2018_11_22_133438_drop_refund_transfers_table.php

@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\SQLiteConnection;
+use Illuminate\Support\Facades\DB;
+use Bavix\Wallet\Models\Transfer;
+
+class DropRefundTransfersTable extends Migration
+{
+
+    /**
+     * @return string
+     */
+    protected function table(): string
+    {
+        return (new Transfer())->getTable();
+    }
+
+    /**
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::table($this->table(), function(Blueprint $table) {
+            if (!(DB::connection() instanceof SQLiteConnection)) {
+                $table->dropIndex('from_to_refund_ind');
+                $table->dropIndex('from_refund_ind');
+                $table->dropIndex('to_refund_ind');
+            }
+
+            $table->dropColumn('refund');
+        });
+    }
+
+    /**
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::table($this->table(), function (Blueprint $table) {
+            $table->boolean('refund')
+                ->after('withdraw_id')
+                ->default(0);
+
+            $table->index(['from_type', 'from_id', 'to_type', 'to_id', 'refund'], 'from_to_refund_ind');
+            $table->index(['from_type', 'from_id', 'refund'], 'from_refund_ind');
+            $table->index(['to_type', 'to_id', 'refund'], 'to_refund_ind');
+        });
+    }
+
+}

src/Interfaces/Customer.php

@@ -32,29 +32,33 @@ public function forcePay(Product $product): Transfer;
 
     /**
      * @param Product $product
+     * @param bool $gifts
      * @return null|Transfer
      */
-    public function paid(Product $product): ?Transfer;
+    public function paid(Product $product, bool $gifts = false): ?Transfer;
 
     /**
      * @param Product $product
      * @param bool $force
+     * @param bool $gifts
      * @return bool
      * @throws
      */
-    public function refund(Product $product, bool $force = false): bool;
+    public function refund(Product $product, bool $force = false, bool $gifts = false): bool;
 
     /**
      * @param Product $product
      * @param bool $force
+     * @param bool $gifts
      * @return bool
      */
-    public function safeRefund(Product $product, bool $force = false): bool;
+    public function safeRefund(Product $product, bool $force = false, bool $gifts = false): bool;
 
     /**
      * @param Product $product
+     * @param bool $gifts
      * @return bool
      */
-    public function forceRefund(Product $product): bool;
+    public function forceRefund(Product $product, bool $gifts = false): bool;
 
 }

src/Models/Transaction.php

@@ -16,6 +16,7 @@
  * @property int $amount
  * @property bool $confirmed
  * @property array $meta
+ * @property \Bavix\Wallet\Interfaces\Wallet $payable
  */
 class Transaction extends Model
 {

src/Models/Transfer.php

@@ -10,13 +10,13 @@
  * Class Transfer
  * @package Bavix\Wallet\Models
  *
+ * @property string $status
  * @property int $deposit_id
  * @property int $withdraw_id
  * @property string $from_type
  * @property int $from_id
  * @property string $to_type
  * @property int $to_id
- * @property bool $refund
  * @property string $uuid
  * @property int $fee
  *
@@ -26,17 +26,21 @@
 class Transfer extends Model
 {
 
+    public const STATUS_PAID = 'paid';
+    public const STATUS_REFUND = 'refund';
+    public const STATUS_GIFT = 'gift';
+
     /**
      * @var array
      */
     protected $fillable = [
+        'status',
         'deposit_id',
         'withdraw_id',
         'from_type',
         'from_id',
         'to_type',
         'to_id',
-        'refund',
         'uuid',
         'fee',
     ];

src/Models/Wallet.php

@@ -5,6 +5,7 @@
 use Bavix\Wallet\Interfaces\Customer;
 use Bavix\Wallet\Interfaces\WalletFloat;
 use Bavix\Wallet\Traits\CanBePaidFloat;
+use Bavix\Wallet\Traits\HasGift;
 use Bavix\Wallet\WalletProxy;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
@@ -21,6 +22,7 @@ class Wallet extends Model implements Customer, WalletFloat
 {
 
     use CanBePaidFloat;
+    use HasGift;
 
     /**
      * @var array

src/Traits/CanBePaid.php

@@ -72,69 +72,93 @@ public function forcePay(Product $product): Transfer
 
     /**
      * @param Product $product
+     * @param bool $gifts
      * @return null|Transfer
      */
-    public function paid(Product $product): ?Transfer
+    public function paid(Product $product, bool $gifts = false): ?Transfer
     {
+        $status = [Transfer::STATUS_PAID];
+        if ($gifts) {
+            $status[] = Transfer::STATUS_GIFT;
+        }
+        
         /**
          * @var Model $product
+         * @var Transfer $query
          */
-        return $this->transfers()
+        $query = $this->transfers();
+        return $query
             ->where('to_type', $product->getMorphClass())
             ->where('to_id', $product->getKey())
-            ->where('refund', 0)
+            ->whereIn('status', $status)
             ->orderBy('id', 'desc')
             ->first();
     }
 
     /**
      * @param Product $product
      * @param bool $force
+     * @param bool $gifts
      * @return bool
      * @throws
      */
-    public function refund(Product $product, bool $force = false): bool
+    public function refund(Product $product, bool $force = false, bool $gifts = false): bool
     {
-        $transfer = $this->paid($product);
+        $transfer = $this->paid($product, $gifts);
 
         if (!$transfer) {
             throw (new ModelNotFoundException())
                 ->setModel($this->transfers()->getMorphClass());
         }
 
         return DB::transaction(function () use ($product, $transfer, $force) {
+            $transfer->load('withdraw.payable');
+
             if ($force) {
-                $product->forceTransfer($this, $transfer->deposit->amount, $product->getMetaProduct());
+                $product->forceTransfer(
+                    $transfer->withdraw->payable,
+                    $transfer->deposit->amount,
+                    $product->getMetaProduct()
+                );
             } else {
-                $product->transfer($this, $transfer->deposit->amount, $product->getMetaProduct());
+                $product->transfer(
+                    $transfer->withdraw->payable,
+                    $transfer->deposit->amount,
+                    $product->getMetaProduct()
+                );
             }
 
-            return $transfer->update(['refund' => 1]);
+            return $transfer->update([
+                'status' => Transfer::STATUS_REFUND,
+                'status_last' => $transfer->status,
+            ]);
         });
     }
 
     /**
      * @param Product $product
      * @param bool $force
+     * @param bool $gifts
      * @return bool
      */
-    public function safeRefund(Product $product, bool $force = false): bool
+    public function safeRefund(Product $product, bool $force = false, bool $gifts = false): bool
     {
         try {
-            return $this->refund($product, $force);
+            return $this->refund($product, $force, $gifts);
         } catch (\Throwable $throwable) {
             return false;
         }
     }
 
     /**
      * @param Product $product
+     * @param bool $gifts
      * @return bool
      * @throws
      */
-    public function forceRefund(Product $product): bool
+    public function forceRefund(Product $product, bool $gifts = false): bool
     {
-        return $this->refund($product, true);
+        return $this->refund($product, true, $gifts);
     }
 
 }