louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #856 from langfr/issue/MissingFaxData

Browse Source 
Read contact´s fax number.
This commit is contained in:
Jochen Staerk
2025-06-26 10:29:39 +02:00
committed by GitHub
parent d259984f87 23a7d00b13
commit ab8bc8fe71
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/src/main/java/org/mustangproject/Contact.java
View File

@@ -130,6 +130,21 @@ public class Contact implements IZUGFeRDExportableContact {
} else if (currentItemNode.getLocalName().equals("Telephone")) { /* UBL */
setPhone(currentItemNode.getTextContent());
}
// CII: only for Extended profile
if (currentItemNode.getLocalName().equals("FaxUniversalCommunication")) { /* CII */
NodeList fax = currentItemNode.getChildNodes();
for (int faxChildIndex = 0; faxChildIndex < fax.getLength(); faxChildIndex++) {
if (fax.item(faxChildIndex).getLocalName() != null) {
if (fax.item(faxChildIndex).getLocalName().equals("CompleteNumber")) {
setFax(fax.item(faxChildIndex).getTextContent());
}
}
}
} else if (currentItemNode.getLocalName().equals("Telefax")) { /* UBL */
setFax(currentItemNode.getTextContent());
}
if (currentItemNode.getLocalName().equals("EmailURIUniversalCommunication")) { /* CII */
NodeList email = currentItemNode.getChildNodes();
for (int emailChildIndex = 0; emailChildIndex < email.getLength(); emailChildIndex++) {

1
library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java
View File

@@ -139,6 +139,7 @@ public class UBLTest extends ResourceCase {
assertFalse(hasExceptions);
assertEquals(new BigDecimal("10000.0"), invoice.getTotalPrepaidAmount());
assertEquals("4621231", invoice.getSender().getContact().getFax());
}
}

2
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
View File

@@ -602,6 +602,8 @@ public class ZF2PushTest extends TestCase {
assertEquals("Verwendungszweck", i.getPaymentReference());
assertEquals("Rechnung", i.getDocumentName());
assertEquals("++49555123456",i.getRecipient().getContact().getFax());
} catch (XPathExpressionException e) {
fail("XPathExpressionException should not be raised");
} catch (ParseException e) {

1
library/src/test/resources/ubl/04.01a-INVOICE_ubl.xml
View File

@@ -40,6 +40,7 @@
<cac:Contact>
<cbc:Name>M. Meier Handwerk GbR</cbc:Name>
<cbc:Telephone>010/12345</cbc:Telephone>
<cbc:Telefax>4621231</cbc:Telefax>
<cbc:ElectronicMail>info@m-meier.de</cbc:ElectronicMail>
</cac:Contact>
</cac:Party>