added filters to reports

app/Http/Controllers/Reports/ExpenseSummary.php

@@ -3,9 +3,11 @@
 namespace App\Http\Controllers\Reports;
 
 use App\Http\Controllers\Controller;
+use App\Models\Banking\Account;
 use App\Models\Expense\Bill;
 use App\Models\Expense\BillPayment;
 use App\Models\Expense\Payment;
+use App\Models\Expense\Vendor;
 use App\Models\Setting\Category;
 use App\Utilities\Recurring;
 use Charts;
@@ -23,13 +25,16 @@ class ExpenseSummary extends Controller
         $dates = $totals = $expenses = $expenses_graph = $categories = [];
 
         $status = request('status');
+        $year = request('year', Date::now()->year);
 
         $categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray();
 
-        // Get year
-        $year = request('year');
-        if (empty($year)) {
-            $year = Date::now()->year;
+        if ($categories_filter = request('categories')) {
+            $cats = collect($categories)->filter(function ($value, $key) use ($categories_filter) {
+                return in_array($key, $categories_filter);
+            });
+        } else {
+            $cats = $categories;
         }
 
         // Dates
@@ -45,7 +50,7 @@ class ExpenseSummary extends Controller
                 'currency_rate' => 1
             );
 
-            foreach ($categories as $category_id => $category_name) {
+            foreach ($cats as $category_id => $category_name) {
                 $expenses[$category_id][$dates[$j]] = array(
                     'category_id' => $category_id,
                     'name' => $category_name,
@@ -56,12 +61,12 @@ class ExpenseSummary extends Controller
             }
         }
 
-        $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get();
+        $payments = Payment::monthsOfYear('paid_at')->account(request('accounts'))->vendor(request('vendors'))->isNotTransfer()->get();
 
         switch ($status) {
             case 'paid':
                 // Bills
-                $bills = BillPayment::monthsOfYear('paid_at')->get();
+                $bills = BillPayment::monthsOfYear('paid_at')->account(request('accounts'))->get();
                 $this->setAmount($expenses_graph, $totals, $expenses, $bills, 'bill', 'paid_at');
 
                 // Payments
@@ -69,7 +74,7 @@ class ExpenseSummary extends Controller
                 break;
             case 'upcoming':
                 // Bills
-                $bills = Bill::accrued()->monthsOfYear('due_at')->get();
+                $bills = Bill::accrued()->monthsOfYear('due_at')->vendor(request('vendors'))->get();
                 Recurring::reflect($bills, 'bill', 'billed_at', $status);
                 $this->setAmount($expenses_graph, $totals, $expenses, $bills, 'bill', 'due_at');
 
@@ -79,7 +84,7 @@ class ExpenseSummary extends Controller
                 break;
             default:
                 // Bills
-                $bills = Bill::accrued()->monthsOfYear('billed_at')->get();
+                $bills = Bill::accrued()->monthsOfYear('billed_at')->vendor(request('vendors'))->get();
                 Recurring::reflect($bills, 'bill', 'billed_at', $status);
                 $this->setAmount($expenses_graph, $totals, $expenses, $bills, 'bill', 'billed_at');
 
@@ -89,6 +94,15 @@ class ExpenseSummary extends Controller
                 break;
         }
 
+        $statuses = collect([
+            'all' => trans('general.all'),
+            'paid' => trans('invoices.paid'),
+            'upcoming' => trans('dashboard.payables'),
+        ]);
+
+        $accounts = Account::enabled()->pluck('name', 'id')->toArray();
+        $vendors = Vendor::enabled()->pluck('name', 'id')->toArray();
+
         // Check if it's a print or normal request
         if (request('print')) {
             $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print';
@@ -107,16 +121,33 @@ class ExpenseSummary extends Controller
             ->credits(false)
             ->view($chart_template);
 
-        return view($view_template, compact('chart', 'dates', 'categories', 'expenses', 'totals'));
+        return view($view_template, compact('chart', 'dates', 'categories', 'statuses', 'vendors', 'expenses', 'totals'));
     }
 
     private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field)
     {
         foreach ($items as $item) {
-            if ($item->getTable() == 'bill_payments') {
-                $bill = $item->bill;
+            switch ($item->getTable()) {
+                case 'bill_payments':
+                    $bill = $item->bill;
 
-                $item->category_id = $bill->category_id;
+                    if ($vendors = request('vendors')) {
+                        if (!in_array($bill->vendor_id, $vendors)) {
+                            continue;
+                        }
+                    }
+
+                    $item->category_id = $bill->category_id;
+                    break;
+                case 'bills':
+                    if ($accounts = request('accounts')) {
+                        foreach ($item->payments as $payment) {
+                            if (!in_array($payment->account_id, $accounts)) {
+                                continue 2;
+                            }
+                        }
+                    }
+                    break;
             }
 
             $date = Date::parse($item->$date_field)->format('F');