minor fixes

This commit is contained in:
David Bomba 2024-05-22 15:54:08 +10:00
parent 242e57b73e
commit 1c89b0f1a6
2 changed files with 56 additions and 49 deletions

View File

@ -89,6 +89,9 @@ class EpcQrGenerator
]), "\n"); ]), "\n");
} }
// substr("{$this->invoice->number} {$this->invoice->client->number}", 0,139),
private function validateFields() private function validateFields()
{ {
if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company2)) { if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company2)) {

View File

@ -12,7 +12,7 @@
namespace Tests\Integration\Einvoice; namespace Tests\Integration\Einvoice;
use Tests\TestCase; use Tests\TestCase;
use Invoiceninja\Einvoice\Models\FatturaPA\FatturaElettronica; use App\DataMapper\EDoc\FatturaPA\FatturaElettronica;
use Tests\MockAccountData; use Tests\MockAccountData;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Routing\Middleware\ThrottleRequests;
@ -298,23 +298,27 @@ class FatturaPATest extends TestCase
], ],
]; ];
// public function testValidateSampleRequest() public function testValidateSampleRequest()
// { {
// $response = json_decode($this->sample_request, 1); $response = json_decode($this->sample_request, 1);
// try{
// $validation_array = FatturaElettronica::validate($response); $rules = FatturaElettronica::getValidationRules($response);
// } nlog($rules);
// catch(\Illuminate\Validation\ValidationException $e) {
// nlog($e->errors()); try{
// } $validation_array = FatturaElettronica::validate($response);
// $payload = FatturaElettronica::from($response)->toArray(); }
// nlog($payload); catch(\Illuminate\Validation\ValidationException $e) {
// $this->assertIsArray($payload);
nlog($e->errors());
}
$payload = FatturaElettronica::from($response)->toArray();
nlog($payload);
$this->assertIsArray($payload);
// } }
// public function testBulkValidationX() // public function testBulkValidationX()
// { // {
@ -361,57 +365,57 @@ class FatturaPATest extends TestCase
// } // }
// public function testBulkValidation() public function testBulkValidation()
// { {
// $files = [ $files = [
// 'tests/Integration/Einvoice/samples/fatturapa0.xml', 'tests/Integration/Einvoice/samples/fatturapa0.xml',
// 'tests/Integration/Einvoice/samples/fatturapa1.xml', 'tests/Integration/Einvoice/samples/fatturapa1.xml',
// 'tests/Integration/Einvoice/samples/fatturapa2.xml', 'tests/Integration/Einvoice/samples/fatturapa2.xml',
// 'tests/Integration/Einvoice/samples/fatturapa3.xml', 'tests/Integration/Einvoice/samples/fatturapa3.xml',
// 'tests/Integration/Einvoice/samples/fatturapa4.xml', 'tests/Integration/Einvoice/samples/fatturapa4.xml',
// 'tests/Integration/Einvoice/samples/fatturapa5.xml', 'tests/Integration/Einvoice/samples/fatturapa5.xml',
// 'tests/Integration/Einvoice/samples/fatturapa6.xml', 'tests/Integration/Einvoice/samples/fatturapa6.xml',
// ]; ];
// foreach($files as $f) foreach($files as $f)
// { {
// $xmlstring = file_get_contents($f); $xmlstring = file_get_contents($f);
// $xml = simplexml_load_string($xmlstring, "SimpleXMLElement", LIBXML_NOCDATA); $xml = simplexml_load_string($xmlstring, "SimpleXMLElement", LIBXML_NOCDATA);
// $json = json_encode($xml); $json = json_encode($xml);
// $payload = json_decode($json, true); $payload = json_decode($json, true);
// nlog($payload); nlog($payload);
// $validation_array = false; $validation_array = false;
// try { try {
// nlog($f); nlog($f);
// $rules = FatturaElettronica::getValidationRules($this->payload); $rules = FatturaElettronica::getValidationRules($this->payload);
// nlog($rules); nlog($rules);
// $this->assertIsArray($rules); $this->assertIsArray($rules);
// $payload = FatturaElettronica::from($payload)->toArray(); $payload = FatturaElettronica::from($payload)->toArray();
// nlog($payload); nlog($payload);
// $this->assertIsArray($payload); $this->assertIsArray($payload);
// $validation_array = FatturaElettronica::validate($payload); $validation_array = FatturaElettronica::validate($payload);
// $this->assertIsArray($validation_array); $this->assertIsArray($validation_array);
// } catch(\Illuminate\Validation\ValidationException $e) { } catch(\Illuminate\Validation\ValidationException $e) {
// nlog($e->errors()); nlog($e->errors());
// } }
// $this->assertIsArray($validation_array); $this->assertIsArray($validation_array);
// } }
// } }
// public function testUpdateProps() // public function testUpdateProps()
// { // {