mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-07-19 21:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add checkout and change of orderType

Browse source
This commit is contained in:
Mathis Kral 2023-11-07 22:23:48 +01:00 committed by Simon Bruder
parent 8eb8281e5c
commit d8bcb311dc
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
3 changed files with 75 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/catering/order/CustomCart.java
View file

@ -1,5 +1,6 @@
package catering.order; package catering.order;
import org.salespointframework.quantity.Quantity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
@ -9,7 +10,7 @@ import java.util.Map;
@Component @Component
public class CustomCart { public class CustomCart {
private CustomOrder.OrderType orderType; private CustomOrder.OrderType orderType;
private Map<String, Integer> products; private Map<String, Quantity> products;
public CustomCart() { public CustomCart() {
this.orderType = CustomOrder.OrderType.SOMETHING_ELSE; this.orderType = CustomOrder.OrderType.SOMETHING_ELSE;
@ -25,15 +26,20 @@ public class CustomCart {
return; return;
} }
public Map<String, Integer> getProucts() { public Map<String, Quantity> getProucts() {
return products; return products;
} }
public void addProduct(String product, int number) { public void addProduct(String product, int number) {
products.put(product, number); products.put(product, Quantity.of(number));
} }
public boolean removeProduct(String product) { public boolean removeProduct(String product) {
return products.remove(product) != null; return products.remove(product) != null;
} }
public void resetCart() {
orderType = CustomOrder.OrderType.SOMETHING_ELSE;
products = new HashMap<>();
}
} }

50
src/main/java/catering/order/OrderController.java
View file

@ -1,10 +1,14 @@
package catering.order; package catering.order;
import org.salespointframework.quantity.Quantity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import java.util.Optional;
@Controller @Controller
public class OrderController { public class OrderController {
@ -26,8 +30,8 @@ public class OrderController {
@GetMapping("/event") @GetMapping("/event")
public String event(Model model) { public String event(Model model) {
model.addAttribute("orderType", cart.getOrderType());
model.addAttribute("items", cart.getProucts()); model.addAttribute("items", cart.getProucts());
model.addAttribute("type", cart.getOrderType());
model.addAttribute("productForm", new ProductForm()); model.addAttribute("productForm", new ProductForm());
return "event"; return "event";
} }
@ -40,11 +44,49 @@ public class OrderController {
@PostMapping("/event/addProduct") @PostMapping("/event/addProduct")
public String addProduct(@ModelAttribute ProductForm product, Model model) { public String addProduct(@ModelAttribute ProductForm productForm, Model model) {
cart.addProduct(product.getProduct(), product.getNumber()); cart.addProduct(productForm.getProduct(), productForm.getNumber());
model.addAttribute("orderType", cart.getOrderType());
model.addAttribute("items", cart.getProucts()); model.addAttribute("items", cart.getProucts());
model.addAttribute("type", cart.getOrderType());
model.addAttribute("productForm", new ProductForm()); model.addAttribute("productForm", new ProductForm());
return "redirect:/event"; return "redirect:/event";
} }
@PostMapping("/event/checkout")
public String checkout(Model model) {
System.out.println(cart);
CustomOrder myOrder = new CustomOrder(
cart.getOrderType(),
LocalDateTime.MIN,
LocalDateTime.MAX,
cart.getProucts(),
false,
Double.MAX_VALUE
);
orderRepository.addOrder(myOrder);
model.addAttribute("orders", orderRepository.getOrders());
model.addAttribute("total", orderRepository.getOrders().size());
cart.resetCart();
return "redirect:/orders";
}
@PostMapping("/event/changeOrderType")
public String changeOrderType(@RequestParam(name = "orderType") Optional<String> optionalOrderType, Model model) {
String orderType = optionalOrderType.orElse("DEINE_FETTE_MUTTER");
switch (orderType) {
case "RaK":
cart.setOrderType(CustomOrder.OrderType.RENT_A_COOK);
break;
case "EK":
cart.setOrderType(CustomOrder.OrderType.EVENT_CATERING);
break;
case "SN":
cart.setOrderType(CustomOrder.OrderType.SUSHI_NIGHT);
break;
default:
}
return "redirect:/event";
}
} }

21
src/main/resources/templates/event.html
View file

@ -5,7 +5,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="stylesheet" th:href="@{/resources/css/style.css}"> <link rel="stylesheet" th:href="@{/resources/css/style.css}">
<title th:text="Katalog">Katalog</title> <title th:text="Eventplaner">Katalog</title>
</head> </head>
<body> <body>
<div class="topnav"> <!-- später für css --> <div class="topnav"> <!-- später für css -->
@ -18,7 +18,18 @@
<h1>Eventplaner (planen Sie Ihr Event)</h1> <h1>Eventplaner (planen Sie Ihr Event)</h1>
<span th:text="'Typ: ' + ${type}"/> <span th:text="'Typ: ' + ${orderType}"/>
<form th:action="@{/event/changeOrderType}" method="post">
<select name="orderType">
<option disabled="disabled" selected value="NULL" th:text="' -- Wählen Sie eine Option -- '"/>
<option th:value="'SE'" th:text="'Something else'"/>
<option th:value="'RaK'" th:text="Rent-a-Cook"/>
<option th:value="'EK'" th:text="Eventcatering"/>
<option th:value="'SN'" th:text="'Sushi Night'"/>
</select>
<input type="submit" value="Eventtypen ändern"/>
</form>
<table style="width:100%; text-align:left"> <table style="width:100%; text-align:left">
<tr> <tr>
@ -47,6 +58,12 @@
<input type="submit" value="Submit"/> <input type="submit" value="Submit"/>
</form> </form>
<div>
<form method="post" th:action="@{/event/checkout}">
<input type="submit" th:value="'Kostenpflichtig bestellen'"/>
</form>
</div>
</body> </body>
<footer style="bottom: 0; position: absolute;"> <footer style="bottom: 0; position: absolute;">