diff --git a/app/Widgets/ExpensesByCategory.php b/app/Widgets/ExpensesByCategory.php index f131d67db..fcf068b05 100644 --- a/app/Widgets/ExpensesByCategory.php +++ b/app/Widgets/ExpensesByCategory.php @@ -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); }); diff --git a/app/Widgets/IncomeByCategory.php b/app/Widgets/IncomeByCategory.php index 1d0dbf43d..46fd72a52 100644 --- a/app/Widgets/IncomeByCategory.php +++ b/app/Widgets/IncomeByCategory.php @@ -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); });