close #2023 Changed: Add all report date filter.

akaunting · May 5, 2021 · 535da27 · 535da27
1 parent cc35956
commit 535da27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php
@@ -2,6 +2,7 @@
 
 namespace App\Abstracts;
 
+use App\Traits\DateTime;
 use App\Traits\Tenants;
 use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Model as Eloquent;
@@ -11,7 +12,7 @@
 
 abstract class Model extends Eloquent
 {
-    use Cachable, SearchString, SoftDeletes, Sortable, Tenants;
+    use Cachable, DateTime, SearchString, SoftDeletes, Sortable, Tenants;
 
     protected $tenantable = true;
 

diff --git a/app/Listeners/Report/AddDate.php b/app/Listeners/Report/AddDate.php
@@ -39,7 +39,7 @@ public function handleFilterShowing(FilterShowing $event)
      */
     public function handleFilterApplying(FilterApplying $event)
     {
-        if ($this->skipThisClass($event)) {
+        if (empty($event->args['date_field'])) {
             return;
         }