diff --git a/src/main/java/ch/wisv/events/webshop/controller/WebshopPaymentController.java b/src/main/java/ch/wisv/events/webshop/controller/WebshopPaymentController.java index c480ed4a..d1372429 100644 --- a/src/main/java/ch/wisv/events/webshop/controller/WebshopPaymentController.java +++ b/src/main/java/ch/wisv/events/webshop/controller/WebshopPaymentController.java @@ -86,7 +86,11 @@ public String paymentOverview(Model model, RedirectAttributes redirect, @PathVar ); } - return "webshop/payment/index"; + if (orderService.containsOnlyReservable(order)) { + return "webshop/payment/index"; + } + + return "redirect:/checkout/" + order.getPublicReference() + "/payment/mollie"; } catch (EventsException e) { redirect.addFlashAttribute(MODEL_ATTR_ERROR, e.getMessage()); @@ -117,29 +121,16 @@ public String paymentReservation(RedirectAttributes redirect, @PathVariable Stri } /** - * Payment method using iDeal. - * - * @param redirect of type RedirectAttributes - * @param key of type String - * - * @return String string - */ - @GetMapping("/ideal") - public String paymentIdeal(RedirectAttributes redirect, @PathVariable String key) { - return this.payment(redirect, key, PaymentMethod.IDEAL); - } - - /** - * Payment method using SOFORT. + * Payment method using Mollie. * * @param redirect of type RedirectAttributes * @param key of type String * * @return String string */ - @GetMapping("/sofort") - public String paymentSofort(RedirectAttributes redirect, @PathVariable String key) { - return this.payment(redirect, key, PaymentMethod.SOFORT); + @GetMapping("/mollie") + public String paymentMollie(RedirectAttributes redirect, @PathVariable String key) { + return this.payment(redirect, key, PaymentMethod.MOLLIE); } /** diff --git a/src/main/resources/static/images/icon-pay-later.jpg b/src/main/resources/static/images/icon-pay-later.jpg deleted file mode 100644 index 4f9cf4d9..00000000 Binary files a/src/main/resources/static/images/icon-pay-later.jpg and /dev/null differ diff --git a/src/main/resources/static/images/icon-pay-later.png b/src/main/resources/static/images/icon-pay-later.png new file mode 100644 index 00000000..98db2398 Binary files /dev/null and b/src/main/resources/static/images/icon-pay-later.png differ diff --git a/src/main/resources/static/images/icon-pay-now.png b/src/main/resources/static/images/icon-pay-now.png new file mode 100644 index 00000000..9d5acba5 Binary files /dev/null and b/src/main/resources/static/images/icon-pay-now.png differ diff --git a/src/main/resources/templates/webshop/payment/index.html b/src/main/resources/templates/webshop/payment/index.html index 710d3922..b9cef744 100644 --- a/src/main/resources/templates/webshop/payment/index.html +++ b/src/main/resources/templates/webshop/payment/index.html @@ -52,49 +52,18 @@

Select payment method

- +
-
IDEAL
- Online payment using your - Dutch bank. Easy, fast and secure!
- - (+ € 0,35 transaction cost) -
- - -
-
-
-
- - -
-
-
-
-
- -
-
-
-
-
SOFORT
- Predominant online banking method in - countries across Europe.
- - (+ € 0,30 + 1,1% transaction cost) +
Pay Online
- Pay now using iDeal
@@ -108,7 +77,7 @@
SOFORT
- Predominant online banking method in
- +