diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java index 45c4d32..b4ffc25 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java @@ -3,6 +3,7 @@ package org.hso.ecommerce.controller; import org.hso.ecommerce.action.user.CreateDeliveryData; import org.hso.ecommerce.action.user.UpdateUserSettingsAction; import org.hso.ecommerce.api.RestServiceForDelivery; +import org.hso.ecommerce.app.config.AppSettings; import org.hso.ecommerce.entities.shop.CustomerOrder; import org.hso.ecommerce.entities.user.User; import org.hso.ecommerce.repos.shop.CustomerOrderRepository; @@ -31,6 +32,9 @@ public class UserController { @Autowired private final RestServiceForDelivery restServiceForDelivery = null; + @Autowired + private final AppSettings appSettings = null; + @GetMapping("/") public String user() { return "redirect:/user/settings"; @@ -58,6 +62,7 @@ public class UserController { .collect(Collectors.toList()); model.addAttribute("orderDeliveryDataMap", customerOrderDeliveryDataMap); + model.addAttribute("deliveryService", appSettings.getParcelServiceName()); return "user/orders/index"; } diff --git a/prototype/src/main/resources/templates/user/orders/index.html b/prototype/src/main/resources/templates/user/orders/index.html index d54074e..354e213 100644 --- a/prototype/src/main/resources/templates/user/orders/index.html +++ b/prototype/src/main/resources/templates/user/orders/index.html @@ -27,6 +27,10 @@
+ + + + - +
Bestelldatum
Lieferstatus @@ -48,7 +52,7 @@
Sendeverfolgungsnummer