Don't cherry-pick:

- added all missing column for showing entity property data
- added missing i18n key

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index 73eb2fa3ea83932eb452f037418c6cdd671c29ab..4ffb6b23e00b8e2b043b5021a11e097870aba22b 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -99,6 +99,7 @@ ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE=Zeigt Produktdaten des Artikels an.
 ENTER_RECEIPT_ITEM_COUPON_NUMBER=Coupon-Nummer eingeben:
 #@TODO Please fix German umlauts!
 ENTER_RECEIPT_ITEM_COUPON_NUMBER_TITLE=Geben Sie die Nummer des eingeloesten Coupons ein.
+RECIPIENT_ITEM_COUPON_NUMBER_HEADER=Couponnummer:
 ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE=Bitte geben Sie das Ausstellungsdatum mit Uhrzeit f\u00fcr den Kassenbon ein. Falls Sie keine Uhrzeit haben, einfach auf 00:00 Uhr lassen.
 #@TODO Please fix German umlauts!
 ENTERED_RECEIPT_REGISTER_NUMBER_INVALID=Die eingegebene Kassennummer ist kleiner 1 oder groesser 999.

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index a67c7a56df36be05c453bf94bc41d799df4bfb88..a329ee49030ba0a543bb02dacba117065b89fb28 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -85,6 +85,7 @@ CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_REQUIRED=Please choose whether the item is a dis
 CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_TITLE=Choose whether this is a discount on an item.
 ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE=Shows receipt item's product data.
 ENTER_RECEIPT_ITEM_COUPON_NUMBER=Enter coupon number:
+RECIPIENT_ITEM_COUPON_NUMBER_HEADER=Coupon number:
 ENTER_RECEIPT_ITEM_COUPON_NUMBER_TITLE=Please enter the number of the used coupon.
 ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE=Please enter issue date of the receipt including time. In case you don't have time, set it to 00:00.
 ENTERED_RECEIPT_REGISTER_NUMBER_INVALID=Your entered cash register number is smaller than 1 and larger than 999.

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 ecab870fd736482efbd021759e60bed5762e196f..c986c129fafade60a173c69af44ebe78fa07a459 100644 (file)
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -101,6 +101,98 @@
                                        </p:link>
                                </p:column>
 
+                               <p:column
+                                       headerText="#{product.BRAND_NAME_HEADER}"
+                                       sortBy="#{receiptItem.itemBrandName}"
+                                       filterBy="#{receiptItem.itemBrandName}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemBrandName}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.RECIPIENT_ITEM_COUPON_NUMBER_HEADER}"
+                                       sortBy="#{receiptItem.itemCouponNumber}"
+                                       filterBy="#{receiptItem.itemCouponNumber}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemCouponNumber}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.GROSS_PRICE_HEADER}"
+                                       sortBy="#{receiptItem.itemGrossPrice}"
+                                       filterBy="#{receiptItem.itemGrossPrice}"
+                                       filterFunction="#{productListController.filterByPrice}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemGrossPrice}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.NET_PRICE_HEADER}"
+                                       sortBy="#{receiptItem.itemNetPrice}"
+                                       filterBy="#{receiptItem.itemNetPrice}"
+                                       filterFunction="#{productListController.filterByPrice}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemNetPrice}">
+                                               <!-- @TODO Hard-coded EUR again -->
+                                               <f:convertNumber type="currency" currencyCode="EUR" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.TAX_RATE_HEADER}"
+                                       sortBy="#{receiptItem.itemTaxRate}"
+                                       filterBy="#{receiptItem.itemTaxRate}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemTaxRate}">
+                                               <!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
+                                               <f:convertNumber type="number" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.IS_DISCOUNT_HEADER}"
+                                       sortBy="#{receiptItem.itemIsDiscount}"
+                                       filterBy="#{receiptItem.itemIsDiscount}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu onchange="PF('receiptItemList').filter()">
+                                                       <f:converter converterId="javax.faces.Boolean" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+                                               </p:selectOneMenu>
+                                       </f:facet>
+
+                                       <h:outputText value="#{receiptItem.itemIsDiscount ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.IS_REFUND_HEADER}"
+                                       sortBy="#{receiptItem.itemIsRefund}"
+                                       filterBy="#{receiptItem.itemIsRefund}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu onchange="PF('receiptItemList').filter()">
+                                                       <f:converter converterId="javax.faces.Boolean" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+                                               </p:selectOneMenu>
+                                       </f:facet>
+
+                                       <h:outputText value="#{receiptItem.itemIsRefund ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{project.RECEIPT_ITEM_NUMBER_HEADER}"
+                                       sortBy="#{receiptItem.itemNumber}"
+                                       filterBy="#{receiptItem.itemNumber}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemNumber}" />
+                               </p:column>
+
                                <p:column
                                        headerText="#{project.ADMIN_RECEIPT_HEADER}"
                                        sortBy="#{receiptItem.itemReceipt}"
@@ -171,6 +263,14 @@
                                        </p:link>
                                </p:column>
 
+                               <p:column
+                                       headerText="#{project.RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER}"
+                                       sortBy="#{receiptItem.itemProductQuantity}"
+                                       filterBy="#{receiptItem.itemProductQuantity}"
+                                       >
+                                       <h:outputText value="#{receiptItem.itemProductQuantity}" />
+                               </p:column>
+
                                <p:column
                                        headerText="#{product.ADMIN_PRODUCT_MANUFACTURER_HEADER}"
                                        sortBy="#{receiptItem.itemManufacturer.companyName}"