From: Roland Haeder <roland@mxchange.org>
Date: Fri, 11 Sep 2015 14:42:43 +0000 (+0200)
Subject: updated jars + fixed some stuff (but not fully)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=814c0445039fb57568ad355197ca948c8b5ba079;p=pizzaservice-war.git

updated jars + fixed some stuff (but not fully)
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index 3c1fb7f8..6d0e98ca 100644
Binary files a/lib/jcore-ee-logger.jar and b/lib/jcore-ee-logger.jar differ
diff --git a/lib/jcore.jar b/lib/jcore.jar
index 6ee22015..a56fe629 100644
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 893d1f9a..925c0588 100644
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ
diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index 93debb23..7f20cac7 100644
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ
diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index 34f03eac..fac6080c 100644
Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ
diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
index 0f73f9b4..b479817e 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java
@@ -23,6 +23,7 @@ import javax.inject.Named;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcoreee.beans.BaseFrameworkBean;
+import org.mxchange.jshopcore.exceptions.CannotAddCategoryException;
 import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException;
 import org.mxchange.jshopcore.model.category.Category;
 import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote;
@@ -89,7 +90,7 @@ public class AdminCategoryWebBean extends BaseFrameworkBean implements AdminCate
 
 			// Also send it to the controller bean
 			this.controller.addCategory(category);
-		} catch (final CategoryTitleAlreadyUsedException ex) {
+		} catch (final CategoryTitleAlreadyUsedException | CannotAddCategoryException ex) {
 			// Continue to throw
 			throw new FaceletException(ex);
 		}
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 46fa5720..44cbda7e 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -63,7 +63,7 @@
 		</navigation-case>
 	    <navigation-case>
 	        <from-outcome>basket</from-outcome>
-	        <to-view-id>/basketController.xhtml</to-view-id>
+	        <to-view-id>/basket.xhtml</to-view-id>
 	    </navigation-case>
 	</navigation-rule>
     <navigation-rule>
diff --git a/web/index.xhtml b/web/index.xhtml
index aa0f9083..bd72baff 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -48,7 +48,7 @@
 
 					<h:column>
 						<f:facet name="header"><h:outputText value="Produkt:" /></f:facet>
-						<h:outputText class="price" value="#{product.title}">
+						<h:outputText value="#{product.title}">
 							<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 						</h:outputText>
 					</h:column>
@@ -62,8 +62,8 @@
 
 					<h:column>
 						<f:facet name="header"><h:outputText value="Zwischensumme:" /></f:facet>
-						<h:outputText value="-" rendered="#{basketController.amount == null || basketController.amount == 0}" />
-						<h:outputText value="#{basketController.calculateItemPrice}" rendered="#{basketController.amount > 0}" />
+						<h:outputText class="price" value="-" rendered="#{basketController.amount == null || basketController.amount == 0}" />
+						<h:outputText class="price" value="#{basketController.calculateItemPrice}" rendered="#{basketController.amount > 0}" />
 					</h:column>
 				</h:dataTable>
 			</h:form>
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 608c9402..57d90016 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -153,3 +153,7 @@ ul.footer_nav li.footer_copyright {
 .table_data_column {
 	width: 100px;
 }
+
+.price {
+	text-align: right;
+}