Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9437 from turbo124/v5-develop

Browse Source 
v5.8.45
This commit is contained in:
David Bomba 2024-04-06 10:08:37 +11:00 committed by GitHub
commit 77bd6224bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.44 5.8.45

13
app/Filters/TaskFilters.php
View File

@ -150,6 +150,19 @@ class TaskFilters extends QueryFilters
return $this->builder->orderBy($sort_col[0], $dir); return $this->builder->orderBy($sort_col[0], $dir);
} }
public function user_id(string $user = ''): Builder
{
if (strlen($user) == 0) {
return $this->builder;
}
return $this->builder->where(function ($query) use ($user) {
$query->where('user_id', $this->decodePrimaryKey($user))
->orWhere('assigned_user_id', $this->decodePrimaryKey($user));
});
}
public function task_status(string $value = ''): Builder public function task_status(string $value = ''): Builder
{ {
if (strlen($value) == 0) { if (strlen($value) == 0) {

6
app/Utils/Traits/SubscriptionHooker.php
View File

@ -48,7 +48,11 @@ trait SubscriptionHooker
RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false, RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false,
]); ]);
return array_merge($body, json_decode($response->getBody(), true)); if($response_body = json_decode($response->getBody(), true))
return array_merge($body, $response_body);
return array_merge($body, ['message' => 'Success', 'status_code' => 200]);
} catch (ClientException $e) { } catch (ClientException $e) {
$message = $e->getMessage(); $message = $e->getMessage();

4
config/ninja.php
View File

@ -17,8 +17,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.8.44'), 'app_version' => env('APP_VERSION', '5.8.45'),
'app_tag' => env('APP_TAG', '5.8.44'), 'app_tag' => env('APP_TAG', '5.8.45'),
'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', false), 'api_secret' => env('API_SECRET', false),