From 707fe1dfdc6815915ed4f5d7dff9883977bfce03 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 10 Sep 2021 22:14:38 +1000 Subject: [PATCH 1/2] Minor fixes --- app/Http/Controllers/BaseController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index d5d34f06b4ac..b0bef7adb3aa 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -391,7 +391,7 @@ class BaseController extends Controller 'company.documents'=> function ($query) use ($created_at, $user) { $query->where('created_at', '>=', $created_at); }, - 'company.groups' => function ($query) use ($created_at, $user) { + 'company.groups'=> function ($query) use ($created_at, $user) { $query->where('created_at', '>=', $created_at)->with('documents'); }, @@ -399,7 +399,7 @@ class BaseController extends Controller $query->where('created_at', '>=', $created_at); }, - 'company.tax_rates' => function ($query) use ($created_at, $user) { + 'company.tax_rates'=> function ($query) use ($created_at, $user) { $query->where('created_at', '>=', $created_at); }, From c9f940e914af241f2083dc71c6eb0d40151dc847 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 10 Sep 2021 22:49:57 +1000 Subject: [PATCH 2/2] Fixes for initial queries --- app/Http/Controllers/BaseController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index b0bef7adb3aa..ebbcc1c3ee8f 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -316,7 +316,7 @@ class BaseController extends Controller }, 'company.tax_rates'=> function ($query) use ($updated_at, $user) { - $query->where('updated_at', '>=', $updated_at); + $query->whereNotNull('updated_at'); }, 'company.vendors'=> function ($query) use ($updated_at, $user) { $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents'); @@ -329,7 +329,7 @@ class BaseController extends Controller $query->where('updated_at', '>=', $updated_at); }, 'company.task_statuses'=> function ($query) use ($updated_at, $user) { - $query->where('updated_at', '>=', $updated_at); + $query->whereNotNull('updated_at'); }, 'company.activities'=> function ($query) use($user) {