diff --git a/VERSION.txt b/VERSION.txt index 57349115ece8..014a3048e716 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.23 \ No newline at end of file +5.3.24 \ No newline at end of file diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index ac6318bcf98a..bbb18e5cb713 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -176,7 +176,7 @@ abstract class QueryFilters public function is_deleted($value) { - return $this->builder->where('is_deleted', $value)->withTrashed(); + return $this->builder->where('is_deleted', $value); } @@ -207,4 +207,17 @@ abstract class QueryFilters return $this->builder; } + + public function with_trashed($value) + { + + if($value == 'true'){ + + $this->builder->withTrashed(); + + } + + return $this->builder; + + } } diff --git a/config/ninja.php b/config/ninja.php index a6fc87778173..9c2761858c33 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.23', - 'app_tag' => '5.3.23', + 'app_version' => '5.3.24', + 'app_tag' => '5.3.24', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),