Skip to content

FINERACT-2801: Remove unused (dead) code in fineract-tax #6382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SamaSVM wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FINERACT-2801: Remove unused (dead) code in fineract-tax #6382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/api/TaxApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 0 additions & 4 deletions fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@ private boolean occursOnDayFrom(final LocalDate target) {
return DateUtils.isAfter(target, startDate());
}

public Set<TaxComponentHistory> getTaxComponentHistories() {
return this.taxComponentHistories;
}

public Set<TaxGroupMappings> getTaxGroupMappings() {
return this.taxGroupMappings;
}
Expand Down
4 changes: 0 additions & 4 deletions fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/domain/TaxGroupMappings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ public LocalDate endDate() {
return this.endDate;
}

public TaxGroup getTaxGroup() {
return taxGroup;
}

public void setTaxGroup(TaxGroup taxGroup) {
this.taxGroup = taxGroup;
}
Expand Down
34 changes: 0 additions & 34 deletions fineract-tax/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -78,17 +77,6 @@ public static Map<TaxComponentData, BigDecimal> splitTaxData(final BigDecimal am
return map;
}

public static BigDecimal incomeAmount(final BigDecimal amount, final LocalDate date, final Set<TaxGroupMappings> taxGroupMappings,
final int scale) {
Map<TaxComponent, BigDecimal> map = splitTax(amount, date, taxGroupMappings, scale);
return incomeAmount(amount, map);
}

public static BigDecimal incomeAmount(final BigDecimal amount, final Map<TaxComponent, BigDecimal> map) {
BigDecimal totalTax = totalTaxAmount(map);
return amount.subtract(totalTax);
}

public static BigDecimal totalTaxAmount(final Map<TaxComponent, BigDecimal> map) {
BigDecimal totalTax = BigDecimal.ZERO;
for (BigDecimal tax : map.values()) {
Expand All @@ -104,26 +92,4 @@ public static BigDecimal totalTaxDataAmount(final Map<TaxComponentData, BigDecim
}
return totalTax;
}

public static BigDecimal addTax(final BigDecimal amount, final LocalDate date, final List<TaxGroupMappings> 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;
}
}
Loading