diff --git a/OnlineShop/src/backend/Produkt.java b/OnlineShop/src/backend/Produkt.java index 959a8de..3e0b0f7 100644 --- a/OnlineShop/src/backend/Produkt.java +++ b/OnlineShop/src/backend/Produkt.java @@ -1,6 +1,5 @@ package backend; -import java.util.ArrayList; public class Produkt { public int id; diff --git a/OnlineShop/src/backend/Warenkorb.java b/OnlineShop/src/backend/Warenkorb.java index 0126614..f7fedde 100644 --- a/OnlineShop/src/backend/Warenkorb.java +++ b/OnlineShop/src/backend/Warenkorb.java @@ -36,7 +36,7 @@ public class Warenkorb { public int NettoVersandkosten(){ int ret = 0; for(int i = 0; i < this.inhalt.size(); i++) { - ret += BruttoVersandkosten()-(((this.inhalt.get(i).netto*this.anzahl.get(i))/NettoPreis())*BruttoVersandkosten())/(1+this.inhalt.get(i).mwStSatz); + ret += (((this.inhalt.get(i).netto*this.anzahl.get(i))/NettoPreis())*BruttoVersandkosten())/(1+((double)this.inhalt.get(i).mwStSatz/100)); } return ret; }; diff --git a/OnlineShop/src/tui/ShopTUI.java b/OnlineShop/src/tui/ShopTUI.java index 1ef076f..c2501d3 100644 --- a/OnlineShop/src/tui/ShopTUI.java +++ b/OnlineShop/src/tui/ShopTUI.java @@ -153,9 +153,10 @@ public class ShopTUI { shop.UpdateKundeInWarenkorb(name, addr); }; private static void Bestellen() { + ShowWarenkorb(); shop.AddBestellung(); }; - private static void ShowBestellungen(){}; + private static void ShowBestellungen(){ }; private static ArrayList readFile(String path) throws FileNotFoundException {