From 2488b22aecd9e51d9bf375264344dfa7d88f5b88 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 8 Jun 2017 23:10:56 +0200
Subject: [PATCH] Continued: - receipt's date of issue should be entered so the
 user can have a detailed track - A receipt number is required for persisting,
 the user can leave it empty so a   random number is generated. But then the
 user must be careful not to add same   receipt twice. - fixed copyrights, no
 email address here
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../FinancialsContactWebSessionBean.java      |  6 +--
 ...FinancialsContactWebSessionController.java |  6 +--
 .../FinancialsIncomeWebRequestController.java |  2 +
 .../contact/FinancialsContactConverter.java   |  2 +-
 .../login_financials_add_receipt.xhtml        | 39 ++++++++++++++++---
 5 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
index b7d84b40..256832ca 100644
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java
@@ -39,7 +39,7 @@ import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcontacts.contact.utils.ContactUtils;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
-import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
+import org.mxchange.jcontactsbusiness.exceptions.BusinessContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jfinancials.beans.BaseFinancialsController;
 import org.mxchange.jfinancials.beans.login.user.FinancialsUserLoginWebSessionController;
@@ -931,7 +931,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
 	}
 
 	@Override
-	public Contact lookupContactById (final Long contactId) throws ContactNotFoundException {
+	public Contact lookupContactById (final Long contactId) throws BusinessContactNotFoundException {
 		// Init variable
 		Contact localContact = null;
 
@@ -954,7 +954,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im
 		// Is it still null?
 		if (null == localContact) {
 			// Not visible for the current user
-			throw new ContactNotFoundException(contactId);
+			throw new BusinessContactNotFoundException(contactId);
 		}
 
 		// Copy all data to this bean
diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
index ec63e3af..59ed155d 100644
--- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java
@@ -22,7 +22,7 @@ import java.util.List;
 import javax.ejb.Local;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.gender.Gender;
-import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
+import org.mxchange.jcontactsbusiness.exceptions.BusinessContactNotFoundException;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 
@@ -61,9 +61,9 @@ public interface FinancialsContactWebSessionController extends Serializable {
 	 * <p>
 	 * @return Contact instance
 	 * <p>
-	 * @throws ContactNotFoundException If the user is not found
+	 * @throws BusinessContactNotFoundException If the user is not found
 	 */
-	Contact lookupContactById (final Long contactId) throws ContactNotFoundException;
+	Contact lookupContactById (final Long contactId) throws BusinessContactNotFoundException;
 
 	/**
 	 * Creates an instance from all properties
diff --git a/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestController.java
index e25f954e..07eec5e2 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestController.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/income/FinancialsIncomeWebRequestController.java
@@ -18,6 +18,7 @@ package org.mxchange.jfinancials.beans.financial.income;
 
 import java.io.Serializable;
 import java.util.List;
+import javax.ejb.Local;
 import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
 
 /**
@@ -25,6 +26,7 @@ import org.mxchange.jfinancials.model.income.interval.FinancialInterval;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
+@Local
 public interface FinancialsIncomeWebRequestController extends Serializable {
 
 	/**
diff --git a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
index cd62e99b..e8d1535c 100644
--- a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
@@ -38,7 +38,7 @@ import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 public class FinancialsContactConverter implements Converter {
 
 	/**
-	 * User EJB
+	 * Contact EJB
 	 */
 	private ContactSessionBeanRemote contactBean;
 
diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml
index 1a0e88ee..341259fc 100644
--- a/web/user/financials/login_financials_add_receipt.xhtml
+++ b/web/user/financials/login_financials_add_receipt.xhtml
@@ -29,9 +29,9 @@
 						</div>
 
 						<div class="table_right_medium">
-							<h:selectOneMenu styleClass="select" id="receiptCompany" value="#{financialReceiptController.incomeInterval}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_RECEIPT_COMPANY_REQUIRED}">
+							<h:selectOneMenu styleClass="select" id="receiptCompany" value="#{financialReceiptController.receiptCompany}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_RECEIPT_COMPANY_REQUIRED}" converter="BusinessContactConverter">
 								<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
-								<f:selectItems value="#{financialReceiptController.allRegisteredCompanies()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.someFoo}" />
+								<f:selectItems value="#{businessContactController.allRegisteredCompanies()}" var="receiptCompany" itemValue="#{receiptCompany}" itemLabel="#{receiptCompany.basicBusinessData.companyName}" />
 							</h:selectOneMenu>
 						</div>
 
@@ -40,11 +40,25 @@
 
 					<div class="table_row">
 						<div class="table_left_medium">
-							<h:outputLabel for="receiptCreated" value="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_CREATED}" />
+							<h:outputLabel for="receiptIssued" value="#{msg.LOGIN_FINANCIAL_ENTER_RECEIPT_CREATED}" />
 						</div>
 
 						<div class="table_right_medium">
-							<p:calendar id="receiptCreated" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptCreated}" />
+							<p:calendar id="receiptIssued" locale="#{localizationController.locale.displayCountry}" value="#{financialReceiptController.receiptIssued}" />
+						</div>
+
+						<div class="clear"></div>
+					</div>
+
+					<div class="table_row">
+						<div class="table_left_medium">
+							<h:outputLabel for="receiptNumber" value="#{msg.LOGIN_FINANCIAL_RECEIPT_NUMBER}" />
+						</div>
+
+						<div class="table_right_medium">
+							<h:inputText styleClass="input" id="receiptNumber" size="2" maxlength="10" value="#{financialReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
+								<f:validateLongRange minimum="1" maximum="20" />
+							</h:inputText>
 						</div>
 
 						<div class="clear"></div>
@@ -53,7 +67,22 @@
 					<div class="table_row">
 						<h:outputText value="#{msg.LOGIN_FINANCIAL_COMPANY_NOT_FOUND}" />
 						<h:outputText value="&nbsp;" />
-						<p:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
+						<h:link title="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY_TITLE}" outcome="login_add_receipt_company" value="#{msg.LINK_LOGIN_FINANCIAL_ADD_COMPANY}" />
+					</div>
+
+					<div class="table_row">
+						<div class="table_left_medium">
+							<h:outputLabel for="paymentType" value="#{msg.LOGIN_FINANCIAL_INCOME_INTERVAL}" />
+						</div>
+
+						<div class="table_right_medium">
+							<h:selectOneMenu styleClass="select" id="paymentType" value="#{financialReceiptController.paymentType}" required="true" requiredMessage="#{msg.FIELD_FINANCIAL_INCOME_REQUIRED}">
+								<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+								<f:selectItems value="#{financialReceiptController.allPaymentTypes()}" var="paymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType]}" />
+							</h:selectOneMenu>
+						</div>
+
+						<div class="clear"></div>
 					</div>
 
 					<div class="table_footer">
-- 
2.39.5