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

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2022-06-30 19:12:10 +10:00
commit f02cd08d80
10 changed files with 284540 additions and 282122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,9 @@ trait CompanySettingsSaver
elseif (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter') {
$value = 'integer';
if($key == 'besr_id')
$value = 'string';
if (! property_exists($settings, $key)) {
continue;
} elseif (! $this->checkAttribute($value, $settings->{$key})) {
@ -187,6 +190,9 @@ trait CompanySettingsSaver
if($key == 'gmail_sending_user_id')
$value = 'string';
if($key == 'besr_id')
$value = 'string';
if (! property_exists($settings, $key)) {
continue;
} elseif ($this->checkAttribute($value, $settings->{$key})) {

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

@ -200,9 +200,9 @@ trait MakesTemplateData
$data['$task.tax_name3'] = ['value' => 'CA Sales Tax', 'label' => ctrans('texts.tax')];
$data['$task.line_total'] = ['value' => '$100.00', 'label' => ctrans('texts.line_total')];
$data['$vendor_name'] = &$data['$client_name'];
$data['$vendor.name'] = &$data['$client_name'];
$data['$vendor'] = &$data['$client_name'];
$data['$vendor_name'] = ['value' => 'Joey Diaz Denkins', 'label' => ctrans('texts.vendor_name')];;
$data['$vendor.name'] = &$data['$vendor_name'];
$data['$vendor'] = &$data['$vendor_name'];
$data['$vendor.address1'] = &$data['$address1'];
$data['$vendor.address2'] = &$data['$address2'];

2
app/Utils/Traits/SettingsSaver.php
View File

@ -55,7 +55,7 @@ trait SettingsSaver
elseif (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter' || ($key == 'payment_terms' && strlen($settings->{$key}) >= 1) || ($key == 'valid_until' && strlen($settings->{$key}) >= 1)) {
$value = 'integer';
if($key == 'gmail_sending_user_id')
if($key == 'gmail_sending_user_id' || $key == 'besr_id')
$value = 'string';
if (! property_exists($settings, $key)) {

4
public/flutter_service_worker.js vendored
View File

@ -8,7 +8,7 @@ const RESOURCES = {
"canvaskit/profiling/canvaskit.js": "ae2949af4efc61d28a4a80fffa1db900",
"canvaskit/profiling/canvaskit.wasm": "95e736ab31147d1b2c7b25f11d4c32cd",
"canvaskit/canvaskit.wasm": "4b83d89d9fecbea8ca46f2f760c5a9ba",
"/": "a74757af1ea3d863d3b901f549f66929",
"/": "79e5988189d34782bbbaadfb1f2011a7",
"flutter.js": "0816e65a103ba8ba51b174eeeeb2cb67",
"icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
"icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
@ -39,7 +39,7 @@ const RESOURCES = {
"assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "b62641afc9ab487008e996a5c5865e56",
"assets/NOTICES": "9b6b63256d3a6491659b71127ee9f3b6",
"main.dart.js": "943526b26dd93b9a38f54ae32cdf6795"
"main.dart.js": "5ed5772a7344740c406c020c27314624"
};
// The application shell files that are downloaded before a service worker can

276736
public/main.dart.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/main.dart.js.map
View File

File diff suppressed because one or more lines are too long

275866
public/main.foss.dart.js vendored
View File

File diff suppressed because one or more lines are too long

12
public/main.foss.dart.js.map
View File

File diff suppressed because one or more lines are too long

13998
public/main.profile.dart.js vendored
View File

File diff suppressed because one or more lines are too long

20
tests/Feature/CompanySettingsTest.php
View File

@ -56,7 +56,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
}
@ -78,11 +78,13 @@ class CompanySettingsTest extends TestCase
$this->company->saveSettings($settings, $this->company);
$response = false;
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
nlog($message);
@ -109,7 +111,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
$response->assertStatus(200);
@ -135,7 +137,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
$response->assertStatus(200);
@ -162,7 +164,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $this->company->toArray());
$response->assertStatus(200);
@ -185,7 +187,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->post('/api/v1/companies?include=company', $this->company->toArray());
])->postJson('/api/v1/companies?include=company', $this->company->toArray());
$arr = $response->json();
$response->assertStatus(200);
@ -203,7 +205,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->post('/api/v1/companies?include=company', $this->company->toArray());
])->postJson('/api/v1/companies?include=company', $this->company->toArray());
$arr = $response->json();
$response->assertStatus(200);
@ -221,7 +223,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->post('/api/v1/companies?include=company', $this->company->toArray());
])->postJson('/api/v1/companies?include=company', $this->company->toArray());
$arr = $response->json();
$response->assertStatus(200);
@ -239,7 +241,7 @@ class CompanySettingsTest extends TestCase
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-Token' => $this->token,
])->post('/api/v1/companies?include=company', $this->company->toArray());
])->postJson('/api/v1/companies?include=company', $this->company->toArray());
$arr = $response->json();
$response->assertStatus(200);