From a4be1da6c6d48e28bdff3f6fbc22c8642c25b188 Mon Sep 17 00:00:00 2001 From: Alexander Berndt Date: Thu, 18 Jun 2020 10:29:10 +0200 Subject: [PATCH] Added getInvoiceCurrencyCode() to ZUGFeRDImporter.java Added Test --- .../mustangproject/ZUGFeRD/ZUGFeRDImporter.java | 16 ++++++++++++++++ .../java/org/mustangproject/ZUGFeRD/ZF2Test.java | 2 ++ 2 files changed, 18 insertions(+) diff --git a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index de64c446..5a6eb064 100644 --- a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -274,6 +274,22 @@ public class ZUGFeRDImporter { return ""; } + /** + * @return the Invoice Currency Code + */ + public String getInvoiceCurrencyCode() { + try { + if (getVersion() == 1) { + return extractString("//ApplicableSupplyChainTradeSettlement//InvoiceCurrencyCode"); + } else { + return extractString("//ApplicableHeaderTradeSettlement//InvoiceCurrencyCode"); + } + } catch (Exception e) { + e.printStackTrace(); + return ""; + } + } + /** * @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 7adc39f6..a24f5625 100644 --- a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java +++ b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java @@ -209,6 +209,8 @@ public class ZF2Test extends MustangReaderTestCase { assertEquals(zi.getAmount(), "571.04"); assertEquals(zi.getInvoiceID(), "RE-20170509/505"); assertEquals(zi.getZUGFeRDProfil(), "COMFORT"); + assertEquals(zi.getInvoiceCurrencyCode(), "EUR"); + assertEquals(zi.getHolder(), getOwnOrganisationName()); assertEquals(zi.getDocumentCode(),"380"); assertEquals(zi.getReference(),"AB321");