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

Fixes for client store request

Browse Source
This commit is contained in:
David Bomba 2022-01-14 21:24:20 +11:00
parent c28bf391fb
commit e844abf27d
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -90,8 +90,6 @@ class StoreClientRequest extends Request
{ {
$input = $this->all(); $input = $this->all();
//@todo implement feature permissions for > 50 clients
$settings = ClientSettings::defaults(); $settings = ClientSettings::defaults();
if (array_key_exists('settings', $input) && ! empty($input['settings'])) { if (array_key_exists('settings', $input) && ! empty($input['settings'])) {
@ -133,6 +131,10 @@ class StoreClientRequest extends Request
$input['shipping_country_id'] = $this->getCountryCode($input['shipping_country_code']); $input['shipping_country_id'] = $this->getCountryCode($input['shipping_country_code']);
} }
/* If there is no number, just unset it here. */
if(array_key_exists('number', $input) && ( is_null($input['number']) || empty($input['number'])))
unset($input['number']);
$this->replace($input); $this->replace($input);
} }

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

@ -36,8 +36,6 @@ trait GeneratesCounter
//todo in the form validation, we need to ensure that if a prefix and pattern is set we throw a validation error, //todo in the form validation, we need to ensure that if a prefix and pattern is set we throw a validation error,
//only one type is allow else this will cause confusion to the end user //only one type is allow else this will cause confusion to the end user
private function getNextEntityNumber($entity, Client $client, $is_recurring = false) private function getNextEntityNumber($entity, Client $client, $is_recurring = false)
{ {
$prefix = ''; $prefix = '';

50
tests/Feature/ClientApiTest.php
View File

@ -68,6 +68,56 @@ class ClientApiTest extends TestCase
} }
public function testClientNoneValidation()
{
$data = [
'name' => $this->faker->firstName,
'number' => '',
];
$response = false;
try{
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/clients/', $data);
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
nlog($message);
}
$response->assertStatus(200);
}
public function testClientNullValidation()
{
$data = [
'name' => $this->faker->firstName,
'number' => null,
];
$response = false;
try{
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
])->post('/api/v1/clients/', $data);
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
nlog($message);
}
$response->assertStatus(200);
}
public function testClientCountryCodeValidationTrueIso3() public function testClientCountryCodeValidationTrueIso3()
{ {