diff --git a/app/Http/Controllers/Dashboard/Dashboard.php b/app/Http/Controllers/Dashboard/Dashboard.php index abe69377b..726d8750f 100644 --- a/app/Http/Controllers/Dashboard/Dashboard.php +++ b/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); diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php index bdef4360d..36e7e5074 100644 --- a/app/Models/Expense/Payment.php +++ b/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. * diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php index 11f2e8390..5ee965c0b 100644 --- a/app/Models/Income/Revenue.php +++ b/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. *