viscous/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2026-03-03 02:57:01 +00: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
2026-01-21 14:50:18 +11:00
parent e513da3511 e792da205e
commit 54953f07b1
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/User/UpdateUserRequest.php
View File

@@ -56,6 +56,8 @@ class UpdateUserRequest extends Request
$input['email'] = trim($input['email']);
} elseif (isset($input['email'])) {
$input['email'] = false;
} else {
$input['email'] = $this->user->email;
}
if (array_key_exists('first_name', $input)) {

4
app/Services/EDocument/Gateway/Transformers/StorecoveExpense.php
View File

@@ -204,6 +204,10 @@ class StorecoveExpense
$id_number = $pi->getId();
} elseif ($ident == 'routing_id') {
$routing_id = $pi->getId();
} else{
//Sometimes some very unusual identifiers are returned, we should always skip these.
// ie. IBAN, etc.
continue;
}
}
}

13
tests/Feature/UserTest.php
View File

@@ -152,17 +152,6 @@ class UserTest extends TestCase
$data['email'] = 'newemail@gmail.com';
// $response = $this->withHeaders([
// 'X-API-SECRET' => config('ninja.api_secret'),
// 'X-API-TOKEN' => $company_token->token,
// 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
// ])->putJson('/api/v1/users/'.$user->hashed_id.'?include=company_user', $data);
// $response->assertStatus(200);
// $data = $response->json();
// $this->assertEquals($data['data']['email'], $data['email']);
}
@@ -185,7 +174,7 @@ class UserTest extends TestCase
'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->putJson('/api/v1/users/'.$user->hashed_id.'?include=company_user', $data);
$response->assertStatus(422);
$response->assertStatus(200);
$data = $user->toArray();
unset($data['password']);