Added more tests for UBL to CII

horstoeko · Nov 8, 2024 · 631fec5 · 631fec5
1 parent 0687486
commit 631fec5
Show file tree

Hide file tree

Showing 5 changed files with 774 additions and 2 deletions.
diff --git a/build/phpunit.xml b/build/phpunit.xml
@@ -16,6 +16,7 @@
             <file>../tests/testcases/CiiToUblTechnical4Test.php</file>
             <file>../tests/testcases/CiiToUblTechnical5Test.php</file>
             <file>../tests/testcases/UblToCiiSimpleTest.php</file>
+            <file>../tests/testcases/UblToCiiSimple2Test.php</file>
         </testsuite>
     </testsuites>
     <coverage processUncoveredFiles="true">

diff --git a/src/XmlConverterUblToCii.php b/src/XmlConverterUblToCii.php
@@ -262,9 +262,9 @@ function ($invoiceLineNoteNode) {
                 $this->destination->endElement();
 
                 $this->destination->startElement('ram:SpecifiedTradeProduct');
+                $this->destination->elementWithAttribute('ram:GlobalID', $this->source->queryValue('./cac:Item/cac:StandardItemIdentification/cbc:ID', $invoiceLineNode), 'schemeID', $this->source->queryValue('./cac:Item/cac:StandardItemIdentification/cbc:ID/@schemeID', $invoiceLineNode));
                 $this->destination->element('ram:SellerAssignedID', $this->source->queryValue('./cac:Item/cac:SellersItemIdentification/cbc:ID', $invoiceLineNode));
                 $this->destination->element('ram:BuyerAssignedID', $this->source->queryValue('./cac:Item/cac:BuyersItemIdentification/cbc:ID', $invoiceLineNode));
-                $this->destination->elementWithAttribute('ram:GlobalID', $this->source->queryValue('./cac:Item/cac:StandardItemIdentification/cbc:ID', $invoiceLineNode), 'schemeID', $this->source->queryValue('./cac:Item/cac:StandardItemIdentification/cbc:ID/@schemeID', $invoiceLineNode));
                 $this->destination->element('ram:Name', $this->source->queryValue('./cac:Item/cbc:Name', $invoiceLineNode));
                 $this->destination->element('ram:Description', $this->source->queryValue('./cac:Item/cbc:Description', $invoiceLineNode));
 
@@ -717,7 +717,16 @@ function ($contractReferenceDocumenntNode) {
             function ($additionalDocumentReferenceNode) {
                 $this->destination->startElement('ram:AdditionalReferencedDocument');
                 $this->destination->element('ram:IssuerAssignedID', $this->source->queryValue('./cbc:ID', $additionalDocumentReferenceNode));
-                $this->destination->element('ram:TypeCode', '916');
+                $this->source->whenExists(
+                    './cbc:DocumentTypeCode',
+                    $additionalDocumentReferenceNode,
+                    function ($docTypeCodeNode) {
+                        $this->destination->element('ram:TypeCode', $docTypeCodeNode->nodeValue);
+                    },
+                    function () {
+                        $this->destination->element('ram:TypeCode', '916');
+                    }
+                );
                 $this->destination->element('ram:Name', $this->source->queryValue('./cbc:DocumentDescription', $additionalDocumentReferenceNode));
                 $this->source->whenExists(
                     './cac:Attachment/cbc:EmbeddedDocumentBinaryObject',