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

Fixes for e invoice validation

Browse Source
This commit is contained in:
David Bomba 2024-07-16 08:38:30 +10:00
parent 343bb9aa11
commit 64106ce7e1
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -65,7 +65,7 @@ class UpdateCompanyRequest extends Request
$rules['smtp_local_domain'] = 'sometimes|string|nullable'; $rules['smtp_local_domain'] = 'sometimes|string|nullable';
// $rules['smtp_verify_peer'] = 'sometimes|string'; // $rules['smtp_verify_peer'] = 'sometimes|string';
// $rules['e_invoice'] = ['sometimes','nullable', new ValidCompanyScheme()]; $rules['e_invoice'] = ['sometimes','nullable', new ValidCompanyScheme()];
if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) { if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
$rules['portal_domain'] = 'bail|nullable|sometimes|url'; $rules['portal_domain'] = 'bail|nullable|sometimes|url';

18
app/Http/ValidationRules/EInvoice/ValidClientScheme.php
View File

@ -34,18 +34,20 @@ class ValidClientScheme implements ValidationRule, ValidatorAwareRule
public function validate(string $attribute, mixed $value, Closure $fail): void public function validate(string $attribute, mixed $value, Closure $fail): void
{ {
$r = new EInvoice(); if(isset($value['Invoice']))
$errors = $r->validateRequest($value['Invoice'], ClientLevel::class); {
$r = new EInvoice();
$errors = $r->validateRequest($value['Invoice'], ClientLevel::class);
foreach ($errors as $key => $msg) { foreach ($errors as $key => $msg) {
$this->validator->errors()->add( $this->validator->errors()->add(
"e_invoice.{$key}", "e_invoice.{$key}",
"{$key} - {$msg}" "{$key} - {$msg}"
); );
}
} }
} }
/** /**

21
app/Http/ValidationRules/EInvoice/ValidCompanyScheme.php
View File

@ -35,18 +35,21 @@ class ValidCompanyScheme implements ValidationRule, ValidatorAwareRule
public function validate(string $attribute, mixed $value, Closure $fail): void public function validate(string $attribute, mixed $value, Closure $fail): void
{ {
$r = new EInvoice(); if(isset($value['Invoice']))
$errors = $r->validateRequest($value['Invoice'], CompanyLevel::class); {
$r = new EInvoice();
foreach ($errors as $key => $msg) { $errors = $r->validateRequest($value['Invoice'], CompanyLevel::class);
foreach ($errors as $key => $msg) {
$this->validator->errors()->add( $this->validator->errors()->add(
"e_invoice.{$key}", "e_invoice.{$key}",
"{$key} - {$msg}" "{$key} - {$msg}"
); );
}
} }
} }
/** /**