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

not showing disabled categories in widgets

Browse Source
This commit is contained in:
denisdulici 2020-01-25 11:39:53 +03:00
parent 9fd944cb61
commit 0a13039cce
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Widgets/ExpensesByCategory.php
View File

@ -15,14 +15,12 @@ class ExpensesByCategory extends Widget
public function show()
{
Category::with('expense_transactions')->type('expense')->enabled()->each(function ($category) {
Category::with('expense_transactions')->type('expense')->each(function ($category) {
$amount = 0;
$transactions = $this->applyFilters($category->expense_transactions())->get();
foreach ($transactions as $transacion) {
$amount += $transacion->getAmountConvertedToDefault();
}
$this->applyFilters($category->expense_transactions())->each(function ($transaction) use (&$amount) {
$amount += $transaction->getAmountConvertedToDefault();
});
$this->addMoneyToDonut($category->color, $amount, $category->name);
});

10
app/Widgets/IncomeByCategory.php
View File

@ -15,14 +15,12 @@ class IncomeByCategory extends Widget
public function show()
{
Category::with('income_transacions')->type('income')->enabled()->each(function ($category) {
Category::with('income_transacions')->type('income')->each(function ($category) {
$amount = 0;
$transactions = $this->applyFilters($category->income_transacions())->get();
foreach ($transactions as $transacion) {
$amount += $transacion->getAmountConvertedToDefault();
}
$this->applyFilters($category->income_transacions())->each(function ($transaction) use (&$amount) {
$amount += $transaction->getAmountConvertedToDefault();
});
$this->addMoneyToDonut($category->color, $amount, $category->name);
});