From 1fbb2954173021e741a0b42d7abb1f6afd44bba0 Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Wed, 11 May 2022 20:44:31 +0200
Subject: [PATCH] storing sender/recipient in 1Lieferschein

---
 .../ZUGFeRD/UBLDAPullProvider.java            | 31 +++++++++++++++++--
 .../org/mustangproject/ZUGFeRD/UBLTest.java   |  3 --
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/UBLDAPullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/UBLDAPullProvider.java
index 2890e4b5..07da7e8b 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/UBLDAPullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/UBLDAPullProvider.java
@@ -27,6 +27,7 @@ import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 import org.mustangproject.EStandard;
 import org.mustangproject.FileAttachment;
+import org.mustangproject.TradeParty;
 import org.mustangproject.XMLTools;
 
 import java.io.IOException;
@@ -63,11 +64,18 @@ public class UBLDAPullProvider implements IXMLProvider {
 
 		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
 				"<DespatchAdvice xmlns=\"urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2\" xmlns:cac=\"urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2\" xmlns:cbc=\"urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2\" xmlns:cec=\"urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2\" xmlns:csc=\"urn:oasis:names:specification:ubl:schema:xsd:CommonSignatureComponents-2\">\n" +
+				"  <cbc:UBLVersionID>2.2</cbc:UBLVersionID>\n" +
+				"  <cbc:CustomizationID>1Lieferschein</cbc:CustomizationID>\n" +
+				"  <cbc:ProfileID>ubl-xml-only</cbc:ProfileID>\n" +
 				"  <cbc:ID>" + XMLTools.encodeXML(trans.getNumber()) + "</cbc:ID>\n" +
-				"  <cbc:IssueDate>"+ublDateFormat.format(trans.getIssueDate())+"</cbc:IssueDate>\n" +
-				"  <cac:DespatchSupplierParty/>\n" +
-				"  <cac:DeliveryCustomerParty/>\n";
+				"  <cbc:IssueDate>" + ublDateFormat.format(trans.getIssueDate()) + "</cbc:IssueDate>\n" +
+				"  <cbc:DespatchAdviceTypeCode>900</cbc:DespatchAdviceTypeCode>\n";
+		if (trans.getReferenceNumber() != null) {
+			xml += "<cac:OrderReference>  <cbc:ID>" + XMLTools.encodeXML(trans.getNumber()) + "</cbc:ID></cac:OrderReference>\n";
 
+		}
+		xml += "  <cac:DespatchSupplierParty>" + getPartyXML(trans.getSender()) + "</cac:DespatchSupplierParty>\n" +
+				"  <cac:DeliveryCustomerParty>" + getPartyXML(trans.getRecipient()) + "</cac:DeliveryCustomerParty>\n";
 		int i = 1;
 		for (IZUGFeRDExportableItem item : trans.getZFItems()) {
 			xml +=
@@ -91,6 +99,23 @@ public class UBLDAPullProvider implements IXMLProvider {
 		}
 	}
 
+	public String getPartyXML(IZUGFeRDExportableTradeParty tp) {
+		return "<cac:Party>\n" +
+				"      <cac:PostalAddress>\n" +
+				"        <cbc:CityName>" + XMLTools.encodeXML(tp.getLocation()) + "</cbc:CityName>\n" +
+				"        <cac:AddressLine>\n" +
+				"          <cbc:Line>" + XMLTools.encodeXML(tp.getName()) + "</cbc:Line>\n" +
+				"        </cac:AddressLine>\n" +
+				"        <cac:AddressLine>\n" +
+				"          <cbc:Line>" + XMLTools.encodeXML(tp.getStreet()) + "</cbc:Line>\n" +
+				"        </cac:AddressLine>\n" +
+				"        <cac:Country>\n" +
+				"          <cbc:IdentificationCode>" + XMLTools.encodeXML(tp.getCountry()) + "</cbc:IdentificationCode>\n" +
+				"        </cac:Country>\n" +
+				"      </cac:PostalAddress>\n" +
+				"    </cac:Party>";
+	}
+
 
 	@Override
 	public byte[] getXML() {
diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java
index 59d1e653..38614e44 100644
--- a/library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java
+++ b/library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java
@@ -72,9 +72,6 @@ public class UBLTest extends ResourceCase {
 				.setReferenceNumber("991-01484-64")//leitweg-id
 				.setNumber("123").addItem(new Item(new Product("Testprodukt", "", "C62", BigDecimal.ZERO), /*price*/ new BigDecimal("1.0"),  /*qty*/ new BigDecimal("1.0")).addReferencedLineID("A12"));
 
-		UBLDAPullProvider zf2p = new UBLDAPullProvider();
-		zf2p.setProfile(Profiles.getByName(EStandard.despatchadvice, "Pilot", 1));
-		zf2p.generateXML(i);
 
 		try {
 			oe.setTransaction(i);