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

fixed total widgets

Browse Source
This commit is contained in:
Denis Duliçi 2021-01-23 23:29:22 +03:00
parent 9c0cc9ae87
commit c2299d2208
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Document/Document.php
View File

@ -132,8 +132,7 @@ class Document extends Model
public function transactions()
{
return $this->hasMany('App\Models\Banking\Transaction', 'document_id')
->where('type', config('type.' . $this->type . '.transaction_type'));
return $this->hasMany('App\Models\Banking\Transaction', 'document_id');
}
public function totals_sorted()

2
app/Widgets/TotalExpenses.php
View File

@ -18,7 +18,7 @@ class TotalExpenses extends Widget
{
$current = $open = $overdue = 0;
$this->applyFilters(Transaction::expense()->isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current) {
$this->applyFilters(Transaction::expense()->isNotTransfer())->each(function ($transaction) use (&$current) {
$current += $transaction->getAmountConvertedToDefault();
});

2
app/Widgets/TotalIncome.php
View File

@ -18,7 +18,7 @@ class TotalIncome extends Widget
{
$current = $open = $overdue = 0;
$this->applyFilters(Transaction::income()->isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current) {
$this->applyFilters(Transaction::income()->isNotTransfer())->each(function ($transaction) use (&$current) {
$current += $transaction->getAmountConvertedToDefault();
});

2
app/Widgets/TotalProfit.php
View File

@ -19,7 +19,7 @@ class TotalProfit extends Widget
$current_income = $open_invoice = $overdue_invoice = 0;
$current_expenses = $open_bill = $overdue_bill = 0;
$this->applyFilters(Transaction::isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current_income, &$current_expenses) {
$this->applyFilters(Transaction::isNotTransfer())->each(function ($transaction) use (&$current_income, &$current_expenses) {
$amount = $transaction->getAmountConvertedToDefault();
if ($transaction->type == 'income') {