]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Customers currently don't have login names, at least not in jratecalc (maybe pizzaser...
authorRoland Häder <roland@mxchange.org>
Wed, 27 Apr 2016 09:22:56 +0000 (11:22 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 27 Apr 2016 20:17:52 +0000 (22:17 +0200)
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/admin/customer/admin_customer_list.xhtml
web/admin/user/admin_user_list.xhtml

index 5d235a87a92563a7e6e28b9219b7d39d55a4679e..6c860ebe4f088280d017125c21f3e4e6b95f68fd 100644 (file)
@@ -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:
index 6e91be1671a3db7388b59e77cfc961b256789579..969c2845ccc484ff5b9f9116cc226dec084efce3 100644 (file)
@@ -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:
index 200b194a58beea63853da8b9a4e0676321d46f79..4143970430667d0d18cd9f681b8841cffb94461b 100644 (file)
                                        </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>
index 11ead762e7f4dfd3768a77e8369b73cd802f71ad..97b1b2c47b397c183d67c0e0545f24263defcb37 100644 (file)
                                        </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>