Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support additional UBL namespaces when importing

This commit is contained in:
David Bomba 2024-11-11 09:45:58 +11:00
parent d227458b86
commit e37bcc7a05
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Services/EDocument/Imports/ParseEDocument.php
View File

@ -43,6 +43,7 @@ class ParseEDocument extends AbstractService
{
nlog("starting");
nlog($this->company->id);
// nlog($this->file->get());
/** @var \App\Models\Account $account */
$account = $this->company->owner()->account;

40
app/Services/EDocument/Imports/UblEDocument.php
View File

@ -44,11 +44,45 @@ class UblEDocument extends AbstractService
public function run(): \App\Models\Expense
{
$e = new EInvoice();
$e = new EInvoice();
$xml = $this->extractInvoiceUbl($this->file->get());
$invoice = $e->decode('Peppol', $xml, 'xml');
return $this->buildAndSaveExpense($invoice);
}
private function extractInvoiceUbl(string $xml): string
{
$xml = str_replace('<?xml version="1.0" encoding="UTF-8"?>', '', $xml);
nlog($xml);
$dom = new \DOMDocument();
$dom->loadXML($xml);
$xpath = new \DOMXPath($dom);
// Register the namespaces
$xpath->registerNamespace('sh', 'http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader');
$xpath->registerNamespace('ubl', 'urn:oasis:names:specification:ubl:schema:xsd:Invoice-2');
// Search for Invoice with default namespace
$invoiceNodes = $xpath->query('//ubl:Invoice');
if ($invoiceNodes === false || $invoiceNodes->length === 0) {
throw new \Exception('No Invoice tag found in XML');
}
$invoiceNode = $invoiceNodes->item(0);
// Create new document with just the Invoice
$newDom = new \DOMDocument();
$newNode = $newDom->importNode($invoiceNode, true);
$newDom->appendChild($newNode);
return $newDom->saveXML($newDom->documentElement);
$invoice = $e->decode('Peppol', $this->file->get(), 'xml');
return $this->buildAndSaveExpense($invoice);
}