</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>
</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>
</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>
</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>
</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>
</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>
</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>
<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>
</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>
</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>
<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>
<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>