mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
minor fixes
This commit is contained in:
parent
46f3fd3866
commit
fc7d84dc24
@ -20,12 +20,15 @@ use App\Models\Expense;
|
|||||||
use App\Models\Vendor;
|
use App\Models\Vendor;
|
||||||
use App\Services\AbstractService;
|
use App\Services\AbstractService;
|
||||||
use App\Utils\TempFile;
|
use App\Utils\TempFile;
|
||||||
|
use App\Utils\Traits\SavesDocuments;
|
||||||
use Exception;
|
use Exception;
|
||||||
use horstoeko\zugferd\ZugferdDocumentReader;
|
use horstoeko\zugferd\ZugferdDocumentReader;
|
||||||
use horstoeko\zugferdvisualizer\renderer\ZugferdVisualizerLaravelRenderer;
|
use horstoeko\zugferdvisualizer\renderer\ZugferdVisualizerLaravelRenderer;
|
||||||
use horstoeko\zugferdvisualizer\ZugferdVisualizer;
|
use horstoeko\zugferdvisualizer\ZugferdVisualizer;
|
||||||
|
|
||||||
class ZugferdEDocument extends AbstractService {
|
class ZugferdEDocument extends AbstractService
|
||||||
|
{
|
||||||
|
use SavesDocuments;
|
||||||
public ZugferdDocumentReader|string $document;
|
public ZugferdDocumentReader|string $document;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -66,10 +69,10 @@ class ZugferdEDocument extends AbstractService {
|
|||||||
$expense->save();
|
$expense->save();
|
||||||
|
|
||||||
$origin_file = TempFile::UploadedFileFromRaw($this->tempdocument, $this->documentname, "application/xml");
|
$origin_file = TempFile::UploadedFileFromRaw($this->tempdocument, $this->documentname, "application/xml");
|
||||||
(new UploadFile($origin_file, UploadFile::DOCUMENT, $user, $expense->company, $expense, null, false))->handle();
|
|
||||||
$uploaded_file = TempFile::UploadedFileFromRaw($visualizer->renderPdf(), $documentno . "_visualiser.pdf", "application/pdf");
|
$uploaded_file = TempFile::UploadedFileFromRaw($visualizer->renderPdf(), $documentno . "_visualiser.pdf", "application/pdf");
|
||||||
(new UploadFile($uploaded_file, UploadFile::DOCUMENT, $user, $expense->company, $expense, null, false))->handle();
|
$this->saveDocuments([$origin_file, $uploaded_file], $expense);
|
||||||
$expense->save();
|
$expense->save();
|
||||||
|
|
||||||
if ($taxCurrency && $taxCurrency != $invoiceCurrency) {
|
if ($taxCurrency && $taxCurrency != $invoiceCurrency) {
|
||||||
$expense->private_notes = ctrans("texts.tax_currency_mismatch");
|
$expense->private_notes = ctrans("texts.tax_currency_mismatch");
|
||||||
}
|
}
|
||||||
@ -115,8 +118,7 @@ class ZugferdEDocument extends AbstractService {
|
|||||||
$expense->vendor_id = $vendor->id;
|
$expense->vendor_id = $vendor->id;
|
||||||
}
|
}
|
||||||
$expense->transaction_reference = $documentno;
|
$expense->transaction_reference = $documentno;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// The document exists as an expense
|
// The document exists as an expense
|
||||||
// Handle accordingly
|
// Handle accordingly
|
||||||
nlog("Document already exists");
|
nlog("Document already exists");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user