Merge branch 'master' of github.com:ZUGFeRD/mustangproject

ZUGFeRD · Jul 18, 2024 · a2d3194 · a2d3194
2 parents 5b00818 + be7bded
commit a2d3194
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
@@ -6,7 +6,9 @@
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
@@ -209,7 +211,7 @@ public Invoice extractInto(Invoice zpp) throws XPathExpressionException, ParseEx
 
 		xpr = xpath.compile("//*[local-name()=\"ApplicableHeaderTradeSettlement\"]|//*[local-name()=\"ApplicableSupplyChainTradeSettlement\"]");
 		NodeList headerTradeSettlementNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
-		String IBAN = null, BIC = null;
+		List<BankDetails> bankDetails = new ArrayList<>();
 
 		for (int i = 0; i < headerTradeSettlementNodes.getLength(); i++) {
 			// nodes.item(i).getTextContent())) {
@@ -244,6 +246,7 @@ public Invoice extractInto(Invoice zpp) throws XPathExpressionException, ParseEx
 					NodeList paymentMeansChilds = headerTradeSettlementChilds.item(settlementChildIndex).getChildNodes();
 					for (int paymentMeansChildIndex = 0; paymentMeansChildIndex < paymentMeansChilds
 						.getLength(); paymentMeansChildIndex++) {
+						String IBAN = null, BIC = null;
 						if ((paymentMeansChilds.item(paymentMeansChildIndex).getLocalName() != null) && (paymentMeansChilds
 							.item(paymentMeansChildIndex).getLocalName().equals("PayeePartyCreditorFinancialAccount"))) {
 							NodeList accountChilds = paymentMeansChilds.item(paymentMeansChildIndex).getChildNodes();
@@ -266,6 +269,13 @@ public Invoice extractInto(Invoice zpp) throws XPathExpressionException, ParseEx
 								}
 							}
 						}
+						if (IBAN != null) {
+							BankDetails bd = new BankDetails(IBAN);
+							if (BIC != null) {
+								bd.setBIC(BIC);
+							}
+							bankDetails.add(bd);
+						}
 					}
 				}
 			}
@@ -289,7 +299,11 @@ public Invoice extractInto(Invoice zpp) throws XPathExpressionException, ParseEx
 						.getLength(); paymentTermChildIndex++) {
 						if ((paymentTermChilds.item(paymentTermChildIndex).getLocalName() != null) && (paymentTermChilds
 							.item(paymentTermChildIndex).getLocalName().equals("ID"))) {
-							IBAN = paymentTermChilds.item(paymentTermChildIndex).getTextContent();
+							String IBAN = paymentTermChilds.item(paymentTermChildIndex).getTextContent();
+							if (IBAN != null) {
+								BankDetails bd = new BankDetails(IBAN);
+								bankDetails.add(bd);
+							}
 						}
 					}
 				}
@@ -298,13 +312,7 @@ public Invoice extractInto(Invoice zpp) throws XPathExpressionException, ParseEx
 
 		zpp.setDueDate(dueDate).setDeliveryDate(deliveryDate).setIssueDate(issueDate)
 			.setSender(new TradeParty(SellerNodes)).setRecipient(new TradeParty(BuyerNodes)).setNumber(number);
-		if (IBAN != null) {
-			BankDetails bd = new BankDetails(IBAN);
-			if (BIC != null) {
-				bd.setBIC(BIC);
-			}
-			zpp.getSender().addBankDetails(bd);
-		}
+		bankDetails.forEach(bankDetail -> zpp.getSender().addBankDetails(bankDetail));
 
 		if (buyerOrderIssuerAssignedID != null) {
 			zpp.setBuyerOrderReferencedDocumentID(buyerOrderIssuerAssignedID);