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

Removed pdf-parameters

Browse Source
This commit is contained in:
Lars Kusch 2023-08-07 09:59:10 +02:00
parent 24239009a6
commit 9f3a58129f
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -213,7 +213,7 @@ class CreateEntityPdf implements ShouldQueue
} }
} }
if ($this->entity_string == "invoice" && $this->client->getSetting('enable_e_invoice')){ if ($this->entity_string == "invoice" && $this->client->getSetting('enable_e_invoice')){
(new CreateEInvoice($this->entity, true))->handle(); (new CreateEInvoice($this->entity))->handle();
} }
$this->invitation = null; $this->invitation = null;
// $this->entity = null; // $this->entity = null;

2
app/Jobs/Invoice/CreateEInvoice.php
View File

@ -29,7 +29,7 @@ class CreateEInvoice implements ShouldQueue
public $deleteWhenMissingModels = true; public $deleteWhenMissingModels = true;
public function __construct(private Invoice $invoice, private bool $alterPDF, private string $custom_pdf_path = "") public function __construct(private Invoice $invoice)
{ {
} }

2
app/Jobs/Invoice/ZipInvoices.php
View File

@ -76,7 +76,7 @@ class ZipInvoices implements ShouldQueue
$this->invoices->each(function ($invoice) { $this->invoices->each(function ($invoice) {
(new CreateEntityPdf($invoice->invitations()->first()))->handle(); (new CreateEntityPdf($invoice->invitations()->first()))->handle();
if ($invoice->client->getSetting('enable_e_invoice')){ if ($invoice->client->getSetting('enable_e_invoice')){
(new CreateEInvoice($invoice, false))->handle(); (new CreateEInvoice($invoice))->handle();
} }
}); });

2
app/Services/Invoice/GetInvoiceEInvoice.php
View File

@ -43,7 +43,7 @@ class GetInvoiceEInvoice extends AbstractService
$file = Storage::disk($disk)->exists($file_path); $file = Storage::disk($disk)->exists($file_path);
if (! $file) { if (! $file) {
$file_path = (new CreateEInvoice($this->invoice, false))->handle(); $file_path = (new CreateEInvoice($this->invoice))->handle();
} }
return $file_path; return $file_path;

4
app/Services/Invoice/InvoiceService.php
View File

@ -465,7 +465,7 @@ class InvoiceService
if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation) if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation)
{ {
(new CreateEInvoice($invitation->invoice, true))->handle(); (new CreateEInvoice($invitation->invoice))->handle();
} }
}); });
@ -478,7 +478,7 @@ class InvoiceService
CreateEntityPdf::dispatch($invitation); CreateEntityPdf::dispatch($invitation);
if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation) { if ($invitation->invoice->client->getSetting('enable_e_invoice') && $invitation instanceof InvoiceInvitation) {
CreateEInvoice::dispatch($invitation->invoice, true); CreateEInvoice::dispatch($invitation->invoice);
} }
}); });

6
tests/Unit/EInvoiceTest.php
View File

@ -42,7 +42,7 @@ class EInvoiceTest extends TestCase
$this->company->e_invoice_type = "EN16931"; $this->company->e_invoice_type = "EN16931";
$this->invoice->client->routing_id = 'DE123456789'; $this->invoice->client->routing_id = 'DE123456789';
$this->invoice->client->save(); $this->invoice->client->save();
$xinvoice = (new CreateEInvoice($this->invoice, false))->handle(); $xinvoice = (new CreateEInvoice($this->invoice))->handle();
$this->assertNotNull($xinvoice); $this->assertNotNull($xinvoice);
$this->assertTrue(Storage::exists($xinvoice)); $this->assertTrue(Storage::exists($xinvoice));
} }
@ -56,7 +56,7 @@ class EInvoiceTest extends TestCase
$this->invoice->client->routing_id = 'DE123456789'; $this->invoice->client->routing_id = 'DE123456789';
$this->invoice->client->save(); $this->invoice->client->save();
$xinvoice = (new CreateEInvoice($this->invoice, false))->handle(); $xinvoice = (new CreateEInvoice($this->invoice))->handle();
nlog(Storage::path($xinvoice)); nlog(Storage::path($xinvoice));
$document = ZugferdDocumentReader::readAndGuessFromFile(Storage::path($xinvoice)); $document = ZugferdDocumentReader::readAndGuessFromFile(Storage::path($xinvoice));
$document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest); $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
@ -69,7 +69,7 @@ class EInvoiceTest extends TestCase
public function checkEmbededPDFFile() public function checkEmbededPDFFile()
{ {
$pdf = (new CreateEntityPdf($this->invoice->invitations()->first()))->handle(); $pdf = (new CreateEntityPdf($this->invoice->invitations()->first()))->handle();
(new CreateEInvoice($this->invoice, true, $pdf))->handle(); (new CreateEInvoice($this->invoice))->handle();
$document = ZugferdDocumentReader::readAndGuessFromFile($pdf); $document = ZugferdDocumentReader::readAndGuessFromFile($pdf);
$document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest); $document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $documentcurrency, $taxcurrency, $taxname, $documentlangeuage, $rest);
$this->assertEquals($this->invoice->number, $documentno); $this->assertEquals($this->invoice->number, $documentno);