From: Roland Häder <roland@mxchange.org>
Date: Tue, 5 Sep 2017 18:07:21 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0466b05b730e5df12d5c7fdadb01f859656e174c;p=addressbook-war.git

Please cherry-pick:
- splitted branch office form into basic data and address data fieldsets
- added much more missing i18n strings
- renamed a few before adding them as they were still basic_data

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index af68d936..a2b0c795 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -921,3 +921,23 @@ ADMIN_BRANCH_OFFICE_LEGEND=Grunddaten der Filiale:
 #@TODO Please fix German umlauts!
 ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Geben Sie hier die Grunddaten der Filiale ein.
 ADMIN_SELECT_BRANCH_OFFICE_COMPANY=Filiale einem Unternehmen zuweisen:
+PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=Filialen auflisten
+CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=Auflisten von Filialen:
+ADMIN_BRANCH_OFFICES_LIST_EMPTY=Es wurden noch keine Filialen angelegt.
+#@TODO Please fix German umlauts!
+ADMIN_ADD_BRANCH_OFFICE_TITLE=Filiale hinzufuegen
+#@TODO Please fix German umlauts!
+ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA=Bitte waehlen Sie mindestens das zugehoerige Unternehmen und das Land aus und geben Sie Strasse, Hausnummer, Postleitzahl und Stadt ein.
+ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS=Email-Addresse der Filiale:
+ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER=Telefonnummer eingeben:
+ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER=Faxnummer eingeben:
+#@TODO Please fix German umlauts!
+ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED=Bitte waehlen das zur Filiale gehoerende Unternehmen aus.
+ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED=Bitte geben Sie die Strasse der Filiale ein.
+ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED=Bitte geben Sie die Hausnummer der Filiale ein.
+#@TODO Please fix German umlauts!
+ENTERED_STORE_INVALID=Die eingegebene Etage ist nicht gueltig.
+#@TODO Please fix German umlauts!
+ENTERED_SUITE_NUMBER_INVALID=Die eingegebene Appartmentnummer ist ungueltig.
+ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND=Adressdaten der Filiale:
+ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Geben Sie hier die Adresse der Filiale ein.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 68d63428..f033a24b 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -892,3 +892,19 @@ ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE=Select contact person to branch offi
 ADMIN_BRANCH_OFFICE_LEGEND=Branch office basic data:
 ADMIN_BRANCH_OFFICE_LEGEND_TITLE=Enter branch office basic data here.
 ADMIN_SELECT_BRANCH_OFFICE_COMPANY=Assign branch office to company:
+PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices
+CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES=List branch offices:
+ADMIN_BRANCH_OFFICES_LIST_EMPTY=There are no branch offices added.
+ADMIN_ADD_BRANCH_OFFICE_TITLE=Add branch office
+#Bitte waehlen Sie mindestens das zugehoerige Unternehmen und das Land aus und geben Sie Strasse, Hausnummer, Postleitzahl und Stadt ein.
+ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA=Please at least choose assigned company, country and enter at least street name, house number, ZIP code and city.
+ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS=Email address of branch office:
+ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER=Enter land-line number:
+ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER=Enter fax number:
+ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED=Please choose a company that sohuld be assigned with the branch office.
+ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED=Please enter street name of branch office.
+ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED=Please enter house number of branch office.
+ENTERED_STORE_INVALID=The entered store is not valid.
+ENTERED_SUITE_NUMBER_INVALID=The entered suite number is not valid.
+ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND=Address data of branch office:
+ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE=Enter here the address of the branch office.
diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
index 247113e6..876b39aa 100644
--- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
+++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
@@ -7,7 +7,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:panelGroup styleClass="para" layout="block">
-		<fieldset class="fieldset" id="branch_office">
+		<fieldset class="fieldset" id="admin_branch_office_basic">
 			<legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
 				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
 			</legend>
@@ -18,9 +18,9 @@
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="branchCompany" value="#{adminBranchOfficeController.branchCompany}">
+					<h:selectOneMenu styleClass="select" id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
 						<f:converter converterId="BasicCompanyDataConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
 						<f:selectItems value="#{companyDataController.allCompanyBasicData()}" var="companyData" itemValue="#{companyData}" itemLabel="#{companyData.companyName}" />
 					</h:selectOneMenu>
 				</div>
@@ -68,189 +68,201 @@
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+					<h:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" />
+					<h:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+						<f:validator validatorId="EmailAddressValidator" />
+						<f:attribute name="allowEmptyValue" value="true" />
+					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchStreet" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+					<h:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchHouseNumber" size="20" maxlength="255" value="#{adminBranchOfficeController.branchHouseNumber}" />
+					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminBranchOfficeController.landLineCountry}">
+						<f:converter converterId="CountryConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
+						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
+						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchHouseNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="landLineCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table-row" layout="block">
-				<div class="table-left-medium">
-					<h:outputLabel for="branchStore" value="#{msg.ADMIN_DATA_STORE}" />
-				</div>
-
-				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchStore" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStore}" />
-				</div>
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="landLineAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchStore" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="landLineNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_DATA_SUITE_NUMBER}" />
+					<h:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchSuiteNumber" size="20" maxlength="255" value="#{adminBranchOfficeController.branchSuiteNumber}" />
+					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminBranchOfficeController.faxCountry}">
+						<f:converter converterId="CountryConverter" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
+						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
+						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchSuiteNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="faxCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="faxAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="faxNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			</h:panelGroup>
+		</fieldset>
+
+		<fieldset class="fieldset" id="admin_branch_office_address">
+			<legend title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}" />
+			</legend>
+
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
+					<h:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchZipCode" size="20" maxlength="255" value="#{adminBranchOfficeController.branchZipCode}" />
+					<h:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchZipCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchStreet" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
+					<h:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" />
+					<h:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
+						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchCity" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchHouseNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+					<h:outputLabel for="branchStore" value="#{msg.ADMIN_DATA_STORE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select" id="branchCountry" value="#{adminBranchOfficeController.branchCountry}">
-						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-					</h:selectOneMenu>
+					<h:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
+						<f:validateLongRange for="houseNumber" minimum="-5" maximum="200" />
+					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchCountry" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
+				<h:message for="branchStore" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_BRANCH_OFFICE_EMAIL_ADDRESS}" />
+					<h:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_DATA_SUITE_NUMBER}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="true" />
+					<h:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
+						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="branchEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchSuiteNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="landLineCountry" value="#{msg.ADMIN_BRANCH_OFFICE_PHONE_NUMBER}" />
+					<h:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminBranchOfficeController.landLineCountry}">
-						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-					</h:selectOneMenu>
-
-					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
-						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-
-					<h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
-						<f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
+					<h:inputText styleClass="input" id="branchZipCode" size="20" maxlength="255" value="#{adminBranchOfficeController.branchZipCode}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchZipCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<h:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" />
+				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchCity" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="table-left-medium">
-					<h:outputLabel for="faxCountry" value="#{msg.ADMIN_BRANCH_OFFICE_FAX_NUMBER}" />
+					<h:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminBranchOfficeController.faxCountry}">
+					<h:selectOneMenu styleClass="select" id="branchCountry" value="#{adminBranchOfficeController.branchCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
 					</h:selectOneMenu>
-
-					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-
-					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxCountry" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
-			</h:panelGroup>
-
-			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
+				<h:message for="branchCountry" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>