From a07cef4fd911dd3580bf19fff8c007f802c138f2 Mon Sep 17 00:00:00 2001 From: Mauritz Funke Date: Wed, 21 Aug 2024 14:45:10 +0200 Subject: [PATCH 1/3] Adds a function to get the total amount of a charge without specifying an item --- .../src/main/java/org/mustangproject/Charge.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/org/mustangproject/Charge.java b/library/src/main/java/org/mustangproject/Charge.java index c1810c57..a16f5e66 100644 --- a/library/src/main/java/org/mustangproject/Charge.java +++ b/library/src/main/java/org/mustangproject/Charge.java @@ -116,12 +116,20 @@ public class Charge implements IZUGFeRDAllowanceCharge { @Override public BigDecimal getTotalAmount(IAbsoluteValueProvider currentItem) { + if (percent!=null) { + return currentItem.getValue().multiply(getPercent().divide(new BigDecimal(100))); + } else if(totalAmount != null) { + return totalAmount; + } else { + throw new RuntimeException("percent must be set"); + } + } + + public BigDecimal getTotalAmount() { if (totalAmount!=null) { return totalAmount; - } else if (percent!=null) { - return currentItem.getValue().multiply(getPercent().divide(new BigDecimal(100))); } else { - throw new RuntimeException("Either totalAmount or percent must be set"); + throw new RuntimeException("totalAmount must be set"); } } From 2dacde9cfbf6e4bdab4273a8aa7b8983ddc00311 Mon Sep 17 00:00:00 2001 From: Mauritz Funke Date: Wed, 21 Aug 2024 15:00:21 +0200 Subject: [PATCH 2/3] Revert "Adds a function to get the total amount of a charge without specifying an item" This reverts commit a07cef4fd911dd3580bf19fff8c007f802c138f2. --- .../src/main/java/org/mustangproject/Charge.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/library/src/main/java/org/mustangproject/Charge.java b/library/src/main/java/org/mustangproject/Charge.java index a16f5e66..c1810c57 100644 --- a/library/src/main/java/org/mustangproject/Charge.java +++ b/library/src/main/java/org/mustangproject/Charge.java @@ -116,20 +116,12 @@ public class Charge implements IZUGFeRDAllowanceCharge { @Override public BigDecimal getTotalAmount(IAbsoluteValueProvider currentItem) { - if (percent!=null) { - return currentItem.getValue().multiply(getPercent().divide(new BigDecimal(100))); - } else if(totalAmount != null) { - return totalAmount; - } else { - throw new RuntimeException("percent must be set"); - } - } - - public BigDecimal getTotalAmount() { if (totalAmount!=null) { return totalAmount; + } else if (percent!=null) { + return currentItem.getValue().multiply(getPercent().divide(new BigDecimal(100))); } else { - throw new RuntimeException("totalAmount must be set"); + throw new RuntimeException("Either totalAmount or percent must be set"); } } From ae07c77c43585a165054a55a28aeb8532425a962 Mon Sep 17 00:00:00 2001 From: Mauritz Funke Date: Wed, 21 Aug 2024 15:02:56 +0200 Subject: [PATCH 3/3] Adds a function to get the total amount of a charge without specifying an item --- .../src/main/java/org/mustangproject/Charge.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/org/mustangproject/Charge.java b/library/src/main/java/org/mustangproject/Charge.java index c1810c57..a16f5e66 100644 --- a/library/src/main/java/org/mustangproject/Charge.java +++ b/library/src/main/java/org/mustangproject/Charge.java @@ -116,12 +116,20 @@ public class Charge implements IZUGFeRDAllowanceCharge { @Override public BigDecimal getTotalAmount(IAbsoluteValueProvider currentItem) { + if (percent!=null) { + return currentItem.getValue().multiply(getPercent().divide(new BigDecimal(100))); + } else if(totalAmount != null) { + return totalAmount; + } else { + throw new RuntimeException("percent must be set"); + } + } + + public BigDecimal getTotalAmount() { if (totalAmount!=null) { return totalAmount; - } else if (percent!=null) { - return currentItem.getValue().multiply(getPercent().divide(new BigDecimal(100))); } else { - throw new RuntimeException("Either totalAmount or percent must be set"); + throw new RuntimeException("totalAmount must be set"); } }