From: Roland Häder <roland@mxchange.org>
Date: Wed, 27 Apr 2016 09:22:56 +0000 (+0200)
Subject: Customers currently don't have login names, at least not in jratecalc (maybe pizzaser... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=86c18536e5188fc1d0f4587fe7a96306b320ebb9;p=pizzaservice-war.git

Customers currently don't have login names, at least not in jratecalc (maybe pizzaservice?)
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 5d235a87..6c860ebe 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -330,7 +330,8 @@ PAGE_TITLE_LOGIN_AREA=Benutzerbereich
 ADMIN_SELECT_USER_CONTACT_LEGEND=Kontakt f\u00fcr neues Benutzeraccount ausw\u00e4hlen:
 ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=W\u00e4hlen Sie entweder einen Kontakt aus, der mit dem neuen Benutzeraccount verkn\u00fcpft werden soll ...
 ADMIN_SELECT_USER_CONTACT=Kontakt zum Verkn\u00fcpfen ausw\u00e4hlen:
-ADMIN_ADD_OR_ENTER_CONTACT_DATA=... oder geben Sie mindestens Vorname, Nachname und Anrede ein (Benutzername und Email-Adresse nicht vergessen):
+ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA=... oder geben Sie mindestens Anrede, Vorname und Nachname ein (Benutzername und Email-Adresse nicht vergessen):
+ADMIN_ADD_CUSTOMER_OR_ENTER_CONTACT_DATA=... oder geben Sie mindestens Anrede, Vorname und Nachname ein.
 ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND=Kontakt f\u00fcr neuen Kunden ausw\u00e4hlen:
 ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND_TITLE=W\u00e4hlen Sie entweder einen Kontakt aus, der mit dem neuen Kunden verkn\u00fcpft werden soll ...
 ADMIN_SELECT_CUSTOMER_CONTACT=Kontakt zum Verkn\u00fcpfen ausw\u00e4hlen:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 6e91be16..969c2845 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -331,7 +331,8 @@ ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE=The customer number is being created
 ADMIN_SELECT_USER_CONTACT_LEGEND=Select contact for new user account:
 ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE=Whether choose a contact that should be linked with the new user account or ...
 ADMIN_SELECT_USER_CONTACT=Select contact for linking:
-ADMIN_ADD_OR_ENTER_CONTACT_DATA=or enter gender, first name and family name (don't forget to enter user name and email address):
+ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA=... or enter gender, first name and family name (don't forget to enter user name and email address):
+ADMIN_ADD_CUSTOMER_OR_ENTER_CONTACT_DATA=... or enter gender, first name and family name.
 ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND=Select contact for new customer account:
 ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND_TITLE=Whether choose a contact that should be linked with the new customer account or ...
 ADMIN_SELECT_CUSTOMER_CONTACT=Select contact for linking:
diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index 200b194a..41439704 100644
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -98,14 +98,14 @@
 					</div>
 
 					<div class="para">
-						<h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
+						<h:outputText value="#{msg.ADMIN_ADD_CUSTOMER_OR_ENTER_CONTACT_DATA}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl" />
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CUSTOMER}" action="#{adminCustomerController.addCustomer()}" />
+						<h:commandButton class="submit" type="submit" id="add" value="#{msg.BUTTON_ADMIN_ADD_CUSTOMER}" action="#{adminCustomerController.addCustomer()}" />
 					</div>
 				</h:form>
 			</div>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 11ead762..97b1b2c4 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -98,14 +98,14 @@
 					</div>
 
 					<div class="para">
-						<h:outputText value="#{msg.ADMIN_ADD_OR_ENTER_CONTACT_DATA}" />
+						<h:outputText value="#{msg.ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+						<h:commandButton class="submit" type="submit" id="add" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
 					</div>
 				</h:form>
 			</div>