diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 5d2a00c8c..151873539 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -150,9 +150,10 @@ class ExpenseSummary extends Controller break; } - $date = Date::parse($item->$date_field)->format('F'); + $month = Date::parse($item->$date_field)->format('F'); + $month_year = Date::parse($item->$date_field)->format('F-Y'); - if (!isset($expenses[$item->category_id])) { + if (!isset($expenses[$item->category_id]) || !isset($expenses[$item->category_id][$month]) || !isset($graph[$month_year])) { continue; } @@ -165,13 +166,13 @@ class ExpenseSummary extends Controller } } - $expenses[$item->category_id][$date]['amount'] += $amount; - $expenses[$item->category_id][$date]['currency_code'] = $item->currency_code; - $expenses[$item->category_id][$date]['currency_rate'] = $item->currency_rate; + $expenses[$item->category_id][$month]['amount'] += $amount; + $expenses[$item->category_id][$month]['currency_code'] = $item->currency_code; + $expenses[$item->category_id][$month]['currency_rate'] = $item->currency_rate; - $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; + $graph[$month_year] += $amount; - $totals[$date]['amount'] += $amount; + $totals[$month]['amount'] += $amount; } } } diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index f843b9cf2..2362551ec 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -209,11 +209,12 @@ class IncomeExpenseSummary extends Controller break; } - $date = Date::parse($item->$date_field)->format('F'); + $month = Date::parse($item->$date_field)->format('F'); + $month_year = Date::parse($item->$date_field)->format('F-Y'); $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - if (!isset($compares[$group][$item->category_id])) { + if (!isset($compares[$group][$item->category_id]) || !isset($compares[$group][$item->category_id][$month]) || !isset($graph[$month_year])) { continue; } @@ -226,18 +227,18 @@ class IncomeExpenseSummary extends Controller } } - $compares[$group][$item->category_id][$date]['amount'] += $amount; - $compares[$group][$item->category_id][$date]['currency_code'] = $item->currency_code; - $compares[$group][$item->category_id][$date]['currency_rate'] = $item->currency_rate; + $compares[$group][$item->category_id][$month]['amount'] += $amount; + $compares[$group][$item->category_id][$month]['currency_code'] = $item->currency_code; + $compares[$group][$item->category_id][$month]['currency_rate'] = $item->currency_rate; if ($group == 'income') { - $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; + $graph[$month_year] += $amount; - $totals[$date]['amount'] += $amount; + $totals[$month]['amount'] += $amount; } else { - $graph[Date::parse($item->$date_field)->format('F-Y')] -= $amount; + $graph[$month_year] -= $amount; - $totals[$date]['amount'] -= $amount; + $totals[$month]['amount'] -= $amount; } } } diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 003442665..a6b37ab28 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -150,9 +150,10 @@ class IncomeSummary extends Controller break; } - $date = Date::parse($item->$date_field)->format('F'); + $month = Date::parse($item->$date_field)->format('F'); + $month_year = Date::parse($item->$date_field)->format('F-Y'); - if (!isset($incomes[$item->category_id])) { + if (!isset($incomes[$item->category_id]) || !isset($incomes[$item->category_id][$month]) || !isset($graph[$month_year])) { continue; } @@ -165,13 +166,13 @@ class IncomeSummary extends Controller } } - $incomes[$item->category_id][$date]['amount'] += $amount; - $incomes[$item->category_id][$date]['currency_code'] = $item->currency_code; - $incomes[$item->category_id][$date]['currency_rate'] = $item->currency_rate; + $incomes[$item->category_id][$month]['amount'] += $amount; + $incomes[$item->category_id][$month]['currency_code'] = $item->currency_code; + $incomes[$item->category_id][$month]['currency_rate'] = $item->currency_rate; - $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; + $graph[$month_year] += $amount; - $totals[$date]['amount'] += $amount; + $totals[$month]['amount'] += $amount; } } } diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php index f60450d8c..7014b1b5b 100644 --- a/resources/views/reports/expense_summary/index.blade.php +++ b/resources/views/reports/expense_summary/index.blade.php @@ -12,7 +12,7 @@