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

Show error if articles are not avail during checkout.

Browse Source
This commit is contained in:
CodeSteak 2020-05-10 14:29:08 +02:00
parent c0ce1e23c3
commit 731f4761fa
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
prototype/src/main/java/org/hso/ecommerce/action/shop/CreateOrderAction.java
View File

@ -68,7 +68,8 @@ public class CreateOrderAction {
totalVatCent += article.getVat() * quantity; totalVatCent += article.getVat() * quantity;
} }
public Result finish() {
public Result finish() throws ArticleNotInStockException {
CustomerOrder order = createOrder(); CustomerOrder order = createOrder();
CustomerPayment payment = createPayment(); CustomerPayment payment = createPayment();
@ -86,7 +87,7 @@ public class CreateOrderAction {
); );
} }
private WarehouseBooking createWarehouseBooking(CustomerOrder order) { private WarehouseBooking createWarehouseBooking(CustomerOrder order) throws ArticleNotInStockException {
WarehouseBooking booking = new WarehouseBooking(); WarehouseBooking booking = new WarehouseBooking();
booking.created = new Timestamp(new Date().getTime()); booking.created = new Timestamp(new Date().getTime());
booking.reason = new BookingReason(order); booking.reason = new BookingReason(order);
@ -111,6 +112,10 @@ public class CreateOrderAction {
break; break;
} }
} }
if (needed > 0) {
throw new ArticleNotInStockException(item.article);
}
} }
return booking; return booking;
@ -174,4 +179,17 @@ public class CreateOrderAction {
this.quantity = quantity; this.quantity = quantity;
} }
} }
public static class ArticleNotInStockException extends Exception {
private Article article;
public ArticleNotInStockException(Article article) {
super("The quantity of article '" + article.title + "' is not in stock.");
this.article = article;
}
public Article getArticle() {
return article;
}
}
} }

12
prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopCheckoutController.java
View File

@ -98,6 +98,7 @@ public class ShopCheckoutController {
@PostMapping("/checkoutFinish") @PostMapping("/checkoutFinish")
public String shopCheckoutFinish( public String shopCheckoutFinish(
HttpSession session,
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
@RequestAttribute(value = "user") User user, @RequestAttribute(value = "user") User user,
@ -132,8 +133,9 @@ public class ShopCheckoutController {
action.addArticle(article, item.getAmount(), wbeseRepo.getByArticle(article.id)); action.addArticle(article, item.getAmount(), wbeseRepo.getByArticle(article.id));
} }
CreateOrderAction.Result result = action.finish(); CreateOrderAction.Result result = null;
try {
result = action.finish();
EnableTrackingAction.addTrackingInfo(result.customerOrder); EnableTrackingAction.addTrackingInfo(result.customerOrder);
customerOderRepository.save(result.customerOrder); customerOderRepository.save(result.customerOrder);
@ -142,6 +144,12 @@ public class ShopCheckoutController {
shoppingCart.clear(); shoppingCart.clear();
} catch (CreateOrderAction.ArticleNotInStockException e) {
request.setAttribute("error", "Der Artikel '" + e.getArticle().title + "' ist leider nicht mehr in ausreichender Menge verfügbar. Bitte passen Sie die Artikelmenge an.");
return shopCheckout(session, request, shoppingCart);
}
return "shop/checkoutFinish"; return "shop/checkoutFinish";
} }