From: Roland Häder Date: Sat, 19 Aug 2017 15:00:39 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8775c73bd8d433e1988efa05328e544fef1ae1a7;p=jfinancials-war.git 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 --- diff --git a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java index c18465e1..3572dfe5 100644 --- a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsAdminBusinessDataWebRequestBean.java @@ -56,11 +56,6 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon */ private String companyEmailAddress; - /** - * Company legal status (example: Incorporated, GmbH) - */ - private String companyLegalStatus; - /** * Company name */ @@ -140,24 +135,6 @@ public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsCon this.companyEmailAddress = companyEmailAddress; } - /** - * Getter for company's legal status - *

- * @return Company's legal status - */ - public String getCompanyLegalStatus () { - return this.companyLegalStatus; - } - - /** - * Setter for company's legal status - *

- * @param companyLegalStatus Company's legal status - */ - public void setCompanyLegalStatus (final String companyLegalStatus) { - this.companyLegalStatus = companyLegalStatus; - } - /** * Getter for company name *

diff --git a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java index 06a3e168..02adbd7d 100644 --- a/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/businessdata/FinancialsBusinessDataWebSessionBean.java @@ -71,11 +71,6 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll */ private String companyEmailAddress; - /** - * Company legal status (example: Incorporated, GmbH) - */ - private String companyLegalStatus; - /** * Company name */ @@ -167,24 +162,6 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll this.companyEmailAddress = companyEmailAddress; } - /** - * Getter for company's legal status - *

- * @return Company's legal status - */ - public String getCompanyLegalStatus () { - return this.companyLegalStatus; - } - - /** - * Setter for company's legal status - *

- * @param companyLegalStatus Company's legal status - */ - public void setCompanyLegalStatus (final String companyLegalStatus) { - this.companyLegalStatus = companyLegalStatus; - } - /** * Getter for company name *

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index eedf9d20..b503fa80 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -850,7 +850,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 4118bf17..5c2afc04 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -819,7 +819,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/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 2d8e5eb9..652610d2 100644 --- 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 @@ - -

- -
- -
- -
- -
- - - - - -
diff --git a/web/admin/business_data/admin_business_data_list.xhtml b/web/admin/business_data/admin_business_data_list.xhtml index 605db6b0..3527e775 100644 --- a/web/admin/business_data/admin_business_data_list.xhtml +++ b/web/admin/business_data/admin_business_data_list.xhtml @@ -47,7 +47,7 @@ - +