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 #8603 from turbo124/v5-develop

Browse Source 
v5.6.6
This commit is contained in:
David Bomba 2023-07-05 08:45:03 +10:00 committed by GitHub
commit 412cefd6c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.6.5
5.6.6

2
app/Models/Client.php
View File

@ -91,7 +91,6 @@ use Laracasts\Presenter\PresentableTrait;
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $gateway_tokens
* @property-read int|null $gateway_tokens_count
* @property-read mixed $hashed_id
* @property-read \App\Models\GroupSetting|null $group_settings
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
* @property-read int|null $invoices_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $ledger
@ -112,6 +111,7 @@ use Laracasts\Presenter\PresentableTrait;
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
* @property-read int|null $system_logs_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
* @property-read int|null $tasks_count
* @property-read \App\Models\User $user
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel company()

4
config/ninja.php
View File

@ -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' => '5.6.5',
'app_tag' => '5.6.5',
'app_version' => '5.6.6',
'app_tag' => '5.6.6',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

2
phpstan.neon
View File

@ -2,6 +2,8 @@ includes:
- ./vendor/nunomaduro/larastan/extension.neon
parameters:
parallel:
processTimeout: 300.0
treatPhpDocTypesAsCertain: false
ignoreErrors:
- '#Call to an undefined method .*badMethod\(\)#'

14
tests/Integration/UpdateCompanyUserTest.php
View File

@ -56,7 +56,7 @@ class UpdateCompanyUserTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences', $settings);
])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences?include=company_user', $settings);
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
$this->assertNotNull($message);
@ -66,9 +66,8 @@ class UpdateCompanyUserTest extends TestCase
$arr = $response->json();
$this->assertTrue($arr['data']['react_settings']['show_pdf_preview']);
$this->assertFalse($arr['data']['react_settings']['react_notification_link']);
$this->assertTrue($arr['data']['company_user']['react_settings']['show_pdf_preview']);
$this->assertFalse($arr['data']['company_user']['react_settings']['react_notification_link']);
$settings = [
'react_settings' => [
@ -83,7 +82,7 @@ class UpdateCompanyUserTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences', $settings);
])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences?include=company_user', $settings);
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
$this->assertNotNull($message);
@ -93,9 +92,8 @@ class UpdateCompanyUserTest extends TestCase
$arr = $response->json();
$this->assertFalse($arr['data']['react_settings']['show_pdf_preview']);
$this->assertTrue($arr['data']['react_settings']['react_notification_link']);
$this->assertFalse($arr['data']['company_user']['react_settings']['show_pdf_preview']);
$this->assertTrue($arr['data']['company_user']['react_settings']['react_notification_link']);
}