close #238 Fixed: Transfers are incorrectly being added as income under the Dashboard

app/Http/Controllers/Dashboard/Dashboard.php

@@ -339,7 +339,7 @@ class Dashboard extends Controller
             }
         }
 
-        $items_1 = $m1::whereBetween('paid_at', [$start, $end])->get();
+        $items_1 = $m1::whereBetween('paid_at', [$start, $end])->isNotTransfer()->get();
 
         $this->setCashFlowTotals($totals, $items_1, $date_format, $period);
 

app/Models/Expense/Payment.php

@@ -3,6 +3,7 @@
 namespace App\Models\Expense;
 
 use App\Models\Model;
+use App\Models\Setting\Category;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 use Bkwld\Cloner\Cloneable;
@@ -68,6 +69,28 @@ class Payment extends Model
         return $this->hasMany('App\Models\Banking\Transfer');
     }
 
+    /**
+     * Get only transfers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsTransfer($query)
+    {
+        return $query->where('category_id', '=', Category::transfer());
+    }
+
+    /**
+     * Skip transfers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsNotTransfer($query)
+    {
+        return $query->where('category_id', '<>', Category::transfer());
+    }
+
     /**
      * Convert amount to double.
      *

app/Models/Income/Revenue.php

@@ -3,6 +3,7 @@
 namespace App\Models\Income;
 
 use App\Models\Model;
+use App\Models\Setting\Category;
 use App\Traits\Currencies;
 use App\Traits\DateTime;
 use Bkwld\Cloner\Cloneable;
@@ -74,6 +75,28 @@ class Revenue extends Model
         return $this->hasMany('App\Models\Banking\Transfer');
     }
 
+    /**
+     * Get only transfers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsTransfer($query)
+    {
+        return $query->where('category_id', '=', Category::transfer());
+    }
+
+    /**
+     * Skip transfers.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsNotTransfer($query)
+    {
+        return $query->where('category_id', '<>', Category::transfer());
+    }
+
     /**
      * Convert amount to double.
      *