From 6c44c53a6007165298388d5de037d08f5af50460 Mon Sep 17 00:00:00 2001
From: Sevan Nerse <nerse.sevan@gmail.com>
Date: Tue, 23 Mar 2021 17:32:39 +0300
Subject: [PATCH] date filter on dashboard will work fiscal year based
 akaunting/software#78

---
 app/Http/Controllers/Common/Dashboards.php | 14 +++++++-------
 app/Traits/DateTime.php                    |  4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php
index f32382c46..f255d5e36 100644
--- a/app/Http/Controllers/Common/Dashboards.php
+++ b/app/Http/Controllers/Common/Dashboards.php
@@ -50,13 +50,6 @@ class Dashboards extends Controller
      */
     public function show($dashboard_id = null)
     {
-        $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']]);
-        }
-
         $dashboard_id = $dashboard_id ?? session('dashboard_id');
 
         try {
@@ -79,6 +72,13 @@ class Dashboards extends Controller
             return Widgets::canShow($widget->class);
         });
 
+        $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('common.dashboards.show', compact('dashboard', 'widgets', 'date_picker_shortcuts'));
     }
 
diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php
index 96e82d41b..61f987ff9 100644
--- a/app/Traits/DateTime.php
+++ b/app/Traits/DateTime.php
@@ -150,6 +150,10 @@ trait DateTime
             $this_quarter = $quarter;
         }
 
+        if (!isset($this_quarter)) {
+            $this_quarter = $financial_quarters[0];
+        }
+
         $date_picker_shortcuts = [
             trans('reports.this_year') => [
                 'start' => $financial_year->getStartDate()->format('Y-m-d'),