diff --git a/src/main/java/temppackage/calculators/PurchaseCalculator.java b/src/main/java/temppackage/calculators/PurchaseCalculator.java index d80aa8f..4f7a3f1 100644 --- a/src/main/java/temppackage/calculators/PurchaseCalculator.java +++ b/src/main/java/temppackage/calculators/PurchaseCalculator.java @@ -19,7 +19,7 @@ public BigDecimal calculateGross() { } @Override - public BigDecimal calculateComission() { + public BigDecimal calculateCommission() { return this.calculateGross().multiply(new BigDecimal("0.05")); } @@ -30,6 +30,6 @@ public BigDecimal calculateTax() { @Override public BigDecimal calculateTotal() { - return this.calculateGross().add(this.calculateTax().add(this.calculateComission())); + return this.calculateGross().add(this.calculateTax().add(this.calculateCommission())); } } diff --git a/src/main/java/temppackage/calculators/SaleCalculator.java b/src/main/java/temppackage/calculators/SaleCalculator.java index 2e63ef4..7f9e2d5 100644 --- a/src/main/java/temppackage/calculators/SaleCalculator.java +++ b/src/main/java/temppackage/calculators/SaleCalculator.java @@ -20,7 +20,7 @@ public BigDecimal calculateGross() { } @Override - public BigDecimal calculateComission() { + public BigDecimal calculateCommission() { return this.calculateGross().divide(new BigDecimal("100"), RoundingMode.HALF_UP); } @@ -28,7 +28,7 @@ public BigDecimal calculateComission() { public BigDecimal calculateTax() { BigDecimal purchaseCosts = this.purchasePrice.multiply(this.quantity); BigDecimal earnings = - this.calculateGross().subtract(this.calculateComission()).subtract(purchaseCosts); + this.calculateGross().subtract(this.calculateCommission()).subtract(purchaseCosts); return earnings .multiply(new BigDecimal("30")) .divide(new BigDecimal("100"), RoundingMode.HALF_UP); @@ -36,6 +36,6 @@ public BigDecimal calculateTax() { @Override public BigDecimal calculateTotal() { - return this.calculateGross().subtract(this.calculateComission()).subtract(this.calculateTax()); + return this.calculateGross().subtract(this.calculateCommission()).subtract(this.calculateTax()); } } diff --git a/src/main/java/temppackage/calculators/TransactionCalculator.java b/src/main/java/temppackage/calculators/TransactionCalculator.java index 78699bc..687fb9d 100644 --- a/src/main/java/temppackage/calculators/TransactionCalculator.java +++ b/src/main/java/temppackage/calculators/TransactionCalculator.java @@ -5,7 +5,7 @@ public interface TransactionCalculator { public BigDecimal calculateGross(); - public BigDecimal calculateComission(); + public BigDecimal calculateCommission(); public BigDecimal calculateTax();