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

Portal dashboard added date filter

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-06-04 16:21:05 +03:00
parent a42429bf12
commit 9432009f0e
3 changed files with 132 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/Portal/Dashboard.php
View File

@ -4,12 +4,13 @@ namespace App\Http\Controllers\Portal;
use App\Models\Document\Document;
use App\Traits\Charts;
use App\Traits\DateTime;
use App\Utilities\Chartjs;
use Date;
class Dashboard
{
use Charts;
use Charts, DateTime;
/**
* Display a listing of the resource.
@ -20,14 +21,25 @@ class Dashboard
{
$contact = user()->contact;
$invoices = Document::invoice()->accrued()->where('contact_id', $contact->id)->get();
$financial_start = $this->getFinancialStart()->format('Y-m-d');
$start = Date::parse(request('start', Date::today()->startOfYear()->format('Y-m-d')));
$end = Date::parse(request('end', Date::today()->endOfYear()->format('Y-m-d')));
// check and assign year start
if (($year_start = Date::today()->startOfYear()->format('Y-m-d')) !== $financial_start) {
$year_start = $financial_start;
}
$start = Date::parse(request('start_date', $year_start));
$end = Date::parse(request('end_date', Date::parse($year_start)->addYear(1)->subDays(1)->format('Y-m-d')));
//$invoices = Document::invoice()->accrued()->where('contact_id', $contact->id)->get();
$invoices = Document::invoice()->accrued()->whereBetween('due_at', [$start, $end])->where('contact_id', $contact->id)->get();
$start_month = $start->month;
$end_month = $end->month;
// look cashFlow widget
$end_month = $end->diffInMonths($start);
$start_month = 0;
// Monthly
$labels = [];
@ -89,7 +101,14 @@ class Dashboard
])
->fill(false);
return view('portal.dashboard.index', compact('contact', 'invoices', 'totals', 'progress', 'chart'));
$date_picker_shortcuts = $this->getDatePickerShortcuts();
if (!request()->has('start_date')) {
request()->merge(['start_date' => $date_picker_shortcuts[trans('reports.this_year')]['start']]);
request()->merge(['end_date' => $date_picker_shortcuts[trans('reports.this_year')]['end']]);
}
return view('portal.dashboard.index', compact('contact', 'invoices', 'totals', 'progress', 'chart', 'date_picker_shortcuts'));
}
private function calculateAmounts($invoices, $start, $end)