close #420 Fixed: Reports - Income Summary - Paid Tab - Not adding income categories

2018-07-19 14:54:23 +03:00
parent 5a4bed7e04
commit 4c497c3f60
5 changed files with 30 additions and 0 deletions
--- 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') {