From: Roland Häder <roland@mxchange.org>
Date: Sun, 24 Jun 2018 20:41:20 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=29c5fcae850d8935e09382331284514757da5177;p=jfinancials-war.git

Don't cherry-pick:
- let's render the receipt's bar code into an actual barcode
- renamed RECEIPT_NUMBER -> RECEIPT_NUMBER_HEADER
- added showing receipt number in list view (receipts)

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

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index 64e39053..b9c5a808 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -215,7 +215,7 @@ ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Bitte geben Sie den Uebersetzungschluessel
 ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER=Produktehersteller:
 ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=Es ist kein Hersteller dem Produkt zugewiesen.
 RECEIPT_ISSUED=Ausgestellt:
-RECEIPT_NUMBER=Kassenbonnummer:
+RECEIPT_NUMBER_HEADER=Kassenbonnummer:
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Geben Sie die Produktnummer ein:
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Geben Sie die Nummer des Produktes ein.
 ENTER_RECEIPT_ITEM_NUMBER=Artikelnumber:
@@ -368,3 +368,4 @@ ENTER_RECEIPT_TRANSACTION_NUMBER=Transaktionsnummer eingeben:
 RECEIPT_REGISTER_NUMBER_HEADER=Kassennummer:
 RECEIPT_REGISTER_NUMBER_TITLE=Kassenummer des Kassenbons.
 ADMIN_PRODUCT_NUMBER_HEADER=Produktnummer:
+RECEIPT_NO_BARCODE_ASSIGNED=Dem Kassenbon wurde kein Barcode zugewiesen.
diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index aa7f56d4..16f4c150 100644
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -153,7 +153,7 @@ ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Please enter unit's i18n key. Example: UNIT
 ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER=Product manufacturer:
 ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=No manufacturer is assigned with this product.
 RECEIPT_ISSUED=Issued at:
-RECEIPT_NUMBER=Receipt number:
+RECEIPT_NUMBER_HEADER=Receipt number:
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Enter product number:
 ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Enter number of product.
 ENTER_RECEIPT_ITEM_NUMBER=Item number:
@@ -274,3 +274,4 @@ ENTER_RECEIPT_TRANSACTION_NUMBER=Enter transaction Number:
 RECEIPT_REGISTER_NUMBER_HEADER=Register number:
 RECEIPT_REGISTER_NUMBER_TITLE=Register's number of receipt.
 ADMIN_PRODUCT_NUMBER_HEADER=Product number:
+RECEIPT_NO_BARCODE_ASSIGNED=No barcode has been assigned to the receipt.
diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
index 1662ce4e..b8258e9a 100644
--- a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
@@ -86,7 +86,7 @@
 			columns="2"
 			columnClasses="ui-grid-col-4,ui-grid-col-8"
 			>
-			<p:outputLabel for="receiptNumber" value="#{project.RECEIPT_NUMBER}" />
+			<p:outputLabel for="receiptNumber" value="#{project.RECEIPT_NUMBER_HEADER}" />
 			<p:inputText
 				id="receiptNumber"
 				size="20"
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 0402abaf..cbf37614 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -172,6 +172,11 @@
         <param-name>min_user_password_score</param-name>
         <param-value>50</param-value>
     </context-param>
+    <context-param>
+        <description>Type of receipt barcode (see p:barcode)</description>
+        <param-name>receipt_barcode_type</param-name>
+        <param-value>codabar</param-value>
+    </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index dadecc3a..3e2c3edc 100644
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -82,6 +82,11 @@
 					</p:link>
 				</p:column>
 
+				<p:column headerText="#{project.RECEIPT_NUMBER_HEADER}" sortBy="#{receipt.receiptNumber}" filterBy="#{receipt.receiptNumber}">
+					<h:outputText value="#{receipt.receiptNumber}" rendered="#{not empty receipt.receiptNumber}" />
+					<h:outputText value="-" rendered="#{empty receipt.receiptNumber}" />
+				</p:column>
+
 				<p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{receipt.receiptBranchOffice}" filterBy="#{receipt.receiptBranchOffice}" filterMatchMode="in">
 					<f:facet name="filter">
 						<p:selectCheckboxMenu
@@ -202,7 +207,7 @@
 						<p:outputLabel value="#{msg.ID_NUMBER_HEADER}" title="#{project.RECEIPT_ID_NUMBER_TITLE}" />
 						<h:outputText value="#{receiptListController.selectedReceipt.receiptId}" />
 
-						<p:outputLabel value="#{project.RECEIPT_NUMBER}" title="#{project.RECEIPT_NUMBER_TITLE}" />
+						<p:outputLabel value="#{project.RECEIPT_NUMBER_HEADER}" title="#{project.RECEIPT_NUMBER_HEADER_TITLE}" />
 						<h:outputText value="#{receiptListController.selectedReceipt.receiptNumber}" />
 
 						<p:outputLabel value="#{project.RECEIPT_ISSUED}" title="#{project.RECEIPT_ISSUED_TITLE}" />
@@ -231,7 +236,8 @@
 						<h:outputText value="#{receiptListController.selectedReceipt.receiptRegisterNumber}" />
 
 						<p:outputLabel value="#{project.RECEIPT_BARCODE_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
-						<h:outputText value="#{receiptListController.selectedReceipt.receiptBarCodeNumber}" />
+						<h:outputText value="#{project.RECEIPT_NO_BARCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />
+						<p:barcode format="svg" width="100%" type="#{initParam['receipt_barcode_type']}" value="#{receiptListController.selectedReceipt.receiptBarCodeNumber}" rendered="#{not empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />
 
 						<p:outputLabel value="#{project.RECEIPT_SEQUENCE_NUMBER_HEADER}" title="#{project.RECEIPT_SEQUENCE_NUMBER_TITLE}" />
 						<h:outputText value="#{receiptListController.selectedReceipt.receiptSequenceNumber}" />