From 29727c00eeae1751325ddd8ddac443e7881bb513 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 12 Oct 2015 15:20:26 +0200
Subject: [PATCH] =?utf8?q?imported=20from=20addressbook-war=20Signed-off-b?=
 =?utf8?q?y:Roland=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../localization/bundle_de_DE.properties      |  6 ++
 .../localization/bundle_en_US.properties      |  6 ++
 .../templates/generic/form_personal_data.tpl  | 62 ++++++++++++++-----
 .../templates/guest/guest_privacy_terms.tpl   | 16 ++---
 4 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index ca1faca3..79f31cf5 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -185,3 +185,9 @@ TABLE_SUMMARY_ADMIN_CATEGORY=Diese Tabelle listet alle angelegten Artikelkategor
 TABLE_SUMMARY_SHOW_BASKET=Diese Tabelle listet die im Warenkorb befindlichen Artikel einfach auf.
 TABLE_SUMMARY_ADMIN_PRODUCTS=Diese Tabelle listet alle angelegten Produkte im Administrationsbereich auf.
 TABLE_SUMMARY_INDEX_PRODUCTS=Diese Tabelle listet alle verf\u00fcgbaren Produkte in der Eingangsseite auf.
+GUEST_YES_READ_PRIVACY_STATEMENT_1=Ja, ich habe die
+GUEST_YES_READ_PRIVACY_STATEMENT_2=gelesen und auch verstanden und nehme sie hiermit an.
+GUEST_YES_READ_TERMS_CONDITIONS_1=Ja, ich habe die
+GUEST_YES_READ_TERMS_CONDITIONS_2=gelesen und verstanden und nehme sie hiermit an.
+TERMS_CONDITIONS=Allgemeine Gesch\u00e4ftsbestimmungen
+NONE_SELECTED=k.A.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index a0c3ee5b..26e6fb95 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -185,3 +185,9 @@ TABLE_SUMMARY_ADMIN_CATEGORY=This table lists all in admin area created article
 TABLE_SUMMARY_SHOW_BASKET=This table lists all to the basket added articles.
 TABLE_SUMMARY_ADMIN_PRODUCTS=This table lists all in admin area created products.
 TABLE_SUMMARY_INDEX_PRODUCTS=This table lists all available products in index page.
+GUEST_YES_READ_PRIVACY_STATEMENT_1=Yes, I have read and understand the
+GUEST_YES_READ_PRIVACY_STATEMENT_2=and I accept them with this.
+GUEST_YES_READ_TERMS_CONDITIONS_1=Yes, I have read and understand the
+GUEST_YES_READ_TERMS_CONDITIONS_2=and I accept them with this.
+TERMS_CONDITIONS=Terms & Conditions
+NONE_SELECTED=Empty
diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index 26da8c96..91fe1c7e 100644
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -31,8 +31,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{customerController.firstName}" required="true">
-						<f:validator validatorId="NameValidator" />
+					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{userController.firstName}" required="true">
+						<f:validator for="firstName" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
 
@@ -45,8 +45,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{customerController.familyName}" required="true">
-						<f:validator validatorId="NameValidator" />
+					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{userController.familyName}" required="true">
+						<f:validator for="familyName" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
 
@@ -59,8 +59,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{customerController.street}" required="true">
-						<f:validator validatorId="NameValidator" />
+					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{userController.street}" required="true">
+						<f:validator for="street" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
 
@@ -73,7 +73,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{customerController.houseNumber}" required="true">
+					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{userController.houseNumber}" required="true">
 						<f:validateLongRange minimum="1" maximum="500" />
 					</h:inputText>
 				</div>
@@ -87,7 +87,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{customerController.zipCode}" required="true" />
+					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{userController.zipCode}" required="true" />
 				</div>
 
 				<div class="clear"></div>
@@ -99,8 +99,8 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{customerController.city}" required="true">
-						<f:validator validatorId="NameValidator" />
+					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{userController.city}" required="true">
+						<f:validator for="city" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
 
@@ -113,8 +113,9 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="country" value="#{userController.country}">
-						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{msg[c.countryI18nkey]}" />
+					<h:selectOneMenu class="select" id="country" value="#{userController.country}" converter="country">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
 
@@ -123,11 +124,22 @@
 
 			<div class="table_row">
 				<div class="table_left">
-					<h:outputLabel for="phoneNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+					<h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="phoneNumber" size="20" maxlength="255" value="#{customerController.phoneNumber}" />
+					<h:selectOneMenu class="select" id="phoneCountryCode" value="#{userController.phoneCountry}" converter="country">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{userController.phoneAreaCode}">
+						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{userController.phoneNumber}">
+						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
@@ -139,7 +151,18 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="faxNumber" size="20" maxlength="255" value="#{customerController.faxNumber}" />
+					<h:selectOneMenu class="select" id="faxCountryCode" value="#{userController.faxCountry}" converter="country">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{userController.faxAreaCode}">
+						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{userController.faxNumber}">
+						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
@@ -151,7 +174,14 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="cellphoneNumber" size="20" maxlength="255" value="#{customerController.cellphoneNumber}" />
+					<h:selectOneMenu class="select" id="cellphoneCarrier" value="#{userController.cellphoneCarrier}" converter="cellphoneCarrier">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{cellphone.allSmsProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryLocalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
+					</h:selectOneMenu>
+
+					<h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{userController.cellphoneNumber}">
+						<f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index b9e8cd70..a582d9ab 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -12,14 +12,14 @@
 			<div class="table_row">
 				<div class="table_left25">
 					<h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
-						<f:validator validatorId="PrivacyTermsCheckboxValidator" />
+						<f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
 
 				<div class="table_right75">
-					<!-- TODO Need to internationalize: //-->
-					Ja, ich habe die <h:link outcome="privacy" target="_blank" value="Datenschutzbestimmungen" /> gelesen und
-					auch verstanden.
+					#{msg.GUEST_YES_READ_PRIVACY_STATEMENT_1}
+					<h:link outcome="privacy" target="_blank" value="#{msg.PRIVACY_STATEMENTS}" />
+					#{msg.GUEST_YES_READ_PRIVACY_STATEMENT_2}
 				</div>
 
 				<div class="clear"></div>
@@ -28,14 +28,14 @@
 			<div class="table_row">
 				<div class="table_left25">
 					<h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
-						<f:validator validatorId="PrivacyTermsCheckboxValidator" />
+						<f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
 
 				<div class="table_right75">
-					<!-- TODO Need to internationalize: //-->
-					Ja, ich habe die <h:link outcome="terms" target="_blank" value="Allgemeinen Geschäftsbedingungen" /> gelesen und
-					auch verstanden.
+					#{msg.GUEST_YES_READ_TERMS_CONDITIONS_1}
+					<h:link outcome="terms" target="_blank" value="#{msg.TERMS_CONDITIONS}" />
+					#{msg.GUEST_YES_READ_TERMS_CONDITIONS_2}
 				</div>
 
 				<div class="clear"></div>
-- 
2.39.5