Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-10 08:44:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8742 from turbo124/v5-develop

Browse Source 
v5.7.3
This commit is contained in:
David Bomba 2023-08-22 17:20:13 +10:00 committed by GitHub
commit efe6e5d45e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.0 5.7.3

4
app/Filters/QueryFilters.php
View File

@ -298,7 +298,7 @@ abstract class QueryFilters
{ {
return $this->builder->where(function ($query) { return $this->builder->where(function ($query) {
$query->whereHas('client', function ($sub_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); })->orWhere('client_id', null);
}); });
} }
@ -310,7 +310,7 @@ abstract class QueryFilters
{ {
return $this->builder->where(function ($query) { return $this->builder->where(function ($query) {
$query->whereHas('vendor', function ($sub_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); })->orWhere('vendor_id', null);
}); });
} }

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.7.0'), 'app_version' => env('APP_VERSION','5.7.3'),
'app_tag' => env('APP_TAG','5.7.0'), 'app_tag' => env('APP_TAG','5.7.3'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),