From 417eaeca15de1d933c954fb7c3d02ba1c9f14828 Mon Sep 17 00:00:00 2001 From: Alexander Berndt Date: Thu, 18 Jun 2020 10:35:35 +0200 Subject: [PATCH] Added getIssuerAssignedID() to ZUGFeRDImporter.java Added Test --- .../ZUGFeRD/ZUGFeRDImporter.java | 23 +++++++++++++++++++ .../org/mustangproject/ZUGFeRD/ZF2Test.java | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index 5a6eb064..3a81d12e 100644 --- a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -290,6 +290,29 @@ public class ZUGFeRDImporter { } } + /** + * @return the IssuerAssigned ID + */ + public String getIssuerAssignedID() { + try { + if (getVersion() == 1) { + return extractString("//BuyerOrderReferencedDocument//ID"); + } else { + return extractString("//BuyerOrderReferencedDocument//IssuerAssignedID"); + } + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + } + + /** + * @return the BuyerTradeParty ID + */ + public String getBuyerTradePartyID() { + return extractString("//BuyerTradeParty//ID"); + } + /** * @return the Invoice ID */ diff --git a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java index a24f5625..618e8d9a 100644 --- a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java +++ b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java @@ -210,7 +210,7 @@ public class ZF2Test extends MustangReaderTestCase { assertEquals(zi.getInvoiceID(), "RE-20170509/505"); assertEquals(zi.getZUGFeRDProfil(), "COMFORT"); assertEquals(zi.getInvoiceCurrencyCode(), "EUR"); - + assertEquals(zi.getIssuerAssignedID(),""); assertEquals(zi.getHolder(), getOwnOrganisationName()); assertEquals(zi.getDocumentCode(),"380"); assertEquals(zi.getReference(),"AB321");