From: Roland Häder <roland@mxchange.org>
Date: Mon, 1 Jun 2020 13:37:44 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c474ce0c845e5395adae8dc35d5737ca512945b7;p=jfinancials-war.git

Don't cherry-pick:
- renderReceipt() does now require a second parameter showReceiptPaymentType
  which can be used to include or exclude the payment type in views. For all
  selection boxes, this feature has been disabled (in views) or else the
  selection box becomes very wide

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java
index 8f6e1228..fa5d4084 100644
--- a/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java
@@ -45,13 +45,15 @@ public class FinancialsWebViewReceiptHelperBean extends BaseFinancialsBean imple
 	}
 
 	/**
-	 * Returns the receipt number and more. If null is provided, an empty string is returned.
+	 * Returns the receipt number and more. If null is provided, an empty string
+	 * is returned.
 	 * <p>
-	 * @param receipt Receipt instance
+	 * @param receipt                Receipt instance
+	 * @param showReceiptPaymentType Whether the payment type should be shown
 	 * <p>
 	 * @return Receipt number and more
 	 */
-	public String renderReceipt (final BillableReceipt receipt) {
+	public String renderReceipt (final BillableReceipt receipt, final Boolean showReceiptPaymentType) {
 		// Default is empty string, so let's get started
 		final StringBuilder sb = new StringBuilder(50);
 
@@ -59,9 +61,14 @@ public class FinancialsWebViewReceiptHelperBean extends BaseFinancialsBean imple
 		if (receipt instanceof BillableReceipt) {
 			// Add relevant data
 			sb.append(this.getMessageFromBundle("RECEIPT_ISSUED")).append(" "); //NOI18N
-			sb.append(DateFormat.getInstance().format(receipt.getReceiptIssued())).append(", "); //NOI18N
-			sb.append(this.getMessageFromBundle("PAYMENT_TYPE")).append(" "); //NOI18N
-			sb.append(this.getMessageFromBundle(receipt.getReceiptPaymentType().getMessageKey()));
+			sb.append(DateFormat.getInstance().format(receipt.getReceiptIssued()));
+
+			// Is payment type to be shown?
+			if (showReceiptPaymentType) {
+				// Add payment type
+				sb.append(", ").append(this.getMessageFromBundle("PAYMENT_TYPE")).append(" "); //NOI18N
+				sb.append(this.getMessageFromBundle(receipt.getReceiptPaymentType().getMessageKey()));
+			}
 
 			// Is receipt number included?
 			if (receipt.getReceiptNumber() != null) {
diff --git a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
index 2f4e8eec..e2905d42 100644
--- a/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
@@ -153,7 +153,7 @@
 					value="#{receiptListController.allReceipts}"
 					var="receipt"
 					itemValue="#{receipt}"
-					itemLabel="#{receiptBeanHelper.renderReceipt(receipt)}"
+					itemLabel="#{receiptBeanHelper.renderReceipt(receipt, false)}"
 					/>
 			</p:selectOneMenu>
 
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
index 546c4669..9e32401e 100644
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -122,14 +122,14 @@
 								value="#{receiptListController.allReceipts}"
 								var="receipt"
 								itemValue="#{receipt}"
-								itemLabel="#{receiptBeanHelper.renderReceipt(receipt)}"
+								itemLabel="#{receiptBeanHelper.renderReceipt(receipt, false)}"
 								/>
 						</p:selectCheckboxMenu>
 					</f:facet>
 
 					<p:link
 						outcome="admin_show_receipt"
-						value="#{receiptBeanHelper.renderReceipt(receiptItem.itemReceipt)}"
+						value="#{receiptBeanHelper.renderReceipt(receiptItem.itemReceipt, false)}"
 						title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
 						>
 						<f:param name="receiptId" value="#{receiptItem.itemReceipt.receiptId}" />
@@ -301,7 +301,7 @@
 						<p:outputLabel value="#{product.GENERIC_PRODUCT_I18N_KEY_HEADER}" title="#{product.GENERIC_PRODUCT_I18N_KEY_TITLE}" />
 						<p:link
 							outcome="admin_show_generic_product"
-							value="#{local[receiptItemListController.selectedReceiptItem.itemProduct.productI18nKey]}"
+							value="#{productBeanHelper.renderGenericProduct(receiptItemListController.selectedReceiptItem.itemProduct)}"
 							title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}"
 							>
 							<f:param name="productId" value="#{receiptItemListController.selectedReceiptItem.itemProduct.productId}" />
@@ -313,11 +313,7 @@
 							title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
 							rendered="#{not empty receiptItemListController.selectedReceiptItem.itemManufacturer}"
 							>
-							<h:outputFormat value="#{msg.BASIC_DATA_LINK_MASK}">
-								<f:param value="#{receiptItemListController.selectedReceiptItem.itemManufacturer.companyName}" />
-								<f:param value="#{receiptItemListController.selectedReceiptItem.itemManufacturer.basicDataId}" />
-							</h:outputFormat>
-							<f:param name="basicDataId" value="#{receiptItemListController.selectedReceiptItem.itemManufacturer.basicDataId}" />
+							<h:outputText value="#{beanHelper.renderBasicData(receiptItemListController.selectedReceiptItem.itemManufacturer, false, true)}" />
 						</p:link>
 						<h:outputText value="#{project.RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED}" rendered="#{empty receiptItemListController.selectedReceiptItem.itemManufacturer}" />
 
@@ -348,7 +344,7 @@
 						<p:outputLabel value="#{project.ASSIGNED_RECEIPT_HEADER}" title="#{project.RECEIPT_ITEM_ASSIGNED_RECEIPT_TITLE}" />
 						<p:link
 							outcome="admin_show_receipt"
-							value="#{receiptBeanHelper.renderReceipt(receiptItemListController.selectedReceiptItem.itemReceipt)}"
+							value="#{receiptBeanHelper.renderReceipt(receiptItemListController.selectedReceiptItem.itemReceipt, true)}"
 							title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}"
 							>
 							<f:param name="receiptId" value="#{receiptItemListController.selectedReceiptItem.itemReceipt.receiptId}" />