diff --git a/src/backend/OnlineShop.java b/src/backend/OnlineShop.java index 8c8d7a7..990f292 100644 --- a/src/backend/OnlineShop.java +++ b/src/backend/OnlineShop.java @@ -14,7 +14,7 @@ public class OnlineShop { umwandlung(lager); } - public static ArrayList readFile(String path) throws FileNotFoundException { + public ArrayList readFile(String path) throws FileNotFoundException { ArrayList lines = new ArrayList<>(); Scanner sc = new Scanner(new File(path)); @@ -28,7 +28,7 @@ public class OnlineShop { return lines; } - public static ArrayList umwandlung (ArrayList liste) throws FileNotFoundException { + public ArrayList umwandlung (ArrayList liste) throws FileNotFoundException { ArrayList resource = readFile("resources\\produkte.csv"); for (int i = 1; i < resource.size(); i++) { String[] teile = resource.get(i).split(","); @@ -68,9 +68,8 @@ public class OnlineShop { public String[] warenkorbToArray(){ String[] warenkorbZeilen = new String[warenkorb.menge.size()]; - double[] bruttopreis = warenkorb.bruttoPreisBerechnen(); for (int i = 0; i < warenkorb.menge.size(); i++){ - warenkorbZeilen[i] = String.valueOf(warenkorb.menge.get(i) + " Stück | " + lager.get(i).getName() + " | " + (bruttopreis[i] * warenkorb.menge.get(i)) + "€"); + warenkorbZeilen[i] = String.valueOf(warenkorb.menge.get(i) + " Stück | " + lager.get(i).getName() + " | " + (lager.get(i).getBruttoPreis() * warenkorb.menge.get(i)) + "€"); } return warenkorbZeilen; @@ -96,10 +95,9 @@ public class OnlineShop { bestellung.versandkosten = versandkostenUndAnteile[0]; bestellung.anteil7 = versandkostenUndAnteile[1]; bestellung.anteil19 = versandkostenUndAnteile[2]; - double[] bruttopreis = warenkorb.bruttoPreisBerechnen(); double gesamtpreis = 0; - for (int i = 0; i