diff --git a/build.gradle b/build.gradle index fcfefb2..0e72a36 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'war' apply plugin: 'application' group = 'de.jottyfan.camporganizer' -version = '0.1.0' +version = '0.1.1' sourceCompatibility = 17 mainClassName = "de.jottyfan.camporganizer.Main" diff --git a/src/main/java/de/jottyfan/camporganizer/Main.java b/src/main/java/de/jottyfan/camporganizer/Main.java index e641c2a..9cf56d0 100644 --- a/src/main/java/de/jottyfan/camporganizer/Main.java +++ b/src/main/java/de/jottyfan/camporganizer/Main.java @@ -1,5 +1,10 @@ package de.jottyfan.camporganizer; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -14,12 +19,20 @@ import org.springframework.web.bind.annotation.RestController; @SpringBootApplication @RestController public class Main extends SpringBootServletInitializer { + + private static final Logger LOGGER = LogManager.getLogger(Main.class); + @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder appication) { - return appication.sources(Main.class); + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Main.class); } public static void main(String[] args) { + Path path = Paths.get(""); + String p = path.toAbsolutePath().toString(); + p = p.substring(p.lastIndexOf("/") + 1); + LOGGER.info("running in {}", p); + // TODO: put p + "properties" somehow into consideration to load the application.properties SpringApplication.run(Main.class, args); } } diff --git a/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java b/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java index ec9f776..a47e720 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java +++ b/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java @@ -59,7 +59,15 @@ public class BookingsController { @PostMapping("/business/bookings/payment/{id}") @RolesAllowed({"business_booking"}) - public String addBooking(Model model, @ModelAttribute AddPaymentBean bean, @PathVariable Integer id, @RequestParam String search) { + public String addPayment(Model model, @ModelAttribute AddPaymentBean bean, @PathVariable Integer id) { + Double payment = bean.getPayment(); + bookingsService.addPayment(id, payment); + return getBooking(model, id); + } + + @PostMapping("/business/bookings/listpayment/{id}") + @RolesAllowed({"business_booking"}) + public String addListPayment(Model model, @ModelAttribute AddPaymentBean bean, @PathVariable Integer id, @RequestParam(defaultValue = "") String search) { Double payment = bean.getPayment(); bookingsService.addPayment(id, payment); LOGGER.debug("search is {}", search); diff --git a/src/main/resources/templates/business/bookings.html b/src/main/resources/templates/business/bookings.html index b891f38..c685e63 100644 --- a/src/main/resources/templates/business/bookings.html +++ b/src/main/resources/templates/business/bookings.html @@ -36,7 +36,7 @@