added filters to reports
This commit is contained in:
@ -3,12 +3,15 @@
|
||||
namespace App\Http\Controllers\Reports;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Banking\Account;
|
||||
use App\Models\Income\Customer;
|
||||
use App\Models\Income\Invoice;
|
||||
use App\Models\Income\InvoicePayment;
|
||||
use App\Models\Income\Revenue;
|
||||
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;
|
||||
@ -26,16 +29,16 @@ class IncomeExpenseSummary extends Controller
|
||||
$dates = $totals = $compares = $profit_graph = $categories = [];
|
||||
|
||||
$status = request('status');
|
||||
$year = request('year', Date::now()->year);
|
||||
$categories_filter = request('categories');
|
||||
|
||||
$income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray();
|
||||
$income_categories = Category::enabled()->type('income')->when($categories_filter, function ($query) use ($categories_filter) {
|
||||
return $query->whereIn('id', $categories_filter);
|
||||
})->pluck('name', 'id')->toArray();
|
||||
|
||||
$expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray();
|
||||
|
||||
// Get year
|
||||
$year = request('year');
|
||||
if (empty($year)) {
|
||||
$year = Date::now()->year;
|
||||
}
|
||||
$expense_categories = Category::enabled()->type('expense')->when($categories_filter, function ($query) use ($categories_filter) {
|
||||
return $query->whereIn('id', $categories_filter);
|
||||
})->pluck('name', 'id')->toArray();
|
||||
|
||||
// Dates
|
||||
for ($j = 1; $j <= 12; $j++) {
|
||||
@ -71,20 +74,20 @@ class IncomeExpenseSummary extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
$revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get();
|
||||
$payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get();
|
||||
$revenues = Revenue::monthsOfYear('paid_at')->account(request('accounts'))->customer(request('customers'))->isNotTransfer()->get();
|
||||
$payments = Payment::monthsOfYear('paid_at')->account(request('accounts'))->vendor(request('vendors'))->isNotTransfer()->get();
|
||||
|
||||
switch ($status) {
|
||||
case 'paid':
|
||||
// Invoices
|
||||
$invoices = InvoicePayment::monthsOfYear('paid_at')->get();
|
||||
$invoices = InvoicePayment::monthsOfYear('paid_at')->account(request('accounts'))->get();
|
||||
$this->setAmount($profit_graph, $totals, $compares, $invoices, 'invoice', 'paid_at');
|
||||
|
||||
// Revenues
|
||||
$this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at');
|
||||
|
||||
// Bills
|
||||
$bills = BillPayment::monthsOfYear('paid_at')->get();
|
||||
$bills = BillPayment::monthsOfYear('paid_at')->account(request('accounts'))->get();
|
||||
$this->setAmount($profit_graph, $totals, $compares, $bills, 'bill', 'paid_at');
|
||||
|
||||
// Payments
|
||||
@ -92,7 +95,7 @@ class IncomeExpenseSummary extends Controller
|
||||
break;
|
||||
case 'upcoming':
|
||||
// Invoices
|
||||
$invoices = Invoice::accrued()->monthsOfYear('due_at')->get();
|
||||
$invoices = Invoice::accrued()->monthsOfYear('due_at')->customer(request('customers'))->get();
|
||||
Recurring::reflect($invoices, 'invoice', 'due_at', $status);
|
||||
$this->setAmount($profit_graph, $totals, $compares, $invoices, 'invoice', 'due_at');
|
||||
|
||||
@ -101,7 +104,7 @@ class IncomeExpenseSummary extends Controller
|
||||
$this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at');
|
||||
|
||||
// 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($profit_graph, $totals, $compares, $bills, 'bill', 'due_at');
|
||||
|
||||
@ -111,7 +114,7 @@ class IncomeExpenseSummary extends Controller
|
||||
break;
|
||||
default:
|
||||
// Invoices
|
||||
$invoices = Invoice::accrued()->monthsOfYear('invoiced_at')->get();
|
||||
$invoices = Invoice::accrued()->monthsOfYear('invoiced_at')->customer(request('customers'))->get();
|
||||
Recurring::reflect($invoices, 'invoice', 'invoiced_at', $status);
|
||||
$this->setAmount($profit_graph, $totals, $compares, $invoices, 'invoice', 'invoiced_at');
|
||||
|
||||
@ -120,7 +123,7 @@ class IncomeExpenseSummary extends Controller
|
||||
$this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at');
|
||||
|
||||
// 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($profit_graph, $totals, $compares, $bills, 'bill', 'billed_at');
|
||||
|
||||
@ -130,6 +133,17 @@ class IncomeExpenseSummary extends Controller
|
||||
break;
|
||||
}
|
||||
|
||||
$statuses = collect([
|
||||
'all' => trans('general.all'),
|
||||
'paid' => trans('invoices.paid'),
|
||||
'upcoming' => trans('general.upcoming'),
|
||||
]);
|
||||
|
||||
$accounts = Account::enabled()->pluck('name', 'id')->toArray();
|
||||
$customers = Customer::enabled()->pluck('name', 'id')->toArray();
|
||||
$vendors = Vendor::enabled()->pluck('name', 'id')->toArray();
|
||||
$categories = Category::enabled()->type(['income', 'expense'])->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';
|
||||
@ -148,7 +162,7 @@ class IncomeExpenseSummary extends Controller
|
||||
->credits(false)
|
||||
->view($chart_template);
|
||||
|
||||
return view($view_template, compact('chart', 'dates', 'income_categories', 'expense_categories', 'compares', 'totals'));
|
||||
return view($view_template, compact('chart', 'dates', 'income_categories', 'expense_categories', 'categories', 'statuses', 'accounts', 'customers', 'vendors', 'compares', 'totals'));
|
||||
}
|
||||
|
||||
private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field)
|
||||
@ -160,6 +174,41 @@ class IncomeExpenseSummary extends Controller
|
||||
$item->category_id = $type_item->category_id;
|
||||
}
|
||||
|
||||
switch ($item->getTable()) {
|
||||
case 'invoice_payments':
|
||||
$invoice = $item->invoice;
|
||||
|
||||
if ($customers = request('customers')) {
|
||||
if (!in_array($invoice->customer_id, $customers)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
$item->category_id = $invoice->category_id;
|
||||
break;
|
||||
case 'bill_payments':
|
||||
$bill = $item->bill;
|
||||
|
||||
if ($vendors = request('vendors')) {
|
||||
if (!in_array($bill->vendor_id, $vendors)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
$item->category_id = $bill->category_id;
|
||||
break;
|
||||
case 'invoices':
|
||||
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');
|
||||
|
||||
$group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense';
|
||||
|
Reference in New Issue
Block a user