shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added filters to reports

Browse Source
This commit is contained in:
denisdulici
2018-11-01 16:58:31 +03:00
parent de7dd930ab
commit 6c95593082
15 changed files with 303 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Reports/TaxSummary.php
View File

@ -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)