diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 85586d971..ac0a6336e 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/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'); diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 080b18e16..2a9083b40 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -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'; diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index b33726272..7caddad55 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -3,6 +3,8 @@ 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; @@ -23,13 +25,16 @@ class IncomeSummary extends Controller $dates = $totals = $incomes = $incomes_graph = $categories = []; $status = request('status'); + $year = request('year', Date::now()->year); $categories = Category::enabled()->type('income')->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,23 +50,23 @@ class IncomeSummary extends Controller 'currency_rate' => 1 ); - foreach ($categories as $category_id => $category_name) { - $incomes[$category_id][$dates[$j]] = array( + foreach ($cats as $category_id => $category_name) { + $incomes[$category_id][$dates[$j]] = [ 'category_id' => $category_id, 'name' => $category_name, 'amount' => 0, 'currency_code' => setting('general.default_currency'), 'currency_rate' => 1 - ); + ]; } } - $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get(); + $revenues = Revenue::monthsOfYear('paid_at')->account(request('accounts'))->customer(request('customers'))->isNotTransfer()->get(); switch ($status) { case 'paid': // Invoices - $invoices = InvoicePayment::monthsOfYear('paid_at')->get(); + $invoices = InvoicePayment::monthsOfYear('paid_at')->account(request('accounts'))->get(); $this->setAmount($incomes_graph, $totals, $incomes, $invoices, 'invoice', 'paid_at'); // Revenues @@ -69,7 +74,7 @@ class IncomeSummary 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', 'invoiced_at', $status); $this->setAmount($incomes_graph, $totals, $incomes, $invoices, 'invoice', 'due_at'); @@ -79,7 +84,7 @@ class IncomeSummary 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($incomes_graph, $totals, $incomes, $invoices, 'invoice', 'invoiced_at'); @@ -89,6 +94,15 @@ class IncomeSummary extends Controller break; } + $statuses = collect([ + 'all' => trans('general.all'), + 'paid' => trans('invoices.paid'), + 'upcoming' => trans('dashboard.receivables'), + ]); + + $accounts = Account::enabled()->pluck('name', 'id')->toArray(); + $customers = Customer::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 IncomeSummary extends Controller ->credits(false) ->view($chart_template); - return view($view_template, compact('chart', 'dates', 'categories', 'incomes', 'totals')); + return view($view_template, compact('chart', 'dates', 'categories', 'statuses', 'accounts', 'customers', 'incomes', 'totals')); } private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field) { foreach ($items as $item) { - if ($item->getTable() == 'invoice_payments') { - $invoice = $item->invoice; + switch ($item->getTable()) { + case 'invoice_payments': + $invoice = $item->invoice; - $item->category_id = $invoice->category_id; + if ($customers = request('customers')) { + if (!in_array($invoice->customer_id, $customers)) { + continue; + } + } + + $item->category_id = $invoice->category_id; + break; + case 'invoices': + 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'); diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index 96cecddb1..6b07dff0c 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -25,17 +25,12 @@ class ProfitLoss extends Controller $dates = $totals = $compares = $categories = []; $status = request('status'); + $year = request('year', Date::now()->year); $income_categories = Category::enabled()->type('income')->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; - } - // Dates for ($j = 1; $j <= 12; $j++) { $dates[$j] = Date::parse($year . '-' . $j)->quarter; @@ -142,6 +137,12 @@ class ProfitLoss extends Controller $this->setAmount($totals, $compares, $payments, 'payment', 'paid_at'); } + $statuses = collect([ + 'all' => trans('general.all'), + 'paid' => trans('invoices.paid'), + 'upcoming' => trans('general.upcoming'), + ]); + // Check if it's a print or normal request if (request('print')) { $view_template = 'reports.profit_loss.print'; @@ -149,7 +150,7 @@ class ProfitLoss extends Controller $view_template = 'reports.profit_loss.index'; } - return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals', 'gross')); + return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals', 'gross', 'statuses')); } private function setAmount(&$totals, &$compares, $items, $type, $date_field) diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php index 5638c05e6..fbee9ccc3 100644 --- a/app/Http/Controllers/Reports/TaxSummary.php +++ b/app/Http/Controllers/Reports/TaxSummary.php @@ -27,17 +27,12 @@ class TaxSummary extends Controller $dates = $incomes = $expenses = $totals = []; $status = request('status'); + $year = request('year', Date::now()->year); $t = Tax::enabled()->where('rate', '<>', '0')->pluck('name')->toArray(); $taxes = array_combine($t, $t); - // Get year - $year = request('year'); - if (empty($year)) { - $year = Date::now()->year; - } - // Dates for ($j = 1; $j <= 12; $j++) { $dates[$j] = Date::parse($year . '-' . $j)->format('M'); @@ -90,6 +85,12 @@ class TaxSummary extends Controller break; } + $statuses = collect([ + 'all' => trans('general.all'), + 'paid' => trans('invoices.paid'), + 'upcoming' => trans('general.upcoming'), + ]); + // Check if it's a print or normal request if (request('print')) { $view_template = 'reports.tax_summary.print'; @@ -97,7 +98,7 @@ class TaxSummary extends Controller $view_template = 'reports.tax_summary.index'; } - return view($view_template, compact('dates', 'taxes', 'incomes', 'expenses', 'totals')); + return view($view_template, compact('dates', 'taxes', 'incomes', 'expenses', 'totals', 'statuses')); } private function setAmount(&$items, &$totals, $rows, $type, $date_field) diff --git a/app/Models/Model.php b/app/Models/Model.php index a52cad77a..9d78d5ba5 100644 --- a/app/Models/Model.php +++ b/app/Models/Model.php @@ -127,4 +127,31 @@ class Model extends Eloquent { return $query->where('reconciled', $value); } + + public function scopeAccount($query, $accounts) + { + if (empty($accounts)) { + return; + } + + return $query->whereIn('account_id', (array) $accounts); + } + + public function scopeCustomer($query, $customers) + { + if (empty($customers)) { + return; + } + + return $query->whereIn('customer_id', (array) $customers); + } + + public function scopeVendor($query, $vendors) + { + if (empty($vendors)) { + return; + } + + return $query->whereIn('vendor_id', (array) $vendors); + } } diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index 974fffeef..afa8e346b 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -25,12 +25,7 @@ trait DateTime public function scopeMonthsOfYear($query, $field) { - $year = request('year'); - - // Get current year if not set - if (empty($year)) { - $year = Date::now()->year; - } + $year = request('year', Date::now()->year); $start = Date::parse($year . '-01-01')->format('Y-m-d'); $end = Date::parse($year . '-12-31')->format('Y-m-d'); diff --git a/public/css/app.css b/public/css/app.css index ba9862cb6..d1c251efb 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -843,3 +843,16 @@ input[type="number"] { .row.show-invoice .timeline>li a:first-child { margin-left: 10px; } + +.box-filter { + margin-left: 5px; +} + +.box-filter .select2.select2-container.select2-container--default { + width: 160px !important; + margin-top: -2px; +} + +.box-filter .select2-container .select2-selection--multiple { + min-height: 30px !important; +} diff --git a/resources/views/reports/expense_summary/body.blade.php b/resources/views/reports/expense_summary/body.blade.php index ba036df75..f7849f83c 100644 --- a/resources/views/reports/expense_summary/body.blade.php +++ b/resources/views/reports/expense_summary/body.blade.php @@ -25,7 +25,7 @@ @endforeach @else - +
{{ trans('general.no_records') }}
diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php index 1f6e0e052..f60450d8c 100644 --- a/resources/views/reports/expense_summary/index.blade.php +++ b/resources/views/reports/expense_summary/index.blade.php @@ -9,17 +9,15 @@ @section('content')
-
- +
{!! Form::open(['url' => 'reports/expense-summary', 'role' => 'form', 'method' => 'GET']) !!} -
- @stack('year_input_start') +
{!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} - @stack('year_input_end') + {!! Form::select('status', $statuses, request('status'), ['class' => 'form-control input-filter input-sm']) !!} + {!! Form::select('accounts[]', $accounts, request('accounts'), ['id' => 'filter-accounts', 'class' => 'form-control input-filter input-lg', 'multiple' => 'multiple']) !!} + {!! Form::select('vendors[]', $vendors, request('vendors'), ['id' => 'filter-vendors', 'class' => 'form-control input-filter input-lg', 'multiple' => 'multiple']) !!} + {!! Form::select('categories[]', $categories, request('categories'), ['id' => 'filter-categories', 'class' => 'form-control input-filter input-lg', 'multiple' => 'multiple']) !!} + {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
{!! Form::close() !!}
@@ -28,3 +26,21 @@
@endsection + +@push('scripts') + +@endpush diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php index 920ff3de0..6089c292f 100644 --- a/resources/views/reports/income_expense_summary/index.blade.php +++ b/resources/views/reports/income_expense_summary/index.blade.php @@ -9,17 +9,16 @@ @section('content')
-
- +
{!! Form::open(['url' => 'reports/income-expense-summary', 'role' => 'form', 'method' => 'GET']) !!} -
- @stack('year_input_start') +
{!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} - @stack('year_input_end') + {!! Form::select('status', $statuses, request('status'), ['class' => 'form-control input-filter input-sm']) !!} + {!! Form::select('accounts[]', $accounts, request('accounts'), ['id' => 'filter-accounts', 'class' => 'form-control input-filter', 'multiple' => 'multiple']) !!} + {!! Form::select('customers[]', $customers, request('customers'), ['id' => 'filter-customers', 'class' => 'form-control input-filter', 'multiple' => 'multiple']) !!} + {!! Form::select('vendors[]', $vendors, request('vendors'), ['id' => 'filter-vendors', 'class' => 'form-control input-filter', 'multiple' => 'multiple']) !!} + {!! Form::select('categories[]', $categories, request('categories'), ['id' => 'filter-categories', 'class' => 'form-control input-filter', 'multiple' => 'multiple']) !!} + {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
{!! Form::close() !!}
@@ -28,3 +27,25 @@
@endsection + +@push('scripts') + +@endpush diff --git a/resources/views/reports/income_summary/body.blade.php b/resources/views/reports/income_summary/body.blade.php index c42f7c3ea..a9bc3744f 100644 --- a/resources/views/reports/income_summary/body.blade.php +++ b/resources/views/reports/income_summary/body.blade.php @@ -25,7 +25,7 @@ @endforeach @else - +
{{ trans('general.no_records') }}
diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php index c3f0d3b30..4b1811d96 100644 --- a/resources/views/reports/income_summary/index.blade.php +++ b/resources/views/reports/income_summary/index.blade.php @@ -9,17 +9,15 @@ @section('content')
-
- +
{!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!} -
- @stack('year_input_start') +
{!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} - @stack('year_input_end') + {!! Form::select('status', $statuses, request('status'), ['class' => 'form-control input-filter input-sm']) !!} + {!! Form::select('accounts[]', $accounts, request('accounts'), ['id' => 'filter-accounts', 'class' => 'form-control input-filter input-lg', 'multiple' => 'multiple']) !!} + {!! Form::select('customers[]', $customers, request('customers'), ['id' => 'filter-customers', 'class' => 'form-control input-filter input-lg', 'multiple' => 'multiple']) !!} + {!! Form::select('categories[]', $categories, request('categories'), ['id' => 'filter-categories', 'class' => 'form-control input-filter input-lg', 'multiple' => 'multiple']) !!} + {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
{!! Form::close() !!}
@@ -28,3 +26,21 @@
@endsection + +@push('scripts') + +@endpush \ No newline at end of file diff --git a/resources/views/reports/profit_loss/index.blade.php b/resources/views/reports/profit_loss/index.blade.php index 2f55f2f88..8888a03f0 100644 --- a/resources/views/reports/profit_loss/index.blade.php +++ b/resources/views/reports/profit_loss/index.blade.php @@ -9,17 +9,12 @@ @section('content')
-
- +
{!! Form::open(['url' => 'reports/profit-loss', 'role' => 'form', 'method' => 'GET']) !!} -
- @stack('year_input_start') +
{!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} - @stack('year_input_end') + {!! Form::select('status', $statuses, request('status'), ['class' => 'form-control input-filter input-sm']) !!} + {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
{!! Form::close() !!}
diff --git a/resources/views/reports/tax_summary/index.blade.php b/resources/views/reports/tax_summary/index.blade.php index 550a066fa..5fd1038d5 100644 --- a/resources/views/reports/tax_summary/index.blade.php +++ b/resources/views/reports/tax_summary/index.blade.php @@ -9,17 +9,12 @@ @section('content')
-
- +
{!! Form::open(['url' => 'reports/tax-summary', 'role' => 'form', 'method' => 'GET']) !!} -
- @stack('year_input_start') +
{!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} - @stack('year_input_end') + {!! Form::select('status', $statuses, request('status'), ['class' => 'form-control input-filter input-sm']) !!} + {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
{!! Form::close() !!}