Skip to content
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

Enable other charges in connection estimation #95

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

Enable other charges in connection estimation #95

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
15 changes: 7 additions & 8 deletions sw-calculator/src/main/java/org/egov/swcalculation/service/EstimationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,12 @@ else if(connection_propertyType.contains("DOM") || connection_propertyType.conta
connectionFee=connectionFeeApplicable;
}

/*
* BigDecimal otherCharges = BigDecimal.ZERO; if
* (feeObj.get(SWCalculationConstant.OTHER_CHARGE_CONST) != null) { otherCharges
* = new
* BigDecimal(feeObj.getAsNumber(SWCalculationConstant.OTHER_CHARGE_CONST).
* toString()); }
*/

BigDecimal otherCharges = BigDecimal.ZERO;
if (feeObj.get(SWCalculationConstant.OTHER_CHARGE_CONST) != null) {
otherCharges = new BigDecimal(feeObj.getAsNumber(SWCalculationConstant.OTHER_CHARGE_CONST).toString());
}

BigDecimal taxAndCessPercentage = BigDecimal.ZERO;
if (feeObj.get(SWCalculationConstant.TAX_PERCENTAGE_CONST) != null) {
taxAndCessPercentage = new BigDecimal(
Expand Down Expand Up @@ -499,7 +498,7 @@ else if(connection_propertyType.contains("DOM") || connection_propertyType.conta
// criteria.getSewerageConnection().getRoadCuttingArea());
// }

BigDecimal totalCharge = formFee.add(securityDeposit).add(roadCuttingCharge).add(connectionFee);
BigDecimal totalCharge = formFee.add(securityDeposit).add(roadCuttingCharge).add(connectionFee).add(otherCharges);
// .add(meterCost).add(roadPlotCharge).add(usageTypeCharge);
BigDecimal tax = totalCharge.multiply(taxAndCessPercentage.divide(SWCalculationConstant.HUNDRED));
//
Expand Down