Please cherry-pick:

- having legal status and company separated was no good idea anyway, so let's
  get rid of it here, too

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 2d14cdf94a2ed254a0be7b54a701da87e72e1779..a6a7f5c5355bb3a57e913c2d1adce8f70a287b92 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -829,7 +829,7 @@ ADMIN_BUSINESS_DATA_PHONE_NUMBER=Haupttelefonnummer:
 ADMIN_BUSINESS_DATA_FAX_NUMBER=Hauptfaxnummer:
 #@TODO Please fix German umlauts!
 ADMIN_ADD_CONTACT_BUSINESS_TITLE=Neuen geschaeftlichen Kontakt hinzufuegen
-ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen mit Rechtsform ein.
+ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen inklusive Rechtsform ein.
 #@TODO Please fix German umlauts!
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format.
 #@TODO Please fix German umlauts!

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 5401882cd4118fdc84de29f54dc533cd00c22e46..00646efe2cbccce7037f34f397a2863065fcbbef 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -809,7 +809,7 @@ ADMIN_BUSINESS_DATA_COMPANY_COMMENTS=Comments:
 ADMIN_BUSINESS_DATA_PHONE_NUMBER=Main phone number:
 ADMIN_BUSINESS_DATA_FAX_NUMBER=Main fax number:
 ADMIN_ADD_CONTACT_BUSINESS_TITLE=Add new business contact
-ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name and legal status.
+ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name including legal status.
 ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid.
 ADMIN_CONTACT_BUSINESS_DATA_LEGEND=Basic data for business contact:
 #Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein.

diff --git a/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaAdminBusinessDataWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaAdminBusinessDataWebSessionBean.java
index 30d7daf1b1038e85736bcc82553cecaa96b4563a..be8e9521f09c40bf7bc2b53f871b8aa44c78a457 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaAdminBusinessDataWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaAdminBusinessDataWebSessionBean.java
@@ -63,11 +63,6 @@ public class PizzaAdminBusinessDataWebSessionBean extends BasePizzaController im
         */
        private String companyEmailAddress;
 
-       /**
-        * Company legal status (example: Incorporated, GmbH)
-        */
-       private String companyLegalStatus;
-
        /**
         * Company name
         */
@@ -153,24 +148,6 @@ public class PizzaAdminBusinessDataWebSessionBean extends BasePizzaController im
                this.companyEmailAddress = companyEmailAddress;
        }
 
-       /**
-        * Getter for company's legal status
-        * <p>
-        * @return Company's legal status
-        */
-       public String getCompanyLegalStatus () {
-               return this.companyLegalStatus;
-       }
-
-       /**
-        * Setter for company's legal status
-        * <p>
-        * @param companyLegalStatus Company's legal status
-        */
-       public void setCompanyLegalStatus (final String companyLegalStatus) {
-               this.companyLegalStatus = companyLegalStatus;
-       }
-
        /**
         * Getter for company name
         * <p>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaBusinessDataWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaBusinessDataWebSessionBean.java
index e3e0c4f473a263f76096da655a44776588bb0884..d3be06426ccb2ec608681c13fc162501010c0f87 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaBusinessDataWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/businessdata/PizzaBusinessDataWebSessionBean.java
@@ -58,11 +58,6 @@ public class PizzaBusinessDataWebSessionBean extends BasePizzaController impleme
         */
        private String companyEmailAddress;
 
-       /**
-        * Company legal status (example: Incorporated, GmbH)
-        */
-       private String companyLegalStatus;
-
        /**
         * Company name
         */
@@ -148,24 +143,6 @@ public class PizzaBusinessDataWebSessionBean extends BasePizzaController impleme
                this.companyEmailAddress = companyEmailAddress;
        }
 
-       /**
-        * Getter for company's legal status
-        * <p>
-        * @return Company's legal status
-        */
-       public String getCompanyLegalStatus () {
-               return this.companyLegalStatus;
-       }
-
-       /**
-        * Setter for company's legal status
-        * <p>
-        * @param companyLegalStatus Company's legal status
-        */
-       public void setCompanyLegalStatus (final String companyLegalStatus) {
-               this.companyLegalStatus = companyLegalStatus;
-       }
-
        /**
         * Getter for company name
         * <p>

diff --git a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
index 7781ac4dbd177541823d2bf21373d362fea76650..af9c01b85fe426505e5209b4a9cd36f1bd1e5cc0 100644 (file)
--- a/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
+++ b/web/WEB-INF/templates/admin/business_data/admin_form_business_data.tpl
@@ -27,22 +27,6 @@
                                <h:message for="companyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
-                                       <h:outputLabel for="companyLegalStatus" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS}" />
-                               </div>
-
-                               <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="companyLegalStatus" size="5" maxlength="10" value="#{adminBusinessDataController.companyLegalStatus}" />
-                               </div>
-
-                               <div class="clear"></div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="companyLegalStatus" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                       </h:panelGroup>
-
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />

diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml
index 605db6b00a350b2d7dc06cf09d3e783acd8e6e31..3527e775868c840469cc5fefb954a10cf94dd8c7 100644 (file)
--- a/web/admin/business_data/admin_business_data_list.xhtml
+++ b/web/admin/business_data/admin_business_data_list.xhtml
@@ -47,7 +47,7 @@
                                        <h:outputText value="#{msg.ADMIN_CONTACT_BUSINESS_COMPANY_NAME}" />
                                </f:facet>
 
-                               <h:outputText value="#{businessContact.companyName} #{businessContact.companyLegalStatus}" />
+                               <h:outputText value="#{businessContact.companyName}" />
                        </h:column>
 
                        <h:column>