From 07a7295bd6de466516c963d0f0cb7bbf9d0c8ac7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 7 Jun 2020 14:39:04 +0200
Subject: [PATCH] Don't cherry-pick: - added resumption of (other) receipt
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 ...inancialAdminReceiptActionWebViewBean.java | 25 +++++++++++++++++++
 .../localization/project_de_DE.properties     |  2 ++
 .../localization/project_en_US.properties     |  1 +
 .../receipt/admin_form_financial_receipt.tpl  | 25 +++++++++++++++++++
 4 files changed, 53 insertions(+)

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java
index 2332e2a2..c48b3d1c 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java
@@ -130,6 +130,11 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i
 	 */
 	private Long receiptRegisterNumber;
 
+	/**
+	 * Current receipt is a resumption of this receipt
+	 */
+	private BillableReceipt receiptResumptionOf;
+
 	/**
 	 * Selling employee
 	 */
@@ -404,6 +409,24 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i
 		this.receiptRegisterNumber = receiptRegisterNumber;
 	}
 
+	/**
+	 * Getter for receipt's resumption of an other receipt
+	 * <p>
+	 * @return Current receipt is based on this receipt
+	 */
+	public BillableReceipt getReceiptResumptionOf () {
+		return this.receiptResumptionOf;
+	}
+
+	/**
+	 * Setter for receipt's resumption of an other receipt
+	 * <p>
+	 * @param receiptResumptionOf Current receipt is based on this receipt
+	 */
+	public void setReceiptResumptionOf (final BillableReceipt receiptResumptionOf) {
+		this.receiptResumptionOf = receiptResumptionOf;
+	}
+
 	/**
 	 * Getter for receipt seller employee
 	 * <p>
@@ -537,6 +560,7 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i
 		this.setReceiptNumber(null);
 		this.setReceiptPaymentType(null);
 		this.setReceiptRegisterNumber(null);
+		this.setReceiptResumptionOf(null);
 		this.setReceiptSellerEmployee(null);
 		this.setReceiptSequenceNumber(null);
 		this.setReceiptTransactionNumber(null);
@@ -562,6 +586,7 @@ public class FinancialAdminReceiptActionWebViewBean extends BaseFinancialsBean i
 		receipt.setReceiptId(this.getReceiptId());
 		receipt.setReceiptNumber(this.getReceiptNumber());
 		receipt.setReceiptRegisterNumber(this.getReceiptRegisterNumber());
+		receipt.setReceiptResumptionOf(this.getReceiptResumptionOf());
 		receipt.setReceiptSellerEmployee(this.getReceiptSellerEmployee());
 		receipt.setReceiptSequenceNumber(this.getReceiptSequenceNumber());
 		receipt.setReceiptTransactionNumber(this.getReceiptTransactionNumber());
diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index 8eb9e23f..350a0f4f 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -192,3 +192,5 @@ ADMIN_ENABLE_INCOME_REQUIRED=Sie muessen entweder das Einkommen aktivieren oder
 ADMIN_ENABLE_INCOME=Einkommen aktiviert?
 #@TODO Please fix German umlauts!
 ADMIN_ENABLE_INCOME_TITLE=Bitte waehlen Sie aus, ob das Einkommen aktiviert ist.
+#@TODO Please fix German umlauts!
+SELECT_RECEIPT_RESUMPTION_OF=Waehle wiederaufgenommenen Kassenbon aus:
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index d9bf44d2..bea4f033 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -162,3 +162,4 @@ ADMIN_ERROR_FINANCIAL_RECEIPT_ITEM_NOT_CHANGED=Error: You did not change the rec
 ADMIN_ENABLE_INCOME_REQUIRED=You have to whether enable or disabled the income.
 ADMIN_ENABLE_INCOME=Income enabled?
 ADMIN_ENABLE_INCOME_TITLE=Please choose whether the income is enabled.
+SELECT_RECEIPT_RESUMPTION_OF=Select which receipt is being resumed:
diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
index 4d2486c1..cefc83cc 100644
--- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -115,6 +115,31 @@
 					itemLabel="#{beanHelper.renderContact(receiptUser.userContact)} (#{receiptUser.userName})"
 					/>
 			</p:selectOneMenu>
+
+			<p:outputLabel for="receiptResumptionOf" value="#{project.SELECT_RECEIPT_RESUMPTION_OF}" />
+			<p:selectOneMenu
+				id="receiptResumptionOf"
+				value="#{adminReceiptActionController.receiptResumptionOf}"
+				filter="true"
+				filterMatchMode="contains"
+				>
+
+				<f:converter converterId="ReceiptConverter" />
+
+				<f:selectItem
+					itemValue="#{null}"
+					itemLabel="#{msg.PLEASE_SELECT}"
+					noSelectionOption="true"
+					itemDisabled="true"
+					/>
+
+				<f:selectItems
+					value="#{receiptListController.allReceipts}"
+					var="receipt"
+					itemValue="#{receipt}"
+					itemLabel="#{receiptBeanHelper.renderReceipt(receipt, false)}"
+					/>
+			</p:selectOneMenu>
 		</p:panelGrid>
 	</p:fieldset>
 
-- 
2.39.5