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 3c1fb7f8b083e1a84be405024abc1be40c559475..6d0e98ca34bb9da22fe71b465ba1765a785a8053 100644 (file)
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 6ee220159c66619b257eec183504a58dbf8e24ce..a56fe629d293ed633c7a4581c04dad90d8cd7caf 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 893d1f9aad9b8ec2bf4607d123795b6547d7a940..925c0588c2c33478379c56e9a328d3a9772393b1 100644 (file)
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 93debb23d5481a5f36ded93af52324a612865006..7f20cac7221a506d524529a51cff14aaeb714ad1 100644 (file)
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 34f03eac5266bc772c35170ff88b0f27a631a267..fac6080cdeacdaef5a41108ed84a5b97bf72ac37 100644 (file)
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 0f73f9b4b3d8dbf98ec5f4144885a84f32376fb3..b479817e8669ea14b17e7fee56bf2d1264938d30 100644 (file)
--- 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 46fa57203ce1768483ba30ac9bae835aa75a2728..44cbda7ec6fd7f0debd3e9bd90be8965a3f4d49b 100644 (file)
--- 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 aa0f90830d3acf19a32df3abb46211ac17d2c412..bd72baffe6a4b1c35fde8becd8b8ddb0342edaf4 100644 (file)
--- 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 608c94021c93071d33ad5edc7d3e034addc9883d..57d9001623c125e4543066825365717a09369ffd 100644 (file)
--- 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;
+}