From c62171e64df153f0247332adbb12fa6b5f21c5c0 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Sun, 2 Jan 2022 17:49:13 +0100 Subject: [PATCH] recorrected import to also still work with fx --- .../org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java | 5 ++++- .../validator/ZUGFeRDValidatorTest.java | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java index 9e194504..3168dc2a 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java @@ -572,7 +572,10 @@ public class ZUGFeRDImporter { public String getAmount() { String result = extractString("//*[local-name() = 'SpecifiedTradeSettlementHeaderMonetarySummation']/*[local-name() = 'DuePayableAmount']"); if (result == null || result.isEmpty()) { - result = extractString("//*[local-name() = 'SpecifiedTradeSettlementHeaderMonetarySummation']/*[local-name() = 'GrandTotalAmount']"); + + /* fx/zf would be SpecifiedTradeSettlementMonetarySummation + * but ox is SpecifiedTradeSettlementHeaderMonetarySummation...*/ + result = extractString("//*[local-name() = 'GrandTotalAmount']"); } return result; } diff --git a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java index 157c731a..e62c1bd3 100644 --- a/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java +++ b/validator/src/test/java/org/mustangproject/validator/ZUGFeRDValidatorTest.java @@ -57,7 +57,19 @@ public class ZUGFeRDValidatorTest extends ResourceCase { res = zfv.validate(tempFile.getAbsolutePath()); assertThat(res).valueByXPath("/validation/summary/@status") .isEqualTo("valid"); +/* + tempFile = getResourceAsFile("testout-OX.pdf"); + zfv = new ZUGFeRDValidator(); + res = zfv.validate(tempFile.getAbsolutePath()); + assertThat(res).valueByXPath("/validation/summary/@status") + .isEqualTo("valid"); + tempFile = getResourceAsFile("testout-OX.xml"); + zfv = new ZUGFeRDValidator(); + res = zfv.validate(tempFile.getAbsolutePath()); + assertThat(res).valueByXPath("/validation/summary/@status") + .isEqualTo("valid"); +*/ tempFile = getResourceAsFile("invalidXRechnung.pdf"); zfv = new ZUGFeRDValidator(); res = zfv.validate(tempFile.getAbsolutePath());