diff --git a/Workspace/core/src/main/java/com/pqt/core/entities/sale/Sale.java b/Workspace/core/src/main/java/com/pqt/core/entities/sale/Sale.java index 47adb233..dcaded4a 100644 --- a/Workspace/core/src/main/java/com/pqt/core/entities/sale/Sale.java +++ b/Workspace/core/src/main/java/com/pqt/core/entities/sale/Sale.java @@ -102,10 +102,16 @@ public class Sale implements ILoggable, Serializable{ } public double getTotalPrice() { - double totalPrice = 0; + if(type.getPriceMultiplier()==0) + return 0; + return getTotalWorth()*type.getPriceMultiplier(); + } + + public double getTotalWorth(){ + double totalWorth = 0; for(Product product : this.products.keySet()){ - totalPrice+=product.getPrice()*(double)this.products.get(product); + totalWorth+=product.getPrice()*(double)this.products.get(product); } - return totalPrice; + return totalWorth; } } diff --git a/Workspace/core/src/main/java/com/pqt/core/entities/sale/SaleType.java b/Workspace/core/src/main/java/com/pqt/core/entities/sale/SaleType.java index 7dbf33c8..415738dc 100644 --- a/Workspace/core/src/main/java/com/pqt/core/entities/sale/SaleType.java +++ b/Workspace/core/src/main/java/com/pqt/core/entities/sale/SaleType.java @@ -4,5 +4,15 @@ package com.pqt.core.entities.sale; * Created by Notmoo on 18/07/2017. */ public enum SaleType { - CASH, BANK_CHECK, STUDENT_ASSOCIATION_ACCOUNT, OFFERED_GUEST, OFFERED_STAFF_MEMBER + CASH(1), BANK_CHECK(1), STUDENT_ASSOCIATION_ACCOUNT(1), OFFERED_GUEST(0), OFFERED_STAFF_MEMBER(0); + + private double priceMultiplier; + + SaleType(double priceMultiplier) { + this.priceMultiplier = priceMultiplier; + } + + public double getPriceMultiplier() { + return priceMultiplier; + } }