]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
projects / pizzaservice-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c7a541)
Continued:
authorRoland Haeder <roland@mxchange.org>
Wed, 16 Sep 2015 13:08:26 +0000 (15:08 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 16 Sep 2015 13:08:26 +0000 (15:08 +0200)
- added "checkout_done.xhtml" + navgiation target (still some are missing)
- updated jars
Signed-off-by:Roland Häder <roland@mxchange.org>

lib/jcore.jar patch | blob | history
lib/jshop-core.jar patch | blob | history
lib/jshop-ee-lib.jar patch | blob | history
src/java/org/mxchange/localization/bundle_de_DE.properties patch | blob | history
src/java/org/mxchange/localization/bundle_en_US.properties patch | blob | history
web/WEB-INF/faces-config.xml patch | blob | history
web/customer/checkout_done.xhtml [new file with mode: 0644] patch | blob

diff --git a/lib/jcore.jar b/lib/jcore.jar
index a56fe629d293ed633c7a4581c04dad90d8cd7caf..4426c96e512eef4eac4d14f9f802bb47fc8361a4 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index 4a925a98e00a79fc5b0c6700114d4cd5499d74b2..a083ae73fb6a802a6096aa005b1667798a7c6107 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 1a0b0d99011926ed373a8b88e79e160666f7792d..a0c17fe7e4a2d20aedf4257d6a59218a1d8a0baa 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/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index e3ad74390e5e079040ab23fb755893306b4c4148..d12139efed46c55be45db619223879593f44932d 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -160,3 +160,5 @@ PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen
 SUB_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen:
 ADMIN_MENU_MAIN_TITLE=Hauptauswahl
 ADMIN_MENU_LOGOUT_TITLE=Ausloggen
+PAGE_TITLE_CUSTOMER_CHECKOUT_DONE=Bestellvorgang abgeschlossen
+SUB_TITLE_CUSTOMER_CHECKOUT_DONE=Der Bestellvorgang ist abgeschlossen:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index eeb3d545546d698d761edd4597f8b5b16e2497be..6c1cea91a678d5841192e628286d7688657cfa4a 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -158,3 +158,5 @@ PAGE_TITLE_INDEX_PRIVACY=Privacy
 SUB_TITLE_INDEX_PRIVACY=Privacy:
 ADMIN_MENU_MAIN_TITLE=Main
 ADMIN_MENU_LOGOUT_TITLE=Logout
+PAGE_TITLE_CUSTOMER_CHECKOUT_DONE=Checkout done
+SUB_TITLE_CUSTOMER_CHECKOUT_DONE=The checkout is completed:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 7296fdad5d794c84559dddf93d8b660692d5b6ea..762c4d9b8dcd170b274444102cddcebc8dd7c350 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -91,4 +91,11 @@
                        <to-view-id>/item_added.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/customer/checkout2.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>checkout_done</from-outcome>
+                       <to-view-id>/customer/checkout_done.xhtml.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
 </faces-config>
diff --git a/web/customer/checkout_done.xhtml b/web/customer/checkout_done.xhtml
new file mode 100644 (file)
index 0000000..16460f5
--- /dev/null
+++ b/web/customer/checkout_done.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT_DONE}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.SUB_TITLE_CUSTOMER_CHECKOUT_DONE}
+               </ui:define>
+
+               <ui:define name="content">
+                       TODO: Noch offen
+               </ui:define>
+
+               <ui:define name="footer">
+                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+               </ui:define>
+       </ui:composition>
+</html>
Unnamed repository; edit this file 'description' to name the repository.