mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 16:31:33 +02:00
Fixes
This commit is contained in:
parent
9fcde1ffc8
commit
b3127a3d2e
@ -20,7 +20,7 @@ class MergeEDocument implements ShouldQueue
|
||||
|
||||
public $deleteWhenMissingModels = true;
|
||||
|
||||
public function __construct(private object $document, private object $pdf_file)
|
||||
public function __construct(private object $document, private string $pdf_file)
|
||||
{
|
||||
}
|
||||
|
||||
@ -35,7 +35,6 @@ class MergeEDocument implements ShouldQueue
|
||||
$settings_entity = ($this->document instanceof PurchaseOrder) ? $this->document->vendor : $this->document->client;
|
||||
|
||||
$e_document_type = strlen($settings_entity->getSetting('e_invoice_type')) > 2 ? $settings_entity->getSetting('e_invoice_type') : "XInvoice_3_0";
|
||||
$e_quote_type = strlen($settings_entity->getSetting('e_quote_type')) > 2 ? $settings_entity->getSetting('e_quote_type') : "OrderX_Extended";
|
||||
|
||||
if ($this->document instanceof Invoice){
|
||||
switch ($e_document_type) {
|
||||
@ -49,9 +48,8 @@ class MergeEDocument implements ShouldQueue
|
||||
case "XInvoice-Extended":
|
||||
case "XInvoice-BasicWL":
|
||||
case "XInvoice-Basic":
|
||||
$xml = (new CreateEDocument($this->document))->handle();
|
||||
(new ZugferdDocumentPdfBuilder($xml, $this->pdf_file))->generateDocument()->saveDocument($mergeToPdf);
|
||||
return $mergeToPdf;
|
||||
$xml = (new CreateEDocument($this->document, true))->handle();
|
||||
return(new ZugferdDocumentPdfBuilder($xml, $this->pdf_file))->generateDocument()->downloadString("Invoice.pdf");
|
||||
default:
|
||||
return $this->pdf_file;
|
||||
|
||||
|
@ -16,7 +16,6 @@ use App\Jobs\EDocument\MergeEDocument;
|
||||
use App\Models\Credit;
|
||||
use App\Models\CreditInvitation;
|
||||
use App\Models\Invoice;
|
||||
use App\Models\Company;
|
||||
use App\Models\InvoiceInvitation;
|
||||
use App\Models\PurchaseOrder;
|
||||
use App\Models\PurchaseOrderInvitation;
|
||||
@ -41,7 +40,7 @@ class CreateRawPdf
|
||||
|
||||
public Invoice | Credit | Quote | RecurringInvoice | PurchaseOrder $entity;
|
||||
|
||||
public Company $company;
|
||||
public $company;
|
||||
|
||||
public $contact;
|
||||
|
||||
@ -109,8 +108,8 @@ class CreateRawPdf
|
||||
$pdf = $ps->boot()->getPdf();
|
||||
|
||||
nlog("pdf timer = ". $ps->execution_time);
|
||||
if ($this->company->getSetting("enable_e_invoice")){
|
||||
$pdf = (new MergeEDocument($this->entity))->handle();
|
||||
if ($this->entity_string == "invoice" && $this->entity->company->getSetting("enable_e_invoice")){
|
||||
$pdf = (new MergeEDocument($this->entity, $pdf))->handle();
|
||||
}
|
||||
return $pdf;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user