From 78360cfa464944ce4659af074e30dd2623ecb3f9 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 15 Sep 2015 11:18:06 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20more=20translations=20-?= =?utf8?q?=20swapped=20out=20some=20parts=20of=20large=20registration=20fo?= =?utf8?q?rm=20for=20reuse=20-=20used=20them=20again=20for=20checkout=20wi?= =?utf8?q?thout=20registration=20-=20added=20template=20file=20for=20templ?= =?utf8?q?ates=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../localization/bundle_de_DE.properties | 10 + .../localization/bundle_en_US.properties | 10 + web/WEB-INF/faces-config.xml | 14 + web/WEB-INF/templates.dist/guest_page.xhtml | 4 +- web/WEB-INF/templates.dist/template.tpl | 9 + web/WEB-INF/templates/basket/full_basket.tpl | 48 ++++ web/WEB-INF/templates/basket/total_sum.tpl | 20 ++ .../templates/guest/guest_personal_data.tpl | 159 +++++++++++ .../templates/guest/guest_privacy_terms.tpl | 43 +++ .../guest/guest_registration_form.tpl | 85 ++++++ web/basket.xhtml | 11 +- web/customer/checkout.xhtml | 76 +++++ web/customer/checkout2.xhtml | 61 ++++ web/customer/register.xhtml | 263 +----------------- 14 files changed, 544 insertions(+), 269 deletions(-) create mode 100644 web/WEB-INF/templates.dist/template.tpl create mode 100644 web/WEB-INF/templates/basket/full_basket.tpl create mode 100644 web/WEB-INF/templates/basket/total_sum.tpl create mode 100644 web/WEB-INF/templates/guest/guest_personal_data.tpl create mode 100644 web/WEB-INF/templates/guest/guest_privacy_terms.tpl create mode 100644 web/WEB-INF/templates/guest/guest_registration_form.tpl create mode 100644 web/customer/checkout.xhtml create mode 100644 web/customer/checkout2.xhtml diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index d5721ad2..d162f45d 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -104,3 +104,13 @@ SUB_TITLE_INDEX_IMPRINT=Impressum PAGE_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt SUB_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt GUEST_ITEM_ADDED_TO_BASKET=Der Artikel {0} wurde zum Warenkorb hinzugef\u00fcgt. +LINK_CONTINUE_TO_CHECKOUT=Weiter zur Bezahlung +PAGE_TITLE_CUSTOMER_CHECKOUT=Weiter zur Bezahlung +PAGE_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen +SUB_TITLE_INDEX_CHECKOUT2=Ohne Anmeldung bezahlen +GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=Sie k\u00f6nnen hier ohne Anmeldung bezahlen: +SUB_TITLE_CUSTOMER_CHECKOUT=Bezahlungsm\u00f6glichkeit ausw\u00e4hlen +LINK_CHECKOUT_OPTION_LOGIN=Weiter zum Kundenlogin +LINK_CHECKOUT_OPTION_REGISTRATION=Weiter zum neuen Kundenkonto anmelden +LINK_CHECKOUT_OPTION_GUEST=Ohne Anmeldung bezahlen +BUTTON_COMPLETE_ORDER=Bestellung verbindlich abschicken diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 530f47c3..ad4203a1 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -102,3 +102,13 @@ SUB_TITLE_INDEX_IMPRINT=Imprint: PAGE_TITLE_INDEX_ITEM_ADDED=Item has been added to basket SUB_TITLE_INDEX_ITEM_ADDED=Item has been added to basket: GUEST_ITEM_ADDED_TO_BASKET=The item {0} has been added to the basket. +LINK_CONTINUE_TO_CHECKOUT=Continue to checkout +PAGE_TITLE_CUSTOMER_CHECKOUT=Continue to checkout +PAGE_TITLE_INDEX_CHECKOUT2=Checkout without login +SUB_TITLE_INDEX_CHECKOUT2=Checkout without login +GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE=You can checkout without registration +SUB_TITLE_CUSTOMER_CHECKOUT=Choose checkout option +LINK_CHECKOUT_OPTION_LOGIN=Continue to customer login +LINK_CHECKOUT_OPTION_REGISTRATION=Continue with new customer registration +LINK_CHECKOUT_OPTION_GUEST=Checkout without registration +BUTTON_COMPLETE_ORDER=Bestellung verbindlich abschicken diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index a699e4aa..7296fdad 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -70,6 +70,20 @@ /errorHandler.xhtml + + /basket.xhtml + + checkout + /customer/checkout.xhtml + + + + /customer/checkout.xhtml + + checkout2 + /customer/checkout2.xhtml + + /index.xhtml diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index 9dcb5701..a90306bc 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -7,14 +7,14 @@ > - Your page's title here + #{msg.PAGE_TITLE_INDEX_FOO} - Your header above content here + #{msg.SUB_TITLE_INDEX_FOO} diff --git a/web/WEB-INF/templates.dist/template.tpl b/web/WEB-INF/templates.dist/template.tpl new file mode 100644 index 00000000..ed0a4336 --- /dev/null +++ b/web/WEB-INF/templates.dist/template.tpl @@ -0,0 +1,9 @@ + + + + + diff --git a/web/WEB-INF/templates/basket/full_basket.tpl b/web/WEB-INF/templates/basket/full_basket.tpl new file mode 100644 index 00000000..8ddeea95 --- /dev/null +++ b/web/WEB-INF/templates/basket/full_basket.tpl @@ -0,0 +1,48 @@ + + + + + + #{msg.GUEST_ITEM_TITLE} + + + #{item.product.title} + + + + + #{msg.SINGLE_ITEM_PRICE} + +
+ + + + + +
+ + + + #{msg.CHANGE_ITEM_AMOUNT} + + + + + + + + + #{msg.TOTAL_ITEM_PRICE} + +
+ + + +
+ + + diff --git a/web/WEB-INF/templates/basket/total_sum.tpl b/web/WEB-INF/templates/basket/total_sum.tpl new file mode 100644 index 00000000..c350d77c --- /dev/null +++ b/web/WEB-INF/templates/basket/total_sum.tpl @@ -0,0 +1,20 @@ + + + + + +
+ #{msg.TOTAL_ORDER_PRICE} + + + +
+ + + + diff --git a/web/WEB-INF/templates/guest/guest_personal_data.tpl b/web/WEB-INF/templates/guest/guest_personal_data.tpl new file mode 100644 index 00000000..f4da04c8 --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_personal_data.tpl @@ -0,0 +1,159 @@ + + + +
+ Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: +
+ +
+
+ Bitte Ihre Daten eingeben: + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ + + +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+ diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl new file mode 100644 index 00000000..981c8f37 --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl @@ -0,0 +1,43 @@ + + + +
+
+ Rechtliches: + +
+
+ + + +
+ +
+ Ja, ich habe die gelesen und + auch verstanden. +
+ +
+
+ +
+
+ + + +
+ +
+ Ja, ich habe die gelesen und + auch verstanden. +
+ +
+
+
+
+ diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl new file mode 100644 index 00000000..d8845ac3 --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl @@ -0,0 +1,85 @@ + + + + + +
+
+ Anmelden als Neukunde +
+ + + +
+
+ Email-Adresse und Passwort: + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ Die Kundennummer wird Ihnen später vergeben. +
+
+
+ + + +
+ + +
+
+ + diff --git a/web/basket.xhtml b/web/basket.xhtml index a878d563..e3c253c2 100644 --- a/web/basket.xhtml +++ b/web/basket.xhtml @@ -65,14 +65,11 @@ -
- #{msg.TOTAL_ORDER_PRICE} - - - -
+ - +
+ +
diff --git a/web/customer/checkout.xhtml b/web/customer/checkout.xhtml new file mode 100644 index 00000000..9de80b1d --- /dev/null +++ b/web/customer/checkout.xhtml @@ -0,0 +1,76 @@ + + + + + + #{msg.PAGE_TITLE_CUSTOMER_CHECKOUT} + + + + + + + #{msg.SUB_TITLE_CUSTOMER_CHECKOUT} + + + +
+ + + +
+ +
+
+ Sie haben drei Möglichkeiten zur Auswahl: +
+ +
+
    +
  • +
    + Ein bestehenden Kundenkonto verwenden +
    + +
    + + + +
    +
    • + +
  • +
    + Neues Kundenkonto erstellen +
    + +
    + + + +
    +
    • + +
  • +
    + Ohne Anmeldung bezahlen +
    + +
    + +
    +
    • +
+
+
+ + + + + + + diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml new file mode 100644 index 00000000..e6391348 --- /dev/null +++ b/web/customer/checkout2.xhtml @@ -0,0 +1,61 @@ + + + + + + #{msg.PAGE_TITLE_INDEX_CHECKOUT2} + + + + + + + + + #{msg.SUB_TITLE_INDEX_CHECKOUT2} + + + +
+ +
+ +
+
+ #{msg.GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE} +
+ +
+ +
+
+ Bezahlung ohne Anmeldung +
+ + + +
+ Derzeit ist nur eine Bezahlung gegen Rechnung möglich. +
+ + + +
+ + +
+
+ +
+
+ + + + + + + diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml index 7a002027..dd1af7b5 100644 --- a/web/customer/register.xhtml +++ b/web/customer/register.xhtml @@ -23,266 +23,9 @@ Sie sind bereits Kunde? Dann einloggen. - -
-
- Anmelden als Neukunde -
- -
- Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: -
- -
-
- Bitte Ihre Daten eingeben: - -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- - - -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
-
-
- -
-
- Email-Adresse und Passwort: - -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
- -
- -
-
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
-
- -
- Die Kundennummer wird Ihnen später vergeben. -
-
-
- -
-
- Rechtliches: - -
-
- - - -
- -
- Ja, ich habe die gelesen und - auch verstanden. -
- -
-
- -
-
- - - -
- -
- Ja, ich habe die gelesen und - auch verstanden. -
- -
-
-
-
- -
- - -
-
- +
+ +
-- 2.39.2