shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced revenues/payments with transactions

Browse Source
This commit is contained in:
denisdulici
2019-11-27 12:08:36 +03:00
parent e4d0de0677
commit 3a15c1d615
28 changed files with 139 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/Banking/Account.php
View File

@ -34,16 +34,16 @@ class Account extends Model
return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code');
}
public function revenues()
{
return $this->transactions()->where('type', 'income');
}
public function payments()
public function expense_transactions()
{
return $this->transactions()->where('type', 'expense');
}
public function income_transacions()
{
return $this->transactions()->where('type', 'income');
}
public function transactions()
{
return $this->hasMany('App\Models\Banking\Transaction');
@ -71,10 +71,10 @@ class Account extends Model
$total = $this->opening_balance;
// Sum Incomes
$total += $this->revenues->sum('amount');
$total += $this->income_transacions->sum('amount');
// Subtract Expenses
$total -= $this->payments->sum('amount');
$total -= $this->expense_transactions->sum('amount');
return $total;
}