added filters to reports

2018-11-01 16:58:31 +03:00
parent de7dd930ab
commit 6c95593082
15 changed files with 303 additions and 112 deletions
--- 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');