From bcddd423c77533fe4ba23ea3381b878ef4fcdb09 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 22 Aug 2023 09:41:24 +1000 Subject: [PATCH 1/2] Adjustments for without_deleted_clients query --- app/Filters/QueryFilters.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index e58f88c8c388..718ba25a4f26 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -298,7 +298,7 @@ abstract class QueryFilters { return $this->builder->where(function ($query) { $query->whereHas('client', function ($sub_query) { - $sub_query->where('is_deleted', 0); + $sub_query->where('is_deleted', 0)->where('deleted_at', null); })->orWhere('client_id', null); }); } @@ -310,7 +310,7 @@ abstract class QueryFilters { return $this->builder->where(function ($query) { $query->whereHas('vendor', function ($sub_query) { - $sub_query->where('is_deleted', 0); + $sub_query->where('is_deleted', 0)->where('deleted_at', null); })->orWhere('vendor_id', null); }); } From 20b73914602ad64045295a4426ff0304626be455 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 22 Aug 2023 17:19:50 +1000 Subject: [PATCH 2/2] v5.7.3 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 3b867ccd76c3..23900d674daa 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.7.0 \ No newline at end of file +5.7.3 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 646f456a9cd1..1739429de555 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION','5.7.0'), - 'app_tag' => env('APP_TAG','5.7.0'), + 'app_version' => env('APP_VERSION','5.7.3'), + 'app_tag' => env('APP_TAG','5.7.3'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),