diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index a72c03ee1..ff19da333 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -101,6 +101,12 @@ class ExpenseSummary extends Controller private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field) { foreach ($items as $item) { + if ($item['table'] == 'bill_payments') { + $bill = $item->bill; + + $item->category_id = $bill->category_id; + } + $date = Date::parse($item->$date_field)->format('F'); if (!isset($expenses[$item->category_id])) { diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index c8a65b73e..b09cc7dc1 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -138,6 +138,12 @@ class IncomeExpenseSummary extends Controller private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field) { foreach ($items as $item) { + if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') { + $type_item = $item->$type; + + $item->category_id = $type_item->category_id; + } + $date = Date::parse($item->$date_field)->format('F'); $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 16f05aa73..0d72c6ecc 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -101,6 +101,12 @@ class IncomeSummary extends Controller private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field) { foreach ($items as $item) { + if ($item['table'] == 'invoice_payments') { + $invoice = $item->invoice; + + $item->category_id = $invoice->category_id; + } + $date = Date::parse($item->$date_field)->format('F'); if (!isset($incomes[$item->category_id])) { diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index 1726aeb18..96cecddb1 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -155,6 +155,12 @@ class ProfitLoss extends Controller private function setAmount(&$totals, &$compares, $items, $type, $date_field) { foreach ($items as $item) { + if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') { + $type_item = $item->$type; + + $item->category_id = $type_item->category_id; + } + $date = Date::parse($item->$date_field)->quarter; $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php index 45e74ab60..5638c05e6 100644 --- a/app/Http/Controllers/Reports/TaxSummary.php +++ b/app/Http/Controllers/Reports/TaxSummary.php @@ -103,6 +103,12 @@ class TaxSummary extends Controller private function setAmount(&$items, &$totals, $rows, $type, $date_field) { foreach ($rows as $row) { + if ($row['table'] == 'bill_payments' || $row['table'] == 'invoice_payments') { + $type_row = $row->$type; + + $row->category_id = $type_row->category_id; + } + $date = Date::parse($row->$date_field)->format('M'); if ($date_field == 'paid_at') {