Merge branch 'development' into 'transaction_bill_owner'

# Conflicts:
#   app/Http/Resources/TransactionResource.php

app/Models/Transaction.php

@@ -36,22 +36,6 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $this->BelongsTo(Booking::class, 'owner_id', 'id');
     }
 
-      /**
-     * @return MorphMany
-     */
-    public function wallets(): morphMany
-    {
-        return $this->morphMany(Wallet::class, 'owner');
-    }
-
-     /**
-     * @return BelongsTo
-     */
-    public function wallet(): BelongsTo
-    {
-        return $this->BelongsTo(Wallet::class, 'owner_id', 'id');
-    }
-
     /**
      * @return MorphMany
      */

app/Models/User.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Spatie\Permission\Traits\HasRoles;
 
 use Tymon\JWTAuth\Contracts\JWTSubject;
@@ -23,7 +24,7 @@ class User extends AbstractModel implements
     AuthorizableContract,
     CanResetPasswordContract
 {
-    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail;
+    use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes;
 
 
     /**

app/Models/Wallet.php

@@ -2,13 +2,14 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Transactionable;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
-class Wallet extends AbstractModel
+class Wallet extends AbstractModel implements Transactionable
 {
     use SoftDeletes;