diff --git a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java index 7487a5d9418..6235aca559a 100644 --- a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java +++ b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java @@ -30,7 +30,6 @@ public interface TaxApiConstants { String startDateParamName = "startDate"; String endDateParamName = "endDate"; - String chargeIncludesTaxParamName = "chargeIncludesTax"; String taxComponentsParamName = "taxComponents"; String idParamName = "id"; String taxComponentIdParamName = "taxComponentId"; diff --git a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxComponent.java b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxComponent.java index b15a5f8933f..616a553023f 100644 --- a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxComponent.java +++ b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxComponent.java @@ -172,10 +172,6 @@ private boolean occursOnDayFrom(final LocalDate target) { return DateUtils.isAfter(target, startDate()); } - public Set getTaxComponentHistories() { - return this.taxComponentHistories; - } - public Set getTaxGroupMappings() { return this.taxGroupMappings; } diff --git a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxGroupMappings.java b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxGroupMappings.java index 181d681ccba..34e529f5b03 100644 --- a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxGroupMappings.java +++ b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxGroupMappings.java @@ -103,10 +103,6 @@ public LocalDate endDate() { return this.endDate; } - public TaxGroup getTaxGroup() { - return taxGroup; - } - public void setTaxGroup(TaxGroup taxGroup) { this.taxGroup = taxGroup; } diff --git a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java index ee5b0cd1052..1dd4480c74d 100644 --- a/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java +++ b/fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java @@ -21,7 +21,6 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Set; import org.apache.fineract.organisation.monetary.domain.MoneyHelper; @@ -78,17 +77,6 @@ public static Map splitTaxData(final BigDecimal am return map; } - public static BigDecimal incomeAmount(final BigDecimal amount, final LocalDate date, final Set taxGroupMappings, - final int scale) { - Map map = splitTax(amount, date, taxGroupMappings, scale); - return incomeAmount(amount, map); - } - - public static BigDecimal incomeAmount(final BigDecimal amount, final Map map) { - BigDecimal totalTax = totalTaxAmount(map); - return amount.subtract(totalTax); - } - public static BigDecimal totalTaxAmount(final Map map) { BigDecimal totalTax = BigDecimal.ZERO; for (BigDecimal tax : map.values()) { @@ -104,26 +92,4 @@ public static BigDecimal totalTaxDataAmount(final Map taxGroupMappings, - final int scale) { - BigDecimal totalAmount = null; - if (amount != null && amount.compareTo(BigDecimal.ZERO) > 0) { - double percentageVal = 0; - double amountVal = amount.doubleValue(); - double cent_percentage = Double.parseDouble("100.0"); - for (TaxGroupMappings groupMappings : taxGroupMappings) { - if (groupMappings.occursOnDayFromAndUpToAndIncluding(date)) { - TaxComponent component = groupMappings.getTaxComponent(); - BigDecimal percentage = component.getApplicablePercentage(date); - if (percentage != null) { - percentageVal = percentageVal + percentage.doubleValue(); - } - } - } - double total = amountVal * cent_percentage / (cent_percentage - percentageVal); - totalAmount = BigDecimal.valueOf(total).setScale(scale, MoneyHelper.getRoundingMode()); - } - return totalAmount; - } }