]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 28 Oct 2017 22:51:00 +0000 (00:51 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 28 Oct 2017 22:51:00 +0000 (00:51 +0200)
- moved out comment above ui:composition to not cause another ui-row being added
- itemReceipt is a required field, marked it so in JSF view
- form for adding receipt items is "basicaly finished"
- there are now percentage and fixed discounts as some receipts has shown
- added/renamed i18n strings
- renamed 'financials' to 'financial'

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.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/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_items/admin_receipt_item_list.xhtml [new file with mode: 0644]
web/admin/financial/receipts/admin_receipt_list.xhtml [new file with mode: 0644]
web/admin/financials/receipt_items/admin_receipt_item_list.xhtml [deleted file]
web/admin/financials/receipts/admin_receipt_list.xhtml [deleted file]

index 3d21e850d2ba4d6fa5d70ac3b60fbe939ada792a..34329211c8cb9cbc08197dc355f3afa27e81a77c 100644 (file)
@@ -62,9 +62,15 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
        private FinancialAdminReceiptItemSessionBeanRemote adminReceiptItemBean;
 
        /**
-        * Discount on product price (if any) Valid: values 0...1 (1=100% discount)
+        * Fixed discount on product price (if any)
         */
-       private Float itemDiscount;
+       private Float itemDiscountFixed;
+
+       /**
+        * Percentage discount on product price (if any) Valid: values 0...1 (1=100%
+        * discount)
+        */
+       private Float itemDiscountPercent;
 
        /**
         * Item product
@@ -157,21 +163,39 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
        }
 
        /**
-        * Getter for item discount
+        * Getter for item discount (fixed)
+        * <p>
+        * @return Item discount (fixed)
+        */
+       public Float getItemDiscountFixed () {
+               return this.itemDiscountFixed;
+       }
+
+       /**
+        * Setter for item discount (fixed)
+        * <p>
+        * @param itemDiscountFixed Item discount (fixed)
+        */
+       public void setItemDiscountFixed (final Float itemDiscountFixed) {
+               this.itemDiscountFixed = itemDiscountFixed;
+       }
+
+       /**
+        * Getter for item discount (percent)
         * <p>
-        * @return Item discount
+        * @return Item discount (percent)
         */
-       public Float getItemDiscount () {
-               return this.itemDiscount;
+       public Float getItemDiscountPercent () {
+               return this.itemDiscountPercent;
        }
 
        /**
-        * Setter for item discount
+        * Setter for item discount (percent)
         * <p>
-        * @param itemDiscount Item discount
+        * @param itemDiscountPercent Item discount (percent)
         */
-       public void setItemDiscount (final Float itemDiscount) {
-               this.itemDiscount = itemDiscount;
+       public void setItemDiscountPercent (final Float itemDiscountPercent) {
+               this.itemDiscountPercent = itemDiscountPercent;
        }
 
        /**
@@ -305,7 +329,8 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
         */
        private void clear () {
                // Clear all fields
-               this.setItemDiscount(null);
+               this.setItemDiscountFixed(null);
+               this.setItemDiscountPercent(null);
                this.setItemProduct(null);
                this.setItemQuantity(null);
                this.setItemReceipt(null);
@@ -321,7 +346,8 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
                final BillableReceiptItem receiptItem = new FinancialReceiptItem(this.getItemProduct(), this.getItemQuantity(), this.getItemReceipt());
 
                // Set optional data
-               receiptItem.setItemProductDiscount(this.getItemDiscount());
+               receiptItem.setItemDiscountFixed(this.getItemDiscountFixed());
+               receiptItem.setItemDiscountPercent(this.getItemDiscountPercent());
 
                // Return prepared instance
                return receiptItem;
index b79616928152f700b32c9afae1871e015533e47e..5f498c6e253525eb7363d9014be70625b25c573f 100644 (file)
@@ -38,8 +38,8 @@ LOGIN_FINANCIAL_INCOME_TITLE=Bezeichnung der Einkommensart:
 FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Feld "Title" muss ausgefuellt werden.
 LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUE_DATE_TITLE=Geben oder suchen Sie hier das genaue Datum aus, wann die Rechnung/der Kassenbon erstellt wurde. Dadurch kann ein genauer Zeitverlauf generiert werden.
 PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Kassenbons auflisten
-CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Listet Kassenbons auf:
-TABLE_SUMMARY_ADMIN_LIST_RECEIPTS=Diese Tabelle listet bereits registrierte Kassenbons auf.
+CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Kassenbons auflisten:
+TABLE_SUMMARY_ADMIN_LIST_RECEIPTS=Diese Tabelle listet alle eingetragenen Kassenbons auf.
 #@TODO Please fix German umlauts!
 ADMIN_EMPTY_LIST_RECEIPT=Es befinden sich keine Kassenbons in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
 #@TODO Please fix German umlauts!
@@ -52,7 +52,7 @@ ADMIN_LINK_LIST_RECEIPTS_TITLE=Listet alle registrierten Kassenbons/Rechnungen a
 ADMIN_LINK_LIST_RECEIPTS=Kassenbons/Rechnungen auflisten
 ADMIN_LIST_RECEIPTS_HEADER=Alle Kassenbons/Rechnungen auflisten
 ADMIN_RECEIPT_BASIC_LEGEND=Grunddaten des Kassenbons
-ADMIN_RECEIPT_BASIC_LEGEND_TITLE=Geben Sie hier die Grunddaten des neuen Kassenbons einn.
+ADMIN_RECEIPT_BASIC_LEGEND_TITLE=Geben Sie hier die Grunddaten des neuen Kassenbons ein.
 ENTER_RECEIPT_ISSUE_DATE=Ausstellungsdatum des Kassenbons eingeben:
 ENTER_RECEIPT_NUMBER=Rechnungsnummer eingeben:
 ENTERED_RECEIPT_NUMBER_INVALID=Die eingegebene Bonnummer/Rechnungsnummer ist kleiner 1 oder groesser 9999999999.
@@ -71,4 +71,48 @@ ADMIN_LINK_LIST_RECEIPT_ITEMS=Eintraege auflisten
 ADMIN_LINK_LIST_RECEIPT_ITEMS_TITLE=Listet alle Eintraege aller Kassenbons auf.
 ADMIN_LINK_SHOW_RECEIPT_TITLE=Zeigt Daten des Kassenbons an.
 ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE=Zeigt Daten eines Eintrages eines Kassenbons an.
-ADMIN_PRODUCT_GROSS_PRICE_REQUIRED=Bitte geben Sie den Bruttopreis des Produktes ein.
+#@TODO Please fix German umlauts!
+PRODUCT_GROSS_PRICE_REQUIRED=Bitte geben Sie den Bruttopreis des Produktes ein.
+#@TODO Please fix German umlauts!
+ENTER_PRODUCT_NET_PRICE_TITLE=Nettopreis fuer Produkt eingeben:
+#@TODO Please fix German umlauts!
+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:
+ENTER_NET_PRICE=Nettopreis:
+ENTER_TAX_RATE=Steuersatz:
+ENTER_GROSS_PRICE=Bruttopreis:
+#@TODO Please fix German umlauts!
+SELECT_RECEIPT_ITEM_PRODUCT=Produkt zum Kassenboneintrag auswaehlen:
+ENTER_RECEIPT_ITEM_QUANTITY=Stueckzahl eingeben:
+ENTER_RECEIPT_ITEM_DISCOUNT_PERCENT=Prozentualen Nachlass eingeben:
+ENTER_RECEIPT_ITEM_DISCOUNT_PERCENT_TITLE=Geben Sie hier den prozentualen Nachlass vom Kassenbon ein. Bitte leer lassen, falls keiner gegeben ist.
+ENTER_RECEIPT_ITEM_DISCOUNT_FIXED=Festen Nachlass eingeben:
+ENTER_RECEIPT_ITEM_DISCOUNT_FIXED_TITLE=Geben Sie den festen Nachlass vom Kassenbon ein. Bitte leer lassen, falls keiner gegeben ist.
+#@TODO Please fix German umlauts!
+PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=Kassenboneintraege auflisten
+#@TODO Please fix German umlauts!
+CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=Kassenboneintraege auflisten:
+TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS=Diese Tabelle listet alle eingetragenen Kassenboneintraege auf.
+#@TODO Please fix German umlauts!
+ADMIN_EMPTY_LIST_RECEIPT_ITEM=Es befinden sich keine Kassenboneintraege in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen.
+#@TODO Please fix German umlauts!
+ADMIN_LIST_RECEIPT_ITEMS_HEADER=Alle Kassenboneintraege auflisten
+ADMIN_ASSIGNED_ITEM_RECEIPT=Zugewiesener Kassenbon:
+ADMIN_ASSIGNED_ITEM_PRODUCT=Zugewiesenes Produkt:
+#@TODO Please fix German umlauts!
+ADMIN_ADD_RECEIPT_ITEM_TITLE=Neues Kassenboneintrag hinzufuegen
+ADMIN_RECEIPT_ITEM_LEGEND=Daten des Kassenboneintrages:
+ADMIN_RECEIPT_ITEM_BASIC_LEGEND_TITLE=Geben Sie hier die Daten des neuen Kassenboneintrages ein.
+SELECT_ITEM_RECEIPT=Kassenbon auswaehlen:
+#@TODO Please fix German umlauts!
+BUTTON_ADMIN_ADD_RECEIPT_TEM=Kassenboneintrag hinzufuegen
+LABEL_RECEIPTS=Kassenbons
+LABEL_PRODUCTS=Produkte
+#@TODO Please fix German umlauts!
+ADMIN_PRODUCT_REQUIRED=Bitte waehlen Sie ein Produkt aus.
+#@TODO Please fix German umlauts!
+ADMIN_RECEIPT_REQUIRED=Bitte waehlen Sie einen Kassenbon aus.
+ADMIN_RECEIPT_ITEM_QUANTITY_REQUIRED=Bitte geben Sie die gekaufte Produktmenge ein.
+ENTER_RECEIPT_ITEM_QUANTITY_TITLE=Geben Sie hier die Stueckanzahl an, wie sie auf dem Kassenbon steht.
index 302118f400fb98cbbc9d3e82faa610f43faf5dd1..5ca04273c1ceb7836237efdb8c190838d2c0bd73 100644 (file)
@@ -30,7 +30,7 @@ FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Field "Title" must be filled out.
 LOGIN_FINANCIAL_ENTER_RECEIPT_ISSUE_DATE_TITLE=Please enter or select here the exact date when the receipt has been issue. Then an exact time-line can be generated.
 PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=List receipts
 CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_LIST=Lists receipts:
-TABLE_SUMMARY_ADMIN_LIST_RECEIPTS=This table lists already registered receipts.
+TABLE_SUMMARY_ADMIN_LIST_RECEIPTS=This table lists all registered receipts.
 ADMIN_EMPTY_LIST_RECEIPT=There are no receipts in database. Or your search criteria doesn't match anything.
 ADMIN_ADD_RECEIPT_TITLE=Add new receipt
 BUTTON_ADMIN_ADD_RECEIPT=Add receipt
@@ -56,4 +56,35 @@ ADMIN_LINK_LIST_RECEIPT_ITEMS=List receipt items
 ADMIN_LINK_LIST_RECEIPT_ITEMS_TITLE=Lists all receipt items.
 ADMIN_LINK_SHOW_RECEIPT_TITLE=Shows receipt data.
 ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE=Shows receipt item data.
-ADMIN_PRODUCT_GROSS_PRICE_REQUIRED=Please enter product's gross price.
+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:
+ENTER_NET_PRICE=Net price:
+ENTER_TAX_RATE=Tax rate:
+ENTER_GROSS_PRICE=Gross price:
+SELECT_RECEIPT_ITEM_PRODUCT=Choose product for receipt item:
+ENTER_RECEIPT_ITEM_QUANTITY=Enter receipt item quantity:
+ENTER_RECEIPT_ITEM_DISCOUNT_PERCENT=Enter percentage discount:
+ENTER_RECEIPT_ITEM_DISCOUNT_PERCENT_TITLE=Enter here a percentage discount to the receipt's item. Leave empty if none is provided.
+ENTER_RECEIPT_ITEM_DISCOUNT_FIXED=Enter fixed discount:
+ENTER_RECEIPT_ITEM_DISCOUNT_FIXED_TITLE=Enter here a fixed discount to the receipt's item. Leave empty if none is provided.
+PAGE_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=List receipt items
+CONTENT_TITLE_ADMIN_FINANCIALS_RECEIPT_ITEM_LIST=List receipt items:
+TABLE_SUMMARY_ADMIN_LIST_RECEIPT_ITEMS=This table lists all registered receipt items.
+ADMIN_EMPTY_LIST_RECEIPT_ITEM=There are no receipt items in database. Or your search criteria doesn't match anything.
+ADMIN_LIST_RECEIPT_ITEMS_HEADER=List all receipt items
+ADMIN_ASSIGNED_ITEM_RECEIPT=Assigned item's receipt:
+ADMIN_ASSIGNED_ITEM_PRODUCT=Assigned product:
+ADMIN_ADD_RECEIPT_ITEM_TITLE=Add new receipt item
+ADMIN_RECEIPT_ITEM_LEGEND=Data of receipt item:
+ADMIN_RECEIPT_ITEM_BASIC_LEGEND_TITLE=Enter here data of the new receipt item.
+SELECT_ITEM_RECEIPT=Choose receipt:
+BUTTON_ADMIN_ADD_RECEIPT_TEM=Add receipt item
+LABEL_RECEIPTS=Receipts
+LABEL_PRODUCTS=Products
+ADMIN_PRODUCT_REQUIRED=Please choose a product.
+ADMIN_RECEIPT_REQUIRED=Please choose a receipt.
+ADMIN_RECEIPT_ITEM_QUANTITY_REQUIRED=Please enter product quantity.
+ENTER_RECEIPT_ITEM_QUANTITY_TITLE=Enter here the amount of the choosen product that is shown on the receipt.
index 5e4b319ef4b11566f1a3991630adfcb301e1545d..cab11327cdee1243b5cc290b3a2ab631feb9d5c3 100644 (file)
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_receipts</from-outcome>
-                       <to-view-id>/admin/financials/receipts/admin_receipt_list.xhtml</to-view-id>
+                       <to-view-id>/admin/financial/receipts/admin_receipt_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_receipt_items</from-outcome>
-                       <to-view-id>/admin/financials/receipt_items/admin_receipt_item_list.xhtml</to-view-id>
+                       <to-view-id>/admin/financial/receipt_items/admin_receipt_item_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
index b07db952655392124378cb6d20d9989317a112c5..72c5341baaac9b445c70b53829b1f2e904c66a43 100644 (file)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{project.ADMIN_RECEIPT_BASIC_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <!--
-       @TODO: title="#{project.ADMIN_RECEIPT_BASIC_LEGEND_TITLE}"
-       -->
        <p:fieldset legend="#{project.ADMIN_RECEIPT_BASIC_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="branchOffice" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE}" />
                        <p:selectOneMenu
                                id="branchOffice"
@@ -83,7 +81,7 @@
                <!--
                @TODO: title="#{project.ADMIN_RECEIPT_OTHER_LEGEND_TITLE}">
                -->
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
                        <p:outputLabel for="receiptNumber" value="#{project.ENTER_RECEIPT_NUMBER}" />
                        <p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{adminReceiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="9999999999" />
index 68b2efb1fe59ebc23a4ffd5388d1970677ee48b5..9b7486c3910ac2a0b9f79ebd9a708b54401efad3 100644 (file)
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO: title="#{project.ADMIN_RECEIPT_ITEM_LEGEND_TITLE}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:product="http://mxchange.org/jsf/jproduct/widgets"
@@ -7,12 +10,9 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:p="http://primefaces.org/ui">
 
-       <!--
-       @TODO: title="#{project.ADMIN_RECEIPT_ITEM_BASIC_LEGEND_TITLE}"
-       -->
-       <p:fieldset legend="#{project.ADMIN_RECEIPT_ITEM_BASIC_LEGEND}">
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full ui-noborder">
-                       <p:outputLabel for="itemProduct" value="#{project.ADMIN_SELECT_PRODUCT}" />
+       <p:fieldset legend="#{project.ADMIN_RECEIPT_ITEM_LEGEND}">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full ui-noborder">
+                       <p:outputLabel for="itemProduct" value="#{project.SELECT_RECEIPT_ITEM_PRODUCT}" />
                        <p:selectOneMenu
                                id="itemProduct"
                                value="#{adminReceiptItemController.itemProduct}"
                                id="itemQuantity"
                                value="#{adminReceiptItemController.itemQuantity}"
                                required="true"
-                               requiredMessage="#{project.ADMIN_RECEIPT_QUANTITY_REQUIRED}"
-                               title="#{project.ADMIN_RECEIPT_ITEM_QUANTITY_TITLE}"
+                               requiredMessage="#{project.ADMIN_RECEIPT_ITEM_QUANTITY_REQUIRED}"
+                               title="#{project.ENTER_RECEIPT_ITEM_QUANTITY_TITLE}"
                                />
 
-                       <p:outputLabel for="itemDiscount" value="#{project.ENTER_RECEIPT_ITEM_DISCOUNT}" />
+                       <p:outputLabel for="itemDiscountPercent" value="#{project.ENTER_RECEIPT_ITEM_DISCOUNT_PERCENT}" />
                        <p:inputNumber
-                               id="itemDiscount"
-                               value="#{adminReceiptItemController.itemDiscount}"
-                               title="#{project.ADMIN_RECEIPT_ITEM_DISCOUNT_TITLE}"
+                               id="itemDiscountPercent"
+                               value="#{adminReceiptItemController.itemDiscountPercent}"
+                               title="#{project.ENTER_RECEIPT_ITEM_DISCOUNT_PERCENT_TITLE}"
                                />
 
-                       <p:outputLabel for="itemReceipt" value="#{project.ADMIN_SELECT_ITEM_RECEIPT}" />
+                       <p:outputLabel for="itemDiscountFixed" value="#{project.ENTER_RECEIPT_ITEM_DISCOUNT_FIXED}" />
+                       <p:inputNumber
+                               id="itemDiscountFixed"
+                               value="#{adminReceiptItemController.itemDiscountPercent}"
+                               title="#{project.ENTER_RECEIPT_ITEM_DISCOUNT_FIXED_TITLE}"
+                               />
+
+                       <p:outputLabel for="itemReceipt" value="#{project.SELECT_ITEM_RECEIPT}" />
                        <p:selectOneMenu
                                id="itemReceipt"
                                value="#{adminReceiptItemController.itemReceipt}"
                                filter="true"
                                filterMatchMode="contains"
+                               required="true"
+                               requiredMessage="#{project.ADMIN_RECEIPT_REQUIRED}"
                                >
                                <f:converter converterId="ReceiptConverter" />
-                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
+                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
                                <f:selectItems value="#{receiptController.allReceipts()}" var="receipt" itemValue="#{receipt}" itemLabel="#{beanHelper.renderReceipt(receipt)}" />
                        </p:selectOneMenu>
 
-                       <p:outputLabel for="itemGrossPrice" value="#{project.ADMIN_ENTER_PRODUCT_GROSS_PRICE}" />
+                       <p:outputLabel value="#{project.ADMIN_ENTER_PRODUCT_PRICE}" />
                        <product:inputProductPricePanelGrid targetController="#{adminReceiptItemController}" />
                </p:panelGrid>
        </p:fieldset>
index 67ee3e436e81f57eabb94c5051458770227026fc..d2d12b0e7c2e8517218c3d10a87c958674538751 100644 (file)
@@ -12,7 +12,7 @@
                        <h:outputText value="#{project.LOGIN_RECEIPT_BASIC_LEGEND}" />
                </legend>
 
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full">
                        <p:outputLabel for="branchOffice" value="#{project.LOGIN_SELECT_BRANCH_OFFICE}" />
                        <p:selectOneMenu
                                id="branchOffice"
@@ -77,7 +77,7 @@
                        <h:outputText value="#{project.LOGIN_RECEIPT_OTHER_LEGEND}" />
                </legend>
 
-               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4, ui-grid-col-8" styleClass="table table-full">
+               <p:panelGrid layout="grid" columns="2" columnClasses="ui-grid-col-4,ui-grid-col-8" styleClass="table table-full">
                        <p:outputLabel for="receiptNumber" value="#{project.RECEIPT_NUMBER}" />
                        <p:inputText styleClass="input" id="receiptNumber" size="10" maxlength="20" value="#{receiptController.receiptNumber}" validatorMessage="#{msg.ENTERED_RECEIPT_NUMBER_INVALID}">
                                <f:validateLongRange minimum="1" maximum="9999999999" />
diff --git a/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_items/admin_receipt_item_list.xhtml
new file mode 100644 (file)
index 0000000..71c0cb7
--- /dev/null
@@ -0,0 +1,139 @@
+<?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_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.renderProduct(product)}" />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link outcome="admin_show_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="#{msg.ADMIN_LIST_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_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
new file mode 100644 (file)
index 0000000..f847ef8
--- /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_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_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_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/financials/receipt_items/admin_receipt_item_list.xhtml b/web/admin/financials/receipt_items/admin_receipt_item_list.xhtml
deleted file mode 100644 (file)
index c6dd925..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_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_ITEMSS}"
-                               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_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="#{msg.ADMIN_ASSIGNED_BRANCH_OFFICE}" sortBy="#{receiptItem.itemBranchOffice}" filterBy="#{receiptItem.itemBranchOffice}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_BRANCH_OFFICES}"
-                                                       onchange="PF('receiptItemList').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="#{receiptItem.itemBranchOffice.branchId}">
-                                               <f:param name="branchId" value="#{receiptItem.itemBranchOffice.branchId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{project.ADMIN_ASSIGNED_RECEIPT_SELLER}" sortBy="#{receiptItem.itemUser.userName}" filterBy="#{receiptItem.itemUser}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_RECEIPT_SELLERS}"
-                                                       onchange="PF('receiptItemList').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="#{receiptItem.itemUser.userId}" rendered="#{not empty receiptItem.itemUser}">
-                                               <f:param name="userId" value="#{receiptItem.itemUser.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 receiptItem.itemUser}">
-                                               <f:param name="receiptId" value="#{receiptItem.itemId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER}" sortBy="#{receiptItem.itemUser.userName}" filterBy="#{receiptItem.itemUser}" filterMatchMode="in">
-                                       <f:facet name="filter">
-                                               <p:selectCheckboxMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_USERS}"
-                                                       onchange="PF('receiptItemList').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="#{receiptItem.itemUser.userId}" rendered="#{not empty receiptItem.itemUser}">
-                                               <f:param name="userId" value="#{receiptItem.itemUser.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 receiptItem.itemUser}">
-                                               <f:param name="receiptId" value="#{receiptItem.itemId}" />
-                                       </p:link>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_DATE_OF_ISSUE}" sortBy="#{receiptItem.itemIssued}" filterBy="#{receiptItem.itemIssued}">
-                                       <h:outputText id="receiptIssued" value="#{receiptItem.itemIssued.time}">
-                                               <f:convertDateTime for="receiptIssued" type="both" timeStyle="short" dateStyle="short" />
-                                       </h:outputText>
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_PAYMENT_TYPE}" sortBy="#{receiptItem.itemPaymentType}" filterBy="#{receiptItem.itemPaymentType}">
-                                       <f:facet name="filter">
-                                               <p:selectOneMenu
-                                                       filter="true"
-                                                       filterMatchMode="contains"
-                                                       label="#{msg.LABEL_PAYMENT_TYPES}"
-                                                       onchange="PF('receiptItemList').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[receiptItem.itemPaymentType.i18nKey]}" />
-                               </p:column>
-
-                               <p:column headerText="#{msg.ADMIN_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/financials/receipts/admin_receipt_list.xhtml b/web/admin/financials/receipts/admin_receipt_list.xhtml
deleted file mode 100644 (file)
index 46ba913..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_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_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_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>