From 58f153fc46bb74eec141fd56ea79909cdc207767 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Sat, 7 Jun 2025 14:55:29 +0200 Subject: [PATCH] corrected writing --- .../main/java/org/mustangproject/Item.java | 13 ----- .../ZUGFeRD/ZUGFeRD2PullProvider.java | 2 +- .../ZUGFeRD/ZUGFeRDInvoiceImporter.java | 48 ------------------- 3 files changed, 1 insertion(+), 62 deletions(-) diff --git a/library/src/main/java/org/mustangproject/Item.java b/library/src/main/java/org/mustangproject/Item.java index 247f2e3b..6d57722d 100644 --- a/library/src/main/java/org/mustangproject/Item.java +++ b/library/src/main/java/org/mustangproject/Item.java @@ -72,8 +72,6 @@ public class Item implements IZUGFeRDExportableItem { //we need: name description unitcode //and we additionally have vat% - // Bharti's homework 20241126:Streams https://www.youtube.com/watch?v=Lf01cBzmuXw - // and Lambdas https://www.youtube.com/watch?v=HCyx31NW8xg setProduct(new Product(itemMap.getNode("Item").get())); icnm.getAsString("Name").ifPresent(product::setName); icnm.getAsString("Description").ifPresent(product::setDescription); @@ -86,17 +84,6 @@ public class Item implements IZUGFeRDExportableItem { BuyersItemIdentification.getAsString("ID").ifPresent(product::setBuyerAssignedID); }); -// String name = icnm.getAsStringOrNull("Name"); -// String val = icnm.getAsStringOrNull("Value"); -// if (name != null && val != null) { -// if (attributes == null) { -// attributes = new HashMap<>(); -// } -// product.attributes.put(name, val); -// } - //icnm.getNode("AdditionalItemProperty").flatMap(n ->n.getAttributes()).ifPresent(product::setAttributes); - - icnm.getAsNodeMap("ClassifiedTaxCategory").flatMap(m -> m.getAsBigDecimal("Percent")) .ifPresent(product::setVATPercent); }); diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java index 75356d86..008f99d2 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java @@ -547,7 +547,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider { + ""; // item charges/allowances if (!itemTotalAllowanceChargeStr.isEmpty()) { - xml += ""+ itemTotalAllowanceChargeStr +""; + xml += itemTotalAllowanceChargeStr ; } if ((currentItem.getDetailedDeliveryPeriodFrom() != null) || (currentItem.getDetailedDeliveryPeriodTo() != null)) { diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java index 19a0084f..180d64bb 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java @@ -383,29 +383,7 @@ public class ZUGFeRDInvoiceImporter { }); }); String street, name, additionalStreet, city, postal, countrySubentity, line, country = null; -/* - String idx = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"ID\"]"); - street = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name()=\"Address\"]/*[local-name()=\"StreetName\"]"); - additionalStreet = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"Address\"]/*[local-name() = \"AdditionalStreetName\"]"); - city = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"Address\"]/*[local-name() = \"CityName\"]"); - postal = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"Address\"]/*[local-name() = \"PostalZone\"]"); - countrySubentity = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"Address\"]/*[local-name() = \"CountrySubentity\"]"); - line = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"Address\"]//*[local-name() = \"AddressLine\"]/*[local-name() = \"Line\"]"); - country = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"Address\"]//*[local-name() = \"Country\"]/*[local-name() = \"IdentificationCode\"]"); - name = extractString("//*[local-name()=\"DeliveryLocation\"]/*[local-name() = \"DeliveryParty\"]//*[local-name() = \"PartyName\"]/*[local-name() = \"Name\"]"); -*/ zpp.setDeliveryAddress(delivery); - /* - zpp.setDeliveryAddress(new TradeParty() - .setStreet(street) - .setAdditionalAddress(additionalStreet) - .setLocation(city) - .setZIP(postal) - .setAdditionalAddressExtension(line) - .setCountry(country) - .setName(name) - ); -*/ } @@ -420,31 +398,8 @@ public class ZUGFeRDInvoiceImporter { XPathExpression shipPayee = xpath.compile("//*[local-name()=\"PayeeParty\"]/*"); NodeList ublPayeeNodes = (NodeList) shipPayee.evaluate(getDocument(), XPathConstants.NODESET); -// if(ublPayeeNodes != null) { -// TradeParty payee = new TradeParty(); -// NodeMap nodeMap = new NodeMap(ublPayeeNodes).getAsNodeMap("PayeeParty").get(); -// nodeMap.getNode("ID").ifPresent(s -> { -// SchemedID sID = new SchemedID().setScheme(s.getAttributes().getNamedItem("schemeID").getTextContent()).setId(s.getTextContent()); -// payee.addGlobalID(sID); -// }); -// } //NodeList UBLpayeeNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET); zpp.setPayee(new TradeParty(ublPayeeNodes)); -// TradeParty payee =new TradeParty(); -// NodeMap payeeID = new NodeMap(UBLpayeeNodes).getAsNodeMap("PartyIdentification").get(); -// if (payeeID !=null) { -// payeeID.getAsString("Name").ifPresent(t->payee.setName(t)); -// } -// if (payeeNodes != null) { -// TradeParty payee =new TradeParty(); -// NodeMap nodeMap = new NodeMap(payeeNodes).getAsNodeMap("PartyIdentification").get(); -// if (nodeMap != null) { -// nodeMap.getNode("ID").ifPresent(s -> { -// SchemedID sID = new SchemedID().setScheme(s.getAttributes().getNamedItem("schemeID").getTextContent()).setId(s.getTextContent()); -// payee.addGlobalID(sID); -// }); -// } -// } xpr = xpath.compile("//*[local-name()=\"ExchangedDocument\"]|//*[local-name()=\"HeaderExchangedDocument\"]"); @@ -834,9 +789,6 @@ public class ZUGFeRDInvoiceImporter { } } } -// if ((paymentMeansChilds.item(paymentTermChildIndex).getLocalName() != null) && (paymentTermChilds.item(paymentTermChildIndex).getLocalName().equals("DirectDebitMandateID"))) { -// directDebitMandateID = paymentTermChilds.item(paymentTermChildIndex).getTextContent(); -// } if ((paymentMeansChilds.item(meansChildIndex).getLocalName() != null) && (paymentMeansChilds.item(meansChildIndex).getLocalName().equals("PaymentMandate"))) { NodeList paymentMandateChilds = paymentMeansChilds.item(meansChildIndex).getChildNodes();