]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 5 Nov 2017 11:39:46 +0000 (12:39 +0100)
committerRoland Häder <roland@mxchange.org>
Sun, 5 Nov 2017 11:43:01 +0000 (12:43 +0100)
- renamed receipts -> receipt receipt_items -> receipt_item
- formatted issue date and shown correctly payment type
- added/fixed i18n strings, sometimes wrong bundle
- fixed navigation outcomes, was a copy-paste mistake
- added missing navigation rules

Signed-off-by: Roland Häder <roland@mxchange.org>
16 files changed:
src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialAdminReceiptWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/financial/model/receipt/FinancialsReceiptWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialsReceiptItemWebRequestBean.java
src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java
src/java/org/mxchange/localization/project_de_DE.properties
src/java/org/mxchange/localization/project_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl
web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
web/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl
web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
web/admin/financial/receipt/admin_receipt_list.xhtml [new file with mode: 0644]
web/admin/financial/receipt_item/admin_receipt_item_list.xhtml [new file with mode: 0644]
web/admin/financial/receipt_items/admin_receipt_item_list.xhtml [deleted file]
web/admin/financial/receipts/admin_receipt_list.xhtml [deleted file]

index 9d8606af3e2d6c7ccc26daa586a80332dde6a278..d6a607733eff319f8fa43fd9201f496ea7cb0d1b 100644 (file)
@@ -176,7 +176,7 @@ public class FinancialAdminReceiptWebRequestBean extends BaseFinancialsBean impl
                this.clear();
 
                // Return redirect outcome
-               return "add_receipt_item?faces-redirect=true"; //NOI18N
+               return ""; //NOI18N
        }
 
        /**
index 16b180a9017f7e33dd243f18a65248a76375aa21..ce89849d4f7ec9832f24e84c8ee8b057eece09a2 100644 (file)
@@ -207,7 +207,7 @@ public class FinancialsReceiptWebRequestBean extends BaseFinancialsBean implemen
                this.clear();
 
                // Return redirect outcome
-               return "add_receipt_item?faces-redirect=true"; //NOI18N
+               return "admin_list_receipts?faces-redirect=true"; //NOI18N
        }
 
        /**
index 298e7b1250f2ce73ed3846fa75d3a0084bf4cd20..efa822b62ed1eb9b639db6bafa0911a51f3ec7c4 100644 (file)
@@ -170,7 +170,7 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
                this.clear();
 
                // Return redirect outcome
-               return "add_receipt_item?faces-redirect=true"; //NOI18N
+               return ""; //NOI18N
        }
 
        /**
index 52768d3c74be48c68780b1578f4bb5435b3a4b88..5456d7d058781d4de192850589bbfd2163f827a5 100644 (file)
@@ -152,7 +152,7 @@ public class FinancialsReceiptItemWebRequestBean extends BaseFinancialsBean impl
                this.clear();
 
                // Return redirect outcome
-               return "add_receipt_item?faces-redirect=true"; //NOI18N
+               return "admin_list_receipt_items?faces-redirect=true"; //NOI18N
        }
 
        /**
index b0e407f9e9ba792b8fd441389ec4027e10e5bad1..bae27edf8d58291d08f7fc7463e81a356ca97fb8 100644 (file)
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jfinancials.beans.helper;
 
+import java.text.DateFormat;
 import java.text.MessageFormat;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
@@ -678,12 +679,14 @@ public class FinancialsWebRequestHelperBean extends BaseFinancialsBean implement
         */
        public String renderReceipt (final BillableReceipt receipt) {
                // Default is empty string, so let's get started
-               final StringBuilder sb = new StringBuilder(10);
+               final StringBuilder sb = new StringBuilder(50);
 
                // Is receipt set?
                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().getI18nKey()));
 
                        // Is receipt number included?
index 39c1dea5cc7a1fe4c73d12e9e12aa67922a26ba6..19aec46123c1a1b27aa9e4bc63812bcbff40b79b 100644 (file)
@@ -79,7 +79,7 @@ ENTER_PRODUCT_NET_PRICE_TITLE=Nettopreis fuer Produkt eingeben.
 ENTER_PRODUCT_TAX_RATE_TITLE=Steuersatz fuer Produkt eingeben.
 #@TODO Please fix German umlauts!
 ENTER_PRODUCT_GROSS_PRICE_TITLE=Brutto-Preis fuer Produkt eingeben.
-ADMIN_ENTER_PRODUCT_PRICE=Preis des Produktes eingeben:
+ADMIN_ENTER_GENERIC_PRODUCT_PRICE=Preis des Produktes eingeben:
 ENTER_NET_PRICE=Nettopreis:
 ENTER_TAX_RATE=Steuersatz:
 ENTER_GROSS_PRICE=Bruttopreis:
@@ -142,21 +142,21 @@ ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Bitte waehlen Sie eine Produktkategorie a
 ADMIN_GENERIC_PRODUCT_DATA_LEGEND=Produktdaten eingeben:
 ADMIN_ASSIGN_PRODUCT_CATEGORY=Zum Produkt zugewiesene Kategorie:
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_I18N_KEY=Uebersetzungsschluessel zum Produkt eingeben:
+ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY=Uebersetzungsschluessel zum Produkt eingeben:
 #@TODO Please fix German umlauts!
 ADMIN_ENABLE_PRODUCT_AVAILABILITY=Ist das Produkt verfuegbar:
 ADMIN_ASSIGN_PRODUCT_CATEGORY_TITLE=Waehlen Sie die Produktkategorie zum neu hinzuzufuegenden Produkt aus.
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_I18N_KEY_TITLE=Geben Sie den Uebersetzungsschluessel zum Produkt ein. Dieser darf nur einmal existieren.
+ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY_TITLE=Geben Sie den Uebersetzungsschluessel zum Produkt ein. Dieser darf nur einmal existieren.
 #@TODO Please fix German umlauts!
 ADMIN_ENABLE_PRODUCT_AVAILABILITY_TITLE=Waehlen Sie aus, ob das Produkt verfuegbar/aktiv ist.
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_CURRENCY_CODE=Waehrungscode eingeben:
+ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE=Waehrungscode eingeben:
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_CURRENCY_CODE_TITLE=Geben Sie den Waehrungscode fuer das Produkt ein. Beispiele: EUR, USD, PHP
+ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE_TITLE=Geben Sie den Waehrungscode fuer das Produkt ein. Beispiele: EUR, USD, PHP
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_UNIT_AMOUNT=Produktstueckzahl eingeben:
-ADMIN_ENTER_PRODUCT_UNIT_AMOUNT_TITLE=Geben Sie hier die Stueckzahl des Produktes ein. Zum Beispiel 500 fuer 500 Gramm. Unter Stueckzahleinheit geben Sie dann einfach nur "g" ein.
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT=Produktstueckzahl eingeben:
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT_TITLE=Geben Sie hier die Stueckzahl des Produktes ein. Zum Beispiel 500 fuer 500 Gramm. Unter Stueckzahleinheit geben Sie dann einfach nur "g" ein.
 #@TODO Please fix German umlauts!
 BUTTON_ADMIN_ADD_GENERIC_PRODUCT=Produkt hinzufuegen
 #@TODO Please fix German umlauts!
@@ -196,9 +196,9 @@ ADMIN_ENTERED_CATEGORY_I18N_KEY_ALREADY_ADDED=Der von Ihnen eingegebene Ueberset
 #@TODO Please fix German umlauts!
 ADMIN_ENTERED_PRODUCT_I18N_KEY_ALREADY_ADDED=Der von Ihnen eingegebene Uebersetzungsschluessel fuer das Produkt ist bereits vorhanden. Bitte gebene Sie einen anderen an.
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_UNIT_I18N_KEY=Uebersetzungschluessel der Einheit fuer Stueckzahl eingeben:
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY=Uebersetzungschluessel der Einheit fuer Stueckzahl eingeben:
 #@TODO Please fix German umlauts!
-ADMIN_ENTER_PRODUCT_UNIT_I18N_KEY_TITLE=Geben Sie hier die Einheit fuer die Produktstueckzahl ein, wie z.B. "l" fuer Liter oder "kg" fuer Kilogramm.
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE=Geben Sie hier die Einheit fuer die Produktstueckzahl ein, wie z.B. "l" fuer Liter oder "kg" fuer Kilogramm.
 ADMIN_ASSIGN_PRODUCT_MANUFACTURER=Produktehersteller dem Produkt zuweisen:
 #@TODO Please fix German umlauts!
 ADMIN_ASSIGN_PRODUCT_MANUFACTURER_TITLE=Zweisen Sie hier ein Hersteller dem Produkt zu. Supermaerke verkaufen oefters nur die Produkte, die ein anderes Unternehmen hergestellt hat.
@@ -214,3 +214,7 @@ ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Bitte geben Sie die Stueckanzahl des Produkte
 ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Bitte geben Sie den Uebersetzungschluessel zur Stueckzahl ein. Beispiel: UNIT_TYPE_GRAMS fuer Gramm
 ADMIN_HEADER_PRODUCT_MANUFACTURER_NAME=Produktehersteller:
 ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=Es ist kein Hersteller dem Produkt zugewiesen.
+RECEIPT_ISSUED=Ausgestellt:
+RECEIPT_NUMBER=Kassenbonnummer:
+ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Geben Sie die Produktnummer ein:
+ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Geben Sie die Nummer des Produktes ein.
index c6fd9879513a6d8071e46cd1abb137ccd969a8bc..7a1c7b8f7aefea2dfd74cdbfd4a9e4b88c08d9ef 100644 (file)
@@ -59,7 +59,7 @@ PRODUCT_GROSS_PRICE_REQUIRED=Please enter product's gross price.
 ENTER_PRODUCT_NET_PRICE_TITLE=Enter product net price.
 ENTER_PRODUCT_TAX_RATE_TITLE=Enter product tax rate.
 ENTER_PRODUCT_GROSS_PRICE_TITLE=Enter product gross price.
-ADMIN_ENTER_PRODUCT_PRICE=Enter product's price:
+ADMIN_ENTER_GENERIC_PRODUCT_PRICE=Enter product's price:
 ENTER_NET_PRICE=Net price:
 ENTER_TAX_RATE=Tax rate:
 ENTER_GROSS_PRICE=Gross price:
@@ -108,15 +108,15 @@ ADMIN_ADD_GENERIC_PRODUCT_TITLE=Add new product
 ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Please choose a product category and enter product title, unit amount and type, gross price and currency code (e.g. USD).
 ADMIN_GENERIC_PRODUCT_DATA_LEGEND=Product data:
 ADMIN_ASSIGN_PRODUCT_CATEGORY=Assign category to product:
-ADMIN_ENTER_PRODUCT_I18N_KEY=Enter product's i8n key:
+ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY=Enter product's i8n key:
 ADMIN_ENABLE_PRODUCT_AVAILABILITY=Is the product available:
 ADMIN_ASSIGN_PRODUCT_CATEGORY_TITLE=Choose the product category for the to be added product.
-ADMIN_ENTER_PRODUCT_I18N_KEY_TITLE=Enter product unit's i18n key. This must be unique.
+ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY_TITLE=Enter product unit's i18n key. This must be unique.
 ADMIN_ENABLE_PRODUCT_AVAILABILITY_TITLE=Choose if the product is available/active.
-ADMIN_ENTER_PRODUCT_CURRENCY_CODE=Enter currency code:
-ADMIN_ENTER_PRODUCT_CURRENCY_CODE=Enter currency code:
-ADMIN_ENTER_PRODUCT_UNIT_AMOUNT=Enter product's unit amount:
-ADMIN_ENTER_PRODUCT_UNIT_AMOUNT_TITLE=Enter the product's unit amount. For example 500 for 500 grams. Under i18n key, then just enter "g".
+ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE=Enter currency code:
+ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE=Enter currency code:
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT=Enter product's unit amount:
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT_TITLE=Enter the product's unit amount. For example 500 for 500 grams. Under i18n key, then just enter "g".
 BUTTON_ADMIN_ADD_GENERIC_PRODUCT=Add product
 ADMIN_PRODUCT_CATEGORY_REQUIRED=Please choose a product category.
 ADMIN_PRODUCT_I18N_KEY_REQUIRED=Please enter a product i18n key.
@@ -143,13 +143,13 @@ ADMIN_ENABLE_CATEGORY_IN_STATISTICS_REQUIRED=Please choose if this category shou
 ENTER_RECEIPT_SEQUENCE_NUMBER=Enter sequence number:
 ADMIN_ENTERED_CATEGORY_I18N_KEY_ALREADY_ADDED=Your entered category i18n key is already added. Please enter an other one.
 ADMIN_ENTERED_PRODUCT_I18N_KEY_ALREADY_ADDED=Your entered product i18n key is already added. Please enter an other one.
-ADMIN_ENTER_PRODUCT_UNIT_I18N_KEY=Enter product unit's i18n key:
-ADMIN_ENTER_PRODUCT_UNIT_I18N_KEY_TITLE=Enter the product unit's i18n key, like "l" for liter or "kg" for kilo grams.
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY=Enter product unit's i18n key:
+ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE=Enter the product unit's i18n key, like "l" for liter or "kg" for kilo grams.
 ADMIN_ASSIGN_PRODUCT_MANUFACTURER=Assign product's manufacturing/producing company:
 ADMIN_ASSIGN_PRODUCT_MANUFACTURER_TITLE=Assign a manufacturing/producing company to this product. Supermarkets are often only selling products other companies have produced.
 SELECT_RECEIPT_ITEM_MANUFACTURER=Choose manufacturer for receipt item:
 ADMIN_HEADER_RECEIPT_ITEM_MANUFACTURER_NAME=Manufacturer of product item:
-ADMIN_ENTER_PRODUCT_CURRENCY_CODE_TITLE=Enter the currency code for product. Examples: EUR, USD, PHP
+ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE_TITLE=Enter the currency code for product. Examples: EUR, USD, PHP
 ENTER_RECEIPT_ITEM_BRAND_NAME=Enter item's brand name:
 ENTER_RECEIPT_ITEM_BRAND_NAME_TITLE=Enter the item's brand name found on receipt.
 ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Please enter current code for product. Example: EUR, USD, PHP
@@ -157,3 +157,7 @@ ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Please enter a unit amount. Example 500 for 5
 ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Please enter unit's i18n key. Example: UNIT_TYPE_GRAMS for grams
 ADMIN_HEADER_PRODUCT_MANUFACTURER_NAME=Product manufacturer:
 ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=No manufacturer is assigned with this product.
+RECEIPT_ISSUED=Issued at:
+RECEIPT_NUMBER=Receipt number:
+ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Enter product number:
+ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Enter number of product.
index 442d848ac3ae675f6d0d40fd2cf2067082a70dc9..827e7fbd7cecda09e1d52440be987ccd59202780 100644 (file)
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_receipts</from-outcome>
-                       <to-view-id>/admin/financial/receipts/admin_receipt_list.xhtml</to-view-id>
+                       <to-view-id>/admin/financial/receipt/admin_receipt_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_receipt_items</from-outcome>
-                       <to-view-id>/admin/financial/receipt_items/admin_receipt_item_list.xhtml</to-view-id>
+                       <to-view-id>/admin/financial/receipt_item/admin_receipt_item_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
                        <to-view-id>/admin/product_category/admin_product_category_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/financial/receipt/admin_receipt_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_receipt</from-outcome>
+                       <to-view-id>/admin/financial/receipt/admin_receipt_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_receipt</from-outcome>
+                       <to-view-id>/admin/financial/receipt/admin_receipt_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_receipt</from-outcome>
+                       <to-view-id>/admin/financial/receipt/admin_receipt_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_branch_office</from-outcome>
+                       <to-view-id>/admin/branch_office/admin_branch_office_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_assign_receipt_user</from-outcome>
+                       <to-view-id>/admin/financial/receipt/admin_assign_receipt_user.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/financial/receipt_item/admin_receipt_item_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_receipt_item</from-outcome>
+                       <to-view-id>/admin/financial/receipt_item/admin_receipt_item_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_receipt_item</from-outcome>
+                       <to-view-id>/admin/financial/receipt_item/admin_receipt_item_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_receipt_item</from-outcome>
+                       <to-view-id>/admin/financial/receipt_item/admin_receipt_item_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_receipt</from-outcome>
+                       <to-view-id>/admin/financial/receipt/admin_receipt_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_generic_product</from-outcome>
+                       <to-view-id>/admin/generic_product/admin_generic_product_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <!--
        <factory>
                <exception-handler-factory>
index 075a68e5f0c268cf02d838365ede6f7a6eabe1c7..a3157e4d254eecd719f0f34eb2a4d51edd5a9837 100644 (file)
                <ul class="navbar-mini">
                        <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
                                <li class="navlink-mini">
-                                       <p:link outcome="admin_show_receipt" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}">
+                                       <p:link outcome="admin_show_receipt_item" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}">
                                                <f:param name="receiptId" value="#{receiptItem.itemId}" />
                                        </p:link>
                                </li>
                        </ui:fragment>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_edit_receipt" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}">
+                               <p:link outcome="admin_edit_receipt_item" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{project.ADMIN_LINK_EDIT_RECEIPT_ITEM_TITLE}">
                                        <f:param name="receiptId" value="#{receiptItem.itemId}" />
                                </p:link>
                        </li>
 
                        <li class="navlink-mini">
-                               <p:link outcome="admin_delete_receipt">
+                               <p:link outcome="admin_delete_receipt_item">
                                        <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{project.ADMIN_LINK_DELETE_RECEIPT_ITEM_TITLE}" />
                                        <f:param name="receiptId" value="#{receiptItem.itemId}" />
                                </p:link>
index 77406c496d09e8c9ab085384cc9e232e6c566693..e21501e10d9250c16cd3f725ecce52adccabdd0e 100644 (file)
@@ -46,7 +46,7 @@
                                filter="true"
                                filterMatchMode="contains"
                                required="true"
-                               requiredMessage="#{project.FIELD_PAYMENT_TYPE_REQUIRED}"
+                               requiredMessage="#{msg.FIELD_PAYMENT_TYPE_REQUIRED}"
                                >
                                <f:converter converterId="PaymentTypeConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
index c086dca62cac0f60df793899db94954777496adb..6eab279b90cabb31170fdeb7eb2c0aae2f93605d 100644 (file)
@@ -82,7 +82,7 @@
                                <f:selectItems value="#{receiptController.allReceipts()}" var="receipt" itemValue="#{receipt}" itemLabel="#{beanHelper.renderReceipt(receipt)}" />
                        </p:selectOneMenu>
 
-                       <p:outputLabel value="#{project.ADMIN_ENTER_PRODUCT_PRICE}" />
+                       <p:outputLabel value="#{project.ADMIN_ENTER_GENERIC_PRODUCT_PRICE}" />
                        <product:inputProductPricePanelGrid targetController="#{adminReceiptItemController}" />
                </p:panelGrid>
        </p:fieldset>
index a4f5b3af9f2aecc421d1425f343f6139b42a4aab..7abedaeac8ea1e0ec0b54f286e60a8f4aed3b13c 100644 (file)
@@ -48,7 +48,7 @@
                                filter="true"
                                filterMatchMode="contains"
                                required="true"
-                               requiredMessage="#{project.FIELD_PAYMENT_TYPE_REQUIRED}"
+                               requiredMessage="#{msg.FIELD_PAYMENT_TYPE_REQUIRED}"
                                >
                                <f:converter converterId="PaymentTypeConverter" />
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
new file mode 100644 (file)
index 0000000..9378782
--- /dev/null
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:core="http://mxchange.org/jsf/core/widgets"
+                               xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
+                               xmlns:links="http://mxchange.org/jsf/core/links"
+                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                               xmlns:h="http://xmlns.jcp.org/jsf/html"
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form-list-financial-receipt">
+                       <p:dataTable
+                               id="table-list-financial-receipt"
+                               var="receipt"
+                               value="#{receiptController.allReceipts()}"
+                               filteredValue="#{receiptController.filteredReceipts}"
+                               tableStyleClass="table table-full"
+                               rows="10"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPTS}"
+                               emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT}"
+                               widgetVar="receiptList"
+                               >
+                               <f:facet name="header">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                               <h:outputText value="#{project.ADMIN_LIST_RECEIPTS_HEADER}" />
+
+                                               <h:panelGroup>
+                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:columnToggler datasource="table-list-financial-receipt" trigger="toggler" />
+                                               </h:panelGroup>
+                                       </p:panelGrid >
+                               </f:facet>
+
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
+                                       <p:link outcome="admin_show_receipt" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receipt.receiptId}">
+                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{receipt.receiptBranchOffice}" filterBy="#{receipt.receiptBranchOffice}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_BRANCH_OFFICES}"
+                                                       onchange="PF('receiptList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_BRANCH_OFFICES_TITLE}"
+                                                       >
+                                                       <f:converter converterId="BranchOfficeConverter" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{receipt.receiptBranchOffice.branchId}">
+                                               <f:param name="branchId" value="#{receipt.receiptBranchOffice.branchId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{project.ADMIN_ASSIGNED_RECEIPT_SELLER}" sortBy="#{receipt.receiptUser.userName}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_RECEIPT_SELLERS}"
+                                                       onchange="PF('receiptList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{project.FILTER_BY_MULTIPLE_RECEIPT_SELLERS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="EmployeeConverter" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_OWNER_RECEIPT_SELLER_TITLE}" value="#{receipt.receiptUser.userId}" rendered="#{not empty receipt.receiptUser}">
+                                               <f:param name="userId" value="#{receipt.receiptUser.userId}" />
+                                       </p:link>
+
+                                       <p:link outcome="admin_assign_receipt_user" title="#{msg.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_RECEIPT_SELLER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty receipt.receiptUser}">
+                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{receipt.receiptUser.userName}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_USERS}"
+                                                       onchange="PF('receiptList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="UserConverter" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE}" value="#{receipt.receiptUser.userId}" rendered="#{not empty receipt.receiptUser}">
+                                               <f:param name="userId" value="#{receipt.receiptUser.userId}" />
+                                       </p:link>
+
+                                       <p:link outcome="admin_assign_receipt_user" title="#{msg.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty receipt.receiptUser}">
+                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_DATE_OF_ISSUE}" sortBy="#{receipt.receiptIssued}" filterBy="#{receipt.receiptIssued}">
+                                       <h:outputText id="receiptIssued" value="#{receipt.receiptIssued.time}">
+                                               <f:convertDateTime for="receiptIssued" type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_PAYMENT_TYPE}" sortBy="#{receipt.receiptPaymentType}" filterBy="#{receipt.receiptPaymentType}">
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_PAYMENT_TYPES}"
+                                                       onchange="PF('receiptList').filter()"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_PAYMENT_TYPES_TITLE}"
+                                                       >
+                                                       <f:converter converterId="PaymentTypeConverter" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+                                                       <f:selectItems value="#{dataController.paymentTypes}" var="receiptPaymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
+                                               </p:selectOneMenu>
+                                       </f:facet>
+
+                                       <h:outputText value="#{msg[receipt.receiptPaymentType.i18nKey]}" />
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
+                                       <pl:outputReceiptAdminMiniLinks receipt="#{receipt}" />
+                               </p:column>
+                       </p:dataTable>
+               </h:form>
+
+               <h:form>
+                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+                               <h:panelGroup styleClass="table-header" layout="block">
+                                       <h4>
+                                               <h:outputText value="#{project.ADMIN_ADD_RECEIPT_TITLE}" />
+                                       </h4>
+                               </h:panelGroup>
+
+                               <ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
+
+                               <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
+                                       <p:commandButton
+                                               styleClass="reset"
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               styleClass="submit"
+                                               type="submit"
+                                               value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
+                                               action="#{adminReceiptController.addReceipt()}"
+                                               update=":master:form-list-financial-receipt:table-list-financial-receipt"
+                                               />
+                               </p:panelGrid>
+                       </p:panelGrid>
+               </h:form>
+       </ui:define>
+</ui:composition>
diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
new file mode 100644 (file)
index 0000000..78c3fd6
--- /dev/null
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
+                               xmlns="http://www.w3.org/1999/xhtml"
+                               xmlns:core="http://mxchange.org/jsf/core/widgets"
+                               xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
+                               xmlns:links="http://mxchange.org/jsf/core/links"
+                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                               xmlns:h="http://xmlns.jcp.org/jsf/html"
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form-list-financial-receipt-item">
+                       <p:dataTable
+                               id="table-list-financial-receipt-item"
+                               var="receiptItem"
+                               value="#{receiptItemController.allReceiptItems()}"
+                               filteredValue="#{receiptItemController.filteredReceiptItems}"
+                               tableStyleClass="table table-full"
+                               rows="10"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS}"
+                               emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT_ITEM}"
+                               widgetVar="receiptItemList"
+                               >
+
+                               <f:facet name="header">
+                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
+                                               <h:outputText value="#{project.ADMIN_LIST_RECEIPT_ITEMS_HEADER}" />
+
+                                               <h:panelGroup>
+                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
+                                                       <p:columnToggler datasource="table-list-financial-receipt-item" trigger="toggler" />
+                                               </h:panelGroup>
+                                       </p:panelGrid >
+                               </f:facet>
+
+                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
+                                       <p:link outcome="admin_show_receipt_item" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}" value="#{receiptItem.itemId}">
+                                               <f:param name="receiptId" value="#{receiptItem.itemId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{project.ADMIN_ASSIGNED_ITEM_RECEIPT}" sortBy="#{receiptItem.itemReceipt}" filterBy="#{receiptItem.itemReceipt}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{project.LABEL_RECEIPTS}"
+                                                       onchange="PF('receiptItemList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="ReceiptConverter" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItems value="#{receiptController.allReceipts()}" var="receipt" itemValue="#{receipt}" itemLabel="#{beanHelper.renderReceipt(receipt)}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_receipt" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{beanHelper.renderReceipt(receiptItem.itemReceipt)}">
+                                               <f:param name="receiptId" value="#{receiptItem.itemReceipt.receiptId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{project.ADMIN_ASSIGNED_ITEM_PRODUCT}" sortBy="#{receiptItem.itemProduct}" filterBy="#{receiptItem.itemProduct}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{project.LABEL_PRODUCTS}"
+                                                       onchange="PF('receiptItemList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{project.FILTER_BY_MULTIPLE_ITEM_PRODUCTS_TITLE}"
+                                                       >
+                                                       <f:converter converterId="GenericProductConverter" />
+                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                                                       <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_generic_product" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}" value="#{beanHelper.renderGenericProduct(receiptItem.itemProduct)}">
+                                               <f:param name="productId" value="#{receiptItem.itemProduct.productId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column headerText="#{project.ADMIN_HEADER_RECEIPT_ITEM_MANUFACTURER_NAME}" sortBy="#{item.itemManufacturer.companyName}" filterBy="#{item.itemManufacturer}" filterMatchMode="in">
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       label="#{msg.LABEL_COMPANIES}"
+                                                       onchange="PF('itemList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+                                                       >
+                                                       <f:converter converterId="BasicCompanyDataConverter" />
+                                                       <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link
+                                               href="#{item.itemManufacturer.companyWebsiteUrl}"
+                                               target="_blank"
+                                               title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}"
+                                               rel="external"
+                                               rendered="#{not empty item.itemManufacturer.companyWebsiteUrl and not empty item.itemManufacturer.companyName}"
+                                               >
+                                               <h:outputText value="#{item.itemManufacturer.companyName}" />
+                                       </p:link>
+
+                                       <h:outputText value="#{item.itemManufacturer.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty item.itemManufacturer.companyWebsiteUrl and not empty item.itemManufacturer.companyName}" />
+
+                                       <h:outputText value="#{msg.ADMIN_NOT_ASSIGNED}" title="#{project.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}" rendered="#{empty item.itemManufacturer}" />
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{receipt.receiptCreated}" filterable="false">
+                                       <h:outputText id="itemCreated" value="#{receiptItem.itemCreated.time}">
+                                               <f:convertDateTime for="itemCreated" type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
+                                       <pl:outputReceiptItemAdminMiniLinks receiptItem="#{receiptItem}" />
+                               </p:column>
+                       </p:dataTable>
+               </h:form>
+
+               <h:form>
+                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
+                               <h:panelGroup styleClass="table-header" layout="block">
+                                       <h4>
+                                               <h:outputText value="#{project.ADMIN_ADD_RECEIPT_ITEM_TITLE}" />
+                                       </h4>
+                               </h:panelGroup>
+
+                               <ui:include src="/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl" />
+
+                               <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
+                                       <p:commandButton
+                                               styleClass="reset"
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               styleClass="submit"
+                                               type="submit"
+                                               value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
+                                               action="#{adminReceiptItemController.addReceiptItem()}"
+                                               update=":master:form-list-financial-receipt-item:table-list-financial-receipt-item"
+                                               />
+                               </p:panelGrid>
+                       </p:panelGrid>
+               </h:form>
+       </ui:define>
+</ui:composition>
diff --git a/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml
deleted file mode 100644 (file)
index d1708fa..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
-
-       <ui:define name="document_admin_title">
-               <h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
-       </ui:define>
-
-       <ui:define name="content_header">
-               <h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST}" />
-       </ui:define>
-
-       <ui:define name="content">
-               <h:form id="form-list-financial-receipt-item">
-                       <p:dataTable
-                               id="table-list-financial-receipt-item"
-                               var="receiptItem"
-                               value="#{receiptItemController.allReceiptItems()}"
-                               filteredValue="#{receiptItemController.filteredReceiptItems}"
-                               tableStyleClass="table table-full"
-                               rows="10"
-                               paginator="true"
-                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               reflow="true"
-                               resizableColumns="true"
-                               rowsPerPageTemplate="5,10,20,50,100"
-                               sortMode="multiple"
-                               summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS}"
-                               emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT_ITEM}"
-                               widgetVar="receiptItemList"
-                               >
-
-                               <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
-                                               <h:outputText value="#{project.ADMIN_LIST_RECEIPT_ITEMS_HEADER}" />
-
-                                               <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-financial-receipt-item" trigger="toggler" />
-                                               </h:panelGroup>
-                                       </p:panelGrid >
-                               </f:facet>
-
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
-                                       <p:link outcome="admin_show_receipt_item" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}" value="#{receiptItem.itemId}">
-                                               <f:param name="receiptId" value="#{receiptItem.itemId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{project.ADMIN_ASSIGNED_ITEM_RECEIPT}" sortBy="#{receiptItem.itemReceipt}" filterBy="#{receiptItem.itemReceipt}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{project.LABEL_RECEIPTS}"
-                                                       onchange="PF('receiptItemList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}"
-                                                       >
-                                                       <f:converter converterId="ReceiptConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{receiptController.allReceipts()}" var="receipt" itemValue="#{receipt}" itemLabel="#{beanHelper.renderReceipt(receipt)}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <p:link outcome="admin_show_receipt" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receiptItem.itemReceipt.receiptId}">
-                                               <f:param name="receiptId" value="#{receiptItem.itemReceipt.receiptId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{project.ADMIN_ASSIGNED_ITEM_PRODUCT}" sortBy="#{receiptItem.itemProduct}" filterBy="#{receiptItem.itemProduct}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{project.LABEL_PRODUCTS}"
-                                                       onchange="PF('receiptItemList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{project.FILTER_BY_MULTIPLE_ITEM_PRODUCTS_TITLE}"
-                                                       >
-                                                       <f:converter converterId="GenericProductConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{productController.allProducts()}" var="product" itemValue="#{product}" itemLabel="#{beanHelper.renderGenericProduct(product)}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <p:link outcome="admin_show_generic_product" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE}" value="#{receiptItem.itemProduct.productId}">
-                                               <f:param name="productId" value="#{receiptItem.itemProduct.productId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{project.ADMIN_HEADER_RECEIPT_ITEM_MANUFACTURER_NAME}" sortBy="#{item.itemManufacturer.companyName}" filterBy="#{item.itemManufacturer}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_COMPANIES}"
-                                                       onchange="PF('itemList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
-                                                       >
-                                                       <f:converter converterId="BasicCompanyDataConverter" />
-                                                       <f:selectItems value="#{basicCompanyDataController.allBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <h:outputLink value="#{item.itemManufacturer.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty item.itemManufacturer.companyWebsiteUrl}">
-                                               <h:outputText value="#{item.itemManufacturer.companyName}" />
-                                       </h:outputLink>
-
-                                       <h:outputText value="#{item.itemManufacturer.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty item.itemManufacturer.companyWebsiteUrl}" />
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{receipt.receiptCreated}" filterable="false">
-                                       <h:outputText id="itemCreated" value="#{receiptItem.itemCreated.time}">
-                                               <f:convertDateTime for="itemCreated" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
-                                       <pl:outputReceiptItemAdminMiniLinks receiptItem="#{receiptItem}" />
-                               </p:column>
-                       </p:dataTable>
-               </h:form>
-
-               <h:form>
-                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
-                               <h:panelGroup styleClass="table-header" layout="block">
-                                       <h4>
-                                               <h:outputText value="#{project.ADMIN_ADD_RECEIPT_ITEM_TITLE}" />
-                                       </h4>
-                               </h:panelGroup>
-
-                               <ui:include src="/WEB-INF/templates/admin/financial/receipt_item/admin_form_financial_receipt_item.tpl" />
-
-                               <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
-                                       <p:commandButton
-                                               styleClass="reset"
-                                               type="reset"
-                                               value="#{msg.BUTTON_RESET_FORM}"
-                                               />
-
-                                       <p:commandButton
-                                               styleClass="submit"
-                                               type="submit"
-                                               value="#{project.BUTTON_ADMIN_ADD_RECEIPT_TEM}"
-                                               action="#{adminReceiptItemController.addReceiptItem()}"
-                                               update=":master:form-list-financial-receipt-item:table-list-financial-receipt-item"
-                                               />
-                               </p:panelGrid>
-                       </p:panelGrid>
-               </h:form>
-       </ui:define>
-</ui:composition>
diff --git a/web/admin/financial/receipts/admin_receipt_list.xhtml b/web/admin/financial/receipts/admin_receipt_list.xhtml
deleted file mode 100644 (file)
index 9378782..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:core="http://mxchange.org/jsf/core/widgets"
-                               xmlns:pl="http://mxchange.org/jsf/jfinancials/links"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core"
-                               xmlns:p="http://primefaces.org/ui">
-
-       <ui:define name="document_admin_title">
-               <h:outputText value="#{project.PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
-       </ui:define>
-
-       <ui:define name="content_header">
-               <h:outputText value="#{project.CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST}" />
-       </ui:define>
-
-       <ui:define name="content">
-               <h:form id="form-list-financial-receipt">
-                       <p:dataTable
-                               id="table-list-financial-receipt"
-                               var="receipt"
-                               value="#{receiptController.allReceipts()}"
-                               filteredValue="#{receiptController.filteredReceipts}"
-                               tableStyleClass="table table-full"
-                               rows="10"
-                               paginator="true"
-                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
-                               reflow="true"
-                               resizableColumns="true"
-                               rowsPerPageTemplate="5,10,20,50,100"
-                               sortMode="multiple"
-                               summary="#{project.TABLE_SUMMARY_ADMIN_LIST_RECEIPTS}"
-                               emptyMessage="#{project.ADMIN_EMPTY_LIST_RECEIPT}"
-                               widgetVar="receiptList"
-                               >
-                               <f:facet name="header">
-                                       <p:panelGrid columns="2" columnClasses="ui-grid-col-10,ui-grid-col-2" layout="grid" styleClass="ui-noborder ui-transparent-widget">
-                                               <h:outputText value="#{project.ADMIN_LIST_RECEIPTS_HEADER}" />
-
-                                               <h:panelGroup>
-                                                       <p:commandButton id="toggler" type="button" value="#{msg.SELECT_SHOWN_COLUMNS}" styleClass="column-selector" />
-                                                       <p:columnToggler datasource="table-list-financial-receipt" trigger="toggler" />
-                                               </h:panelGroup>
-                                       </p:panelGrid >
-                               </f:facet>
-
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
-                                       <p:link outcome="admin_show_receipt" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receipt.receiptId}">
-                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{receipt.receiptBranchOffice}" filterBy="#{receipt.receiptBranchOffice}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_BRANCH_OFFICES}"
-                                                       onchange="PF('receiptList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_BRANCH_OFFICES_TITLE}"
-                                                       >
-                                                       <f:converter converterId="BranchOfficeConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{branchOfficeController.allBranchOffices()}" var="branchOffice" itemValue="#{branchOffice}" itemLabel="#{beanHelper.renderBranchOffice(branchOffice)}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{receipt.receiptBranchOffice.branchId}">
-                                               <f:param name="branchId" value="#{receipt.receiptBranchOffice.branchId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{project.ADMIN_ASSIGNED_RECEIPT_SELLER}" sortBy="#{receipt.receiptUser.userName}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_RECEIPT_SELLERS}"
-                                                       onchange="PF('receiptList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{project.FILTER_BY_MULTIPLE_RECEIPT_SELLERS_TITLE}"
-                                                       >
-                                                       <f:converter converterId="EmployeeConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{employeeController.allEmployees()}" var="employee" itemValue="#{employee}" itemLabel="#{beanHelper.renderEmployee(employee)}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_OWNER_RECEIPT_SELLER_TITLE}" value="#{receipt.receiptUser.userId}" rendered="#{not empty receipt.receiptUser}">
-                                               <f:param name="userId" value="#{receipt.receiptUser.userId}" />
-                                       </p:link>
-
-                                       <p:link outcome="admin_assign_receipt_user" title="#{msg.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_RECEIPT_SELLER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty receipt.receiptUser}">
-                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{receipt.receiptUser.userName}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_USERS}"
-                                                       onchange="PF('receiptList').filter()"
-                                                       updateLabel="true"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_USERS_TITLE}"
-                                                       >
-                                                       <f:converter converterId="UserConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                                       <f:selectItems value="#{userController.allUsers()}" var="user" itemValue="#{user}" itemLabel="#{user.userName}" />
-                                               </p:selectCheckboxMenu>
-                                       </f:facet>
-
-                                       <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE}" value="#{receipt.receiptUser.userId}" rendered="#{not empty receipt.receiptUser}">
-                                               <f:param name="userId" value="#{receipt.receiptUser.userId}" />
-                                       </p:link>
-
-                                       <p:link outcome="admin_assign_receipt_user" title="#{msg.ADMIN_LINK_ASSIGN_RECEIPT_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty receipt.receiptUser}">
-                                               <f:param name="receiptId" value="#{receipt.receiptId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_DATE_OF_ISSUE}" sortBy="#{receipt.receiptIssued}" filterBy="#{receipt.receiptIssued}">
-                                       <h:outputText id="receiptIssued" value="#{receipt.receiptIssued.time}">
-                                               <f:convertDateTime for="receiptIssued" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_PAYMENT_TYPE}" sortBy="#{receipt.receiptPaymentType}" filterBy="#{receipt.receiptPaymentType}">
-                                       <f:facet name="filter">
-                                               <p:selectOneMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_PAYMENT_TYPES}"
-                                                       onchange="PF('receiptList').filter()"
-                                                       title="#{msg.FILTER_BY_MULTIPLE_PAYMENT_TYPES_TITLE}"
-                                                       >
-                                                       <f:converter converterId="PaymentTypeConverter" />
-                                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
-                                                       <f:selectItems value="#{dataController.paymentTypes}" var="receiptPaymentType" itemValue="#{paymentType}" itemLabel="#{msg[paymentType.i18nKey]}" />
-                                               </p:selectOneMenu>
-                                       </f:facet>
-
-                                       <h:outputText value="#{msg[receipt.receiptPaymentType.i18nKey]}" />
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
-                                       <pl:outputReceiptAdminMiniLinks receipt="#{receipt}" />
-                               </p:column>
-                       </p:dataTable>
-               </h:form>
-
-               <h:form>
-                       <p:panelGrid layout="grid" columns="1" styleClass="table table-full">
-                               <h:panelGroup styleClass="table-header" layout="block">
-                                       <h4>
-                                               <h:outputText value="#{project.ADMIN_ADD_RECEIPT_TITLE}" />
-                                       </h4>
-                               </h:panelGroup>
-
-                               <ui:include src="/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl" />
-
-                               <p:panelGrid columns="2" styleClass="table-footer" layout="grid">
-                                       <p:commandButton
-                                               styleClass="reset"
-                                               type="reset"
-                                               value="#{msg.BUTTON_RESET_FORM}"
-                                               />
-
-                                       <p:commandButton
-                                               styleClass="submit"
-                                               type="submit"
-                                               value="#{project.BUTTON_ADMIN_ADD_RECEIPT}"
-                                               action="#{adminReceiptController.addReceipt()}"
-                                               update=":master:form-list-financial-receipt:table-list-financial-receipt"
-                                               />
-                               </p:panelGrid>
-                       </p:panelGrid>
-               </h:form>
-       </ui:define>
-</ui:composition>