localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix local merge conflicts in req ctrl

This commit is contained in:
CodeSteak 2020-05-05 17:22:35 +02:00 committed by localhorst
parent e9e072b26b
commit 4338f188f0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
View File

@ -98,7 +98,7 @@ public class RequestController {
return "shop/search";
}
@GetMapping("/shop/checkout")
/* @GetMapping("/shop/checkout")
public String shopCheckout(HttpSession session, HttpServletRequest request) {
session.setAttribute("afterLogin", request.getRequestURI());
return "shop/checkout";
@ -112,7 +112,7 @@ public class RequestController {
@GetMapping("/shop/checkoutFinish")
public String shopCheckoutFinishGET() {
return "shop/checkoutFinish";
}
}*/
// @GetMapping("/shop/articles/{id}")
// public String shopArticlesById() {