Merge pull request #281 from weclapp-dev/master

Extend importer

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java

@@ -21,7 +21,9 @@ import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -258,8 +260,9 @@ public class ZUGFeRDImporter {
 			case "urn:ferd:CrossIndustryDocument:invoice:1p0:extended":
 			case "urn:cen.eu:en16931:2017#conformant#urn:factur-x.eu:1p0:extended":
 				return "EXTENDED";
-		}
+      default:
-		return "";
+        return "";
+    }
 	}
 
 	/**
@@ -303,9 +306,9 @@ public class ZUGFeRDImporter {
 	private String extractIssuerAssignedID(String propertyName) {
 		try {
 			if (getVersion() == 1) {
-				return extractString("//*[local-name() = 'BuyerOrderReferencedDocument']//*[local-name() = 'ID']");
+				return extractString("//*[local-name() = '" + propertyName + "']//*[local-name() = 'ID']");
 			} else {
-				return extractString("//*[local-name() = 'BuyerOrderReferencedDocument']//*[local-name() = 'IssuerAssignedID']");
+				return extractString("//*[local-name() = '" + propertyName + "']//*[local-name() = 'IssuerAssignedID']");
 			}
 		} catch (final Exception e) {
 			Logger.getLogger(ZUGFeRDImporter.class.getName()).log(Level.SEVERE, null, e);
@@ -335,6 +338,21 @@ public class ZUGFeRDImporter {
 			return "";
 		}
 	}
+  
+  public Date getDetailedDeliveryPeriodFrom(){
+    final String toParse = extractString(
+        "//*[local-name() = 'ApplicableHeaderTradeSettlement']" +
+            "//*[local-name() = 'BillingSpecifiedPeriod']" +
+            "//*[local-name() = 'StartDateTime']//*[local-name() = 'DateTimeString']");
+    return tryDate(toParse);
+  }
+  public Date getDetailedDeliveryPeriodTo(){
+    final String toParse = extractString(
+        "//*[local-name() = 'ApplicableHeaderTradeSettlement']" +
+            "//*[local-name() = 'BillingSpecifiedPeriod']" +
+            "//*[local-name() = 'EndDateTime']//*[local-name() = 'DateTimeString']");
+    return tryDate(toParse);
+  }
 
 	/**
 	 * @return the TaxBasisTotalAmount
@@ -754,8 +772,6 @@ public class ZUGFeRDImporter {
 	public PostalTradeAddress getSellerTradePartyAddress() {
 
 		NodeList nl = null;
-		final PostalTradeAddress address = new PostalTradeAddress();
-
 		try {
 			if (getVersion() == 1) {
 				nl = getNodeListByPath("//*[local-name() = 'CrossIndustryDocument']//*[local-name() = 'SpecifiedSupplyChainTradeTransaction']//*[local-name() = 'ApplicableSupplyChainTradeAgreement']//*[local-name() = 'SellerTradeParty']//*[local-name() = 'PostalTradeAddress']");
@@ -913,6 +929,20 @@ public class ZUGFeRDImporter {
 								node = getNodeByName(node.getChildNodes(), "CalculatedAmount");
 								lineItem.setTax(tryBigDecimal(getNodeValue(node)));
 							}
+							node = getNodeByName(nn.getChildNodes(), "BillingSpecifiedPeriod");
+							if (node != null) {
+								final Node start = getNodeByName(node.getChildNodes(), "StartDateTime");
+                Node dateTimeStart = null;
+                if(start != null) {
+                  dateTimeStart = getNodeByName(start.getChildNodes(), "DateTimeString");
+                }
+                final Node end = getNodeByName(node.getChildNodes(), "EndDateTime");
+                Node dateTimeEnd = null;
+                if(end != null) {
+                  dateTimeEnd = getNodeByName(end.getChildNodes(), "DateTimeString");
+                }
+                lineItem.setDetailedDeliveryPeriod(tryDate(dateTimeStart), tryDate(dateTimeEnd));
+              }
 
 							node = getNodeByName(nn.getChildNodes(), "SpecifiedTradeSettlementLineMonetarySummation");
 							if (node != null) {
@@ -1016,11 +1046,9 @@ public class ZUGFeRDImporter {
 	 * @return A String or empty String, if no value was found
 	 */
 	private String getNodeValue(Node node) {
-		if (node != null) {
+    if (node != null && node.getFirstChild() != null) {
-			if (node.getFirstChild() != null) {
+      return node.getFirstChild().getNodeValue();
-				return node.getFirstChild().getNodeValue();
+    }
-			}
-		}
 		return "";
 	}
 
@@ -1034,10 +1062,26 @@ public class ZUGFeRDImporter {
 			return new BigDecimal(nodeValue);
 		} catch (final Exception e) {
 			try {
-				return new BigDecimal(Float.valueOf(nodeValue));
+				return BigDecimal.valueOf(Float.valueOf(nodeValue));
 			} catch (final Exception ex) {
 				return new BigDecimal("0.00");
 			}
 		}
 	}
+	private Date tryDate(Node node) {
+    final String nodeValue = getNodeValue(node);
+    if (nodeValue.isEmpty()) {
+      return null;
+    }
+    return tryDate(nodeValue);
+  }
+
+  private static Date tryDate(String toParse) {
+    final SimpleDateFormat formatter = ZUGFeRDDateFormat.DATE.getFormatter();
+    try {
+      return formatter.parse(toParse);
+		} catch (final Exception e) {
+      return null;
+		}
+  }
 }

library/src/test/java/org/mustangproject/ZUGFeRD/InvoicingPeriodTestCase.java

@@ -0,0 +1,43 @@
+package org.mustangproject.ZUGFeRD;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.text.ParseException;
+import java.util.Date;
+
+import org.junit.Test;
+
+public class InvoicingPeriodTestCase {
+  @Test
+  public void readBillingSpecification() throws IOException {
+    final String file = ResourceUtilities.readFile(Charset.defaultCharset(),
+        "src/test/resources/factur-x_invoicingPeriod.xml");
+    final ZUGFeRDImporter zi = new XRechnungImporter(file.getBytes());
+
+    // Reading ZUGFeRD
+    assertEquals(date("20220829"), zi.getLineItemList().get(0).getDetailedDeliveryPeriodFrom());
+    assertEquals(date("20220831"), zi.getLineItemList().get(0).getDetailedDeliveryPeriodTo());
+    assertEquals(date("20220901"), zi.getLineItemList().get(1).getDetailedDeliveryPeriodFrom());
+    assertEquals(date("20220902"), zi.getLineItemList().get(1).getDetailedDeliveryPeriodTo());
+    assertEquals(null, zi.getLineItemList().get(2).getDetailedDeliveryPeriodFrom());
+    assertEquals(date("20220909"), zi.getLineItemList().get(2).getDetailedDeliveryPeriodTo());
+    assertEquals(date("20220826"), zi.getDetailedDeliveryPeriodFrom());
+    assertEquals(date("20220902"), zi.getDetailedDeliveryPeriodTo());
+    //general asserts
+    assertEquals("1634.76", zi.getAmount());
+    assertEquals("RE1000", zi.getInvoiceID());
+    assertEquals("Sell", zi.getSellerTradePartyAddress().getCityName());
+    assertEquals("Beier", zi.getBuyerTradePartyName());
+  }
+  
+  private Date date(String toParse){
+    try {
+      return ZUGFeRDDateFormat.DATE.getFormatter().parse(toParse);
+    }
+    catch (final ParseException e) {
+      return null;
+    }
+  }
+}

library/src/test/resources/factur-x_invoicingPeriod.xml

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                          xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+  <!-- generated by: mustangproject.org vnull-->
+  <rsm:ExchangedDocumentContext>
+    <ram:GuidelineSpecifiedDocumentContextParameter>
+      <ram:ID>urn:cen.eu:en16931:2017</ram:ID>
+    </ram:GuidelineSpecifiedDocumentContextParameter>
+  </rsm:ExchangedDocumentContext>
+  <rsm:ExchangedDocument>
+    <ram:ID>RE1000</ram:ID>
+    <ram:TypeCode>380</ram:TypeCode>
+    <ram:IssueDateTime>
+      <udt:DateTimeString format="102">20220826</udt:DateTimeString>
+    </ram:IssueDateTime>
+    <ram:IncludedNote>
+      <ram:Content>Sellerie GmbH
+Weg 42
+65432 Sell
+DE</ram:Content>
+    </ram:IncludedNote>
+  </rsm:ExchangedDocument>
+  <rsm:SupplyChainTradeTransaction>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>1</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:SellerAssignedID>AWE01J</ram:SellerAssignedID>
+        <ram:Name>Suite_Enterprise month yearly</ram:Name>
+        <ram:Description/>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>959.4000</ram:ChargeAmount>
+          <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>959.4000</ram:ChargeAmount>
+          <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="H87">1.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:BillingSpecifiedPeriod>
+          <ram:StartDateTime>
+            <udt:DateTimeString format="102">20220829</udt:DateTimeString>
+          </ram:StartDateTime>
+          <ram:EndDateTime>
+            <udt:DateTimeString format="102">20220831</udt:DateTimeString>
+          </ram:EndDateTime>
+        </ram:BillingSpecifiedPeriod>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>959.40</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>2</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:SellerAssignedID>BWP12M</ram:SellerAssignedID>
+        <ram:Name>Suite_Plus year monthly</ram:Name>
+        <ram:Description/>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>54.9500</ram:ChargeAmount>
+          <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>54.9500</ram:ChargeAmount>
+          <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="H87">1.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:BillingSpecifiedPeriod>
+          <ram:StartDateTime>
+            <udt:DateTimeString format="102">20220901</udt:DateTimeString>
+          </ram:StartDateTime>
+          <ram:EndDateTime>
+            <udt:DateTimeString format="102">20220902</udt:DateTimeString>
+          </ram:EndDateTime>
+        </ram:BillingSpecifiedPeriod>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>54.95</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:IncludedSupplyChainTradeLineItem>
+      <ram:AssociatedDocumentLineDocument>
+        <ram:LineID>3</ram:LineID>
+      </ram:AssociatedDocumentLineDocument>
+      <ram:SpecifiedTradeProduct>
+        <ram:SellerAssignedID>CWS12J</ram:SellerAssignedID>
+        <ram:Name>Suite_Starter year yearly</ram:Name>
+        <ram:Description/>
+      </ram:SpecifiedTradeProduct>
+      <ram:SpecifiedLineTradeAgreement>
+        <ram:GrossPriceProductTradePrice>
+          <ram:ChargeAmount>359.4000</ram:ChargeAmount>
+          <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+        </ram:GrossPriceProductTradePrice>
+        <ram:NetPriceProductTradePrice>
+          <ram:ChargeAmount>359.4000</ram:ChargeAmount>
+          <ram:BasisQuantity unitCode="H87">1.0000</ram:BasisQuantity>
+        </ram:NetPriceProductTradePrice>
+      </ram:SpecifiedLineTradeAgreement>
+      <ram:SpecifiedLineTradeDelivery>
+        <ram:BilledQuantity unitCode="H87">1.0000</ram:BilledQuantity>
+      </ram:SpecifiedLineTradeDelivery>
+      <ram:SpecifiedLineTradeSettlement>
+        <ram:ApplicableTradeTax>
+          <ram:TypeCode>VAT</ram:TypeCode>
+          <ram:CategoryCode>S</ram:CategoryCode>
+          <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+        </ram:ApplicableTradeTax>
+        <ram:BillingSpecifiedPeriod>
+          <ram:EndDateTime>
+            <udt:DateTimeString format="102">20220909</udt:DateTimeString>
+          </ram:EndDateTime>
+        </ram:BillingSpecifiedPeriod>
+        <ram:SpecifiedTradeSettlementLineMonetarySummation>
+          <ram:LineTotalAmount>359.40</ram:LineTotalAmount>
+        </ram:SpecifiedTradeSettlementLineMonetarySummation>
+      </ram:SpecifiedLineTradeSettlement>
+    </ram:IncludedSupplyChainTradeLineItem>
+    <ram:ApplicableHeaderTradeAgreement>
+      <ram:SellerTradeParty>
+        <ram:Name>Sellerie GmbH</ram:Name>
+        <ram:DefinedTradeContact>
+          <ram:PersonName>all_suite@test.com all_suite@test.com</ram:PersonName>
+          <ram:TelephoneUniversalCommunication>
+            <ram:CompleteNumber>06661556</ram:CompleteNumber>
+          </ram:TelephoneUniversalCommunication>
+          <ram:EmailURIUniversalCommunication>
+            <ram:URIID>all_suite@test.com</ram:URIID>
+          </ram:EmailURIUniversalCommunication>
+        </ram:DefinedTradeContact>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>65432</ram:PostcodeCode>
+          <ram:LineOne>Weg 42</ram:LineOne>
+          <ram:CityName>Sell</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+        <ram:SpecifiedTaxRegistration>
+          <ram:ID schemeID="VA">DE327606228</ram:ID>
+        </ram:SpecifiedTaxRegistration>
+      </ram:SellerTradeParty>
+      <ram:BuyerTradeParty>
+        <ram:ID>10010</ram:ID>
+        <ram:Name>Beier</ram:Name>
+        <ram:PostalTradeAddress>
+          <ram:PostcodeCode>55569</ram:PostcodeCode>
+          <ram:LineOne>Industriestr. 12</ram:LineOne>
+          <ram:CityName>Musterstadt</ram:CityName>
+          <ram:CountryID>DE</ram:CountryID>
+        </ram:PostalTradeAddress>
+      </ram:BuyerTradeParty>
+    </ram:ApplicableHeaderTradeAgreement>
+    <ram:ApplicableHeaderTradeDelivery>
+      <ram:ActualDeliverySupplyChainEvent>
+        <ram:OccurrenceDateTime>
+          <udt:DateTimeString format="102">20220826</udt:DateTimeString>
+        </ram:OccurrenceDateTime>
+      </ram:ActualDeliverySupplyChainEvent>
+    </ram:ApplicableHeaderTradeDelivery>
+    <ram:ApplicableHeaderTradeSettlement>
+      <ram:PaymentReference>RE1000</ram:PaymentReference>
+      <ram:InvoiceCurrencyCode>EUR</ram:InvoiceCurrencyCode>
+      <ram:ApplicableTradeTax>
+        <ram:CalculatedAmount>261.01</ram:CalculatedAmount>
+        <ram:TypeCode>VAT</ram:TypeCode>
+        <ram:BasisAmount>1373.75</ram:BasisAmount>
+        <ram:CategoryCode>S</ram:CategoryCode>
+        <ram:RateApplicablePercent>19.00</ram:RateApplicablePercent>
+      </ram:ApplicableTradeTax>
+      <ram:BillingSpecifiedPeriod>
+        <ram:StartDateTime>
+          <udt:DateTimeString format="102">20220826</udt:DateTimeString>
+        </ram:StartDateTime>
+        <ram:EndDateTime>
+          <udt:DateTimeString format="102">20220902</udt:DateTimeString>
+        </ram:EndDateTime>
+      </ram:BillingSpecifiedPeriod>
+      <ram:SpecifiedTradePaymentTerms>
+        <ram:Description>Zahlbar ohne Abzug bis 26.08.2022</ram:Description>
+      </ram:SpecifiedTradePaymentTerms>
+      <ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+        <ram:LineTotalAmount>1373.75</ram:LineTotalAmount>
+        <ram:ChargeTotalAmount>0.00</ram:ChargeTotalAmount>
+        <ram:AllowanceTotalAmount>0.00</ram:AllowanceTotalAmount>
+        <ram:TaxBasisTotalAmount>1373.75</ram:TaxBasisTotalAmount>
+        <ram:TaxTotalAmount currencyID="EUR">261.01</ram:TaxTotalAmount>
+        <ram:GrandTotalAmount>1634.76</ram:GrandTotalAmount>              
+        <ram:TotalPrepaidAmount>0.00</ram:TotalPrepaidAmount>
+        <ram:DuePayableAmount>1634.76</ram:DuePayableAmount>
+      </ram:SpecifiedTradeSettlementHeaderMonetarySummation>
+    </ram:ApplicableHeaderTradeSettlement>
+  </rsm:SupplyChainTradeTransaction>
+</rsm:CrossIndustryInvoice>