From: Roland Haeder <roland@mxchange.org>
Date: Tue, 6 Oct 2015 11:57:34 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6111f6062f82669130bb0ef3f4ef0566d3f259d0;p=pizzaservice-war.git

Continued:
- removed companyName field as this will be part in jcontacts-business-core
- updated jars
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index 116c3511..5fd68dc8 100644
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 1ad620cf..a26d6459 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -126,7 +126,6 @@ PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Bitte den Datenschutzbestimmungen zustimmen.
 TERMS_NOT_ACCEPTED_MESSAGE=Bitte den AGBs zustimmen.
 PERSONAL_DATA_MINIMUM_NOTICE=Bitte geben Sie mindestens Name, Anschrift und Telefonnummer an.
 PERSONAL_DATA_GENDER=Anrede:
-PERSONAL_DATA_COMPANY_NAME=Firmenname:
 PERSONAL_DATA_FIRST_NAME=Vorname:
 PERSONAL_DATA_FAMILY_NAME=Nachname:
 PERSONAL_DATA_STREET=Stra\u00dfe:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 4e113ca2..b472f481 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -126,7 +126,6 @@ PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Please accept our privacy policy.
 TERMS_NOT_ACCEPTED_MESSAGE=Please accept Terms&Conditions.
 PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least your name, address and phone number.
 PERSONAL_DATA_GENDER=Salutation:
-PERSONAL_DATA_COMPANY_NAME=Company name:
 PERSONAL_DATA_FIRST_NAME=First name:
 PERSONAL_DATA_FAMILY_NAME=Family name:
 PERSONAL_DATA_STREET=Street:
diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
index ad577807..22fed4fa 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -59,11 +59,6 @@ public class CustomerWebBean implements CustomerWebController {
 	 */
 	private String comment;
 
-	/**
-	 * Company name
-	 */
-	private String companyName;
-
 	/**
 	 * Country code
 	 */
@@ -150,7 +145,7 @@ public class CustomerWebBean implements CustomerWebController {
 		Customer customer = new ShopCustomer();
 
 		// Create new contact
-		Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName(), this.getCompanyName());
+		Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
 		contact.setStreet(this.getStreet());
 		contact.setHouseNumber(this.getHouseNumber());
 		contact.setZipCode(this.getZipCode());
@@ -188,16 +183,6 @@ public class CustomerWebBean implements CustomerWebController {
 		this.city = city;
 	}
 
-	@Override
-	public String getCompanyName () {
-		return this.companyName;
-	}
-
-	@Override
-	public void setCompanyName (final String companyName) {
-		this.companyName = companyName;
-	}
-
 	@Override
 	public String getCountryCode () {
 		return this.countryCode;
diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
index ddb4996d..47955f0f 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
@@ -62,20 +62,6 @@ public interface CustomerWebController extends Serializable {
 	 */
 	public void setCity (final String city);
 
-	/**
-	 * Company name
-	 * <p>
-	 * @return the companyName
-	 */
-	public String getCompanyName ();
-
-	/**
-	 * Company name
-	 * <p>
-	 * @param companyName the companyName to set
-	 */
-	public void setCompanyName (final String companyName);
-
 	/**
 	 * Country code
 	 * <p>
diff --git a/web/WEB-INF/templates/guest/guest_personal_data.tpl b/web/WEB-INF/templates/guest/guest_personal_data.tpl
index 7c780dd3..35f7ae94 100644
--- a/web/WEB-INF/templates/guest/guest_personal_data.tpl
+++ b/web/WEB-INF/templates/guest/guest_personal_data.tpl
@@ -25,18 +25,6 @@
 				<div class="clear"></div>
 			</div>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="companyname" value="#{msg.PERSONAL_DATA_COMPANY_NAME}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="companyname" size="15" maxlength="255" value="#{customerController.companyName}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
 			<div class="table_row">
 				<div class="table_left">
 					<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />