From 697c870d9cd7a3036b086ab2aed46386a2aa7c34 Mon Sep 17 00:00:00 2001
From: Bharti <bbhardwaj@usegroup.de>
Date: Mon, 18 Nov 2024 14:01:39 +0100
Subject: [PATCH] UBL updates : PartyTaxScheme and EndpointID thing

---
 .../java/org/mustangproject/TradeParty.java   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/org/mustangproject/TradeParty.java b/library/src/main/java/org/mustangproject/TradeParty.java
index fe519522..dd95eefd 100644
--- a/library/src/main/java/org/mustangproject/TradeParty.java
+++ b/library/src/main/java/org/mustangproject/TradeParty.java
@@ -93,13 +93,37 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 										}
 									}
 								}
+								if (party.item(partyIndex).getLocalName().equals("EndpointID")) {
+										Node currentNode = party.item(partyIndex);
+										if ((currentNode.getAttributes() != null &&
+											(currentNode.getAttributes().getNamedItem("schemeID") != null))
+											&& (party.item(partyIndex).getAttributes().getNamedItem("schemeID").getNodeValue().equals("EM"))
+										) {
+											setEmail(currentNode.getTextContent());
+										}
+
+								}
 
 								if (currentTopElementName.equals("PartyTaxScheme")) {
 									NodeList partyTaxScheme = party.item(partyIndex).getChildNodes();
+									String CompanyId = null;
 									for (int partyTaxSchemeIndex = 0; partyTaxSchemeIndex < partyTaxScheme.getLength(); partyTaxSchemeIndex++) {
 										if (partyTaxScheme.item(partyTaxSchemeIndex).getLocalName() != null) {
 											if (partyTaxScheme.item(partyTaxSchemeIndex).getLocalName().equals("CompanyID")){
-												setTaxID(partyTaxScheme.item(partyTaxSchemeIndex).getTextContent());
+												CompanyId = (partyTaxScheme.item(partyTaxSchemeIndex).getTextContent());
+											}
+											if (partyTaxScheme.item(partyTaxSchemeIndex).getLocalName().equals("TaxScheme")){
+												NodeList taxSchemechilds = partyTaxScheme.item(partyTaxSchemeIndex).getChildNodes();
+												for (int taxSchemechildsIndex = 0; taxSchemechildsIndex < taxSchemechilds.getLength(); taxSchemechildsIndex++) {
+													if (taxSchemechilds.item(taxSchemechildsIndex).getLocalName() != null){
+														if (taxSchemechilds.item(taxSchemechildsIndex).getTextContent().equals("FC")) {
+															setTaxID(CompanyId);
+														}
+														else{
+															setVATID(CompanyId);
+														}
+													}
+												}
 											}
 										}
 
@@ -190,7 +214,8 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 									}
 								}
 							}
-						}
+
+					}
 
 					if (currentUBLChild.equals("GlobalID")) {
 						if (nodes.item(nodeIndex).getAttributes().getNamedItem("schemeID") != null) {