From 5a343ef4f8f7f568395456613492f900a9cb1bbd Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 31 Aug 2015 09:25:19 +0200 Subject: [PATCH] =?utf8?q?updated=20jshop+=20got=20rid=20of=20another=20(l?= =?utf8?q?arge)=20scriptlet=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jshop.jar | Bin 77408 -> 78752 bytes .../application/PizzaApplication.java | 4 +- web/index.jsp | 118 ++++++++---------- 3 files changed, 51 insertions(+), 71 deletions(-) diff --git a/lib/jshop.jar b/lib/jshop.jar index b7b2cbcb4e9e1f61f7e12315a169aaa65d34036c..5aa5fc1dd179508c3875aec14c3435f7f095e326 100644 GIT binary patch delta 8867 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 delta 8213 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 - <% - // Get Iterator - Iterator iterator = controller.getAvailableProducts(); - - // "Walk" through all products and unmark them as ordered - while (iterator.hasNext()) { - // Get product instance - Product product = iterator.next(); - - // Debug message - controller.getLogger().debug("product=" + product); - - // Create an item instance form this product - AddableBasketItem item = controller.getBasket().getItem(product); - - // Debug message - controller.getLogger().debug("item=" + item); - - // Has it been already added to the basket? - if (item != null) { - // Item was added to basket - %> - - - - - - - - - -
- Warenkorb - - <%=item.getAmount()%> - - <%=product.getTitle()%> - - -
- <% - } else { - %> -
- - - - - - - - - -
- - - - - - - <%=product.getTitle()%> - - -
-
- <% - } - } - %> + + + + + + + + + + + + + +
+ Warenkorb + + ${item.amount} + + ${product.title} + + +
+
+ +
+ + + + + + + + + +
+ + + + + + + ${product.title} + + +
+
+
+
+
-- 2.39.5