]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Don't cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 28 Oct 2017 16:38:14 +0000 (18:38 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 28 Oct 2017 16:38:14 +0000 (18:38 +0200)
- renamed namespace from widgets to core as also other custom widgets (JSF tags)
  may come

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/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/financials/receipt_items/admin_receipt_item_list.xhtml
web/admin/financials/receipts/admin_receipt_list.xhtml

index a71396e3595c8225494868439c45a5722b5bc878..3d21e850d2ba4d6fa5d70ac3b60fbe939ada792a 100644 (file)
@@ -81,6 +81,26 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
         */
        private BillableReceipt itemReceipt;
 
+       /**
+        * Currency code like EUR or USD
+        */
+       private String productCurrencyCode;
+
+       /**
+        * Product's gross price
+        */
+       private Float productGrossPrice;
+
+       /**
+        * Product's net price
+        */
+       private Float productNetPrice;
+
+       /**
+        * Tax rate for this item
+        */
+       private Float productTaxRate;
+
        /**
         * General receipt item controller
         */
@@ -208,6 +228,78 @@ public class FinancialAdminReceiptItemWebRequestBean extends BaseFinancialsBean
                this.itemReceipt = itemReceipt;
        }
 
+       /**
+        * Getter for product's currency symbol
+        * <p>
+        * @return Product's currency symbol
+        */
+       public String getProductCurrencyCode () {
+               return this.productCurrencyCode;
+       }
+
+       /**
+        * Setter for product's currency symbol
+        * <p>
+        * @param productCurrencyCode Product's currency symbol
+        */
+       public void setProductCurrencyCode (final String productCurrencyCode) {
+               this.productCurrencyCode = productCurrencyCode;
+       }
+
+       /**
+        * Getter for product's gross price
+        * <p>
+        * @return Product's gross price
+        */
+       public Float getProductGrossPrice () {
+               return this.productGrossPrice;
+       }
+
+       /**
+        * Setter for product's gross price
+        * <p>
+        * @param productGrossPrice Product's gross price
+        */
+       public void setProductGrossPrice (final Float productGrossPrice) {
+               this.productGrossPrice = productGrossPrice;
+       }
+
+       /**
+        * Getter for product's net price
+        * <p>
+        * @return Product's net price
+        */
+       public Float getProductNetPrice () {
+               return this.productNetPrice;
+       }
+
+       /**
+        * Setter for product's net price
+        * <p>
+        * @param productNetPrice Product's net price
+        */
+       public void setProductNetPrice (final Float productNetPrice) {
+               this.productNetPrice = productNetPrice;
+       }
+
+       /**
+        * Getter for product's tax rate
+        * <p>
+        * @return Product's tax rate
+        */
+       public Float getProductTaxRate () {
+               return this.productTaxRate;
+       }
+
+       /**
+        * Setter for product's tax rate
+        * <p>
+        * @param productTaxRate Product's tax rate
+        */
+       public void setProductTaxRate (final Float productTaxRate) {
+               this.productTaxRate = productTaxRate;
+       }
+
        /**
         * Clears this bean
         */
index a35ed504b43993b990a654ce048b957e11178242..b79616928152f700b32c9afae1871e015533e47e 100644 (file)
@@ -71,3 +71,4 @@ 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.
index 7f80ad9238b58cb751ba725a9fc4f16ff8d48f29..302118f400fb98cbbc9d3e82faa610f43faf5dd1 100644 (file)
@@ -56,3 +56,4 @@ 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.
index ef9329fd1c5baade15dc27d8664d8b7e55c713ed..b07db952655392124378cb6d20d9989317a112c5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       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"
index 3eb3010176b3db04ddaf71b7106ccb24cf63f1b7..68b2efb1fe59ebc23a4ffd5388d1970677ee48b5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:product="http://mxchange.org/jsf/jproduct/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"
@@ -53,6 +53,9 @@
                                <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                <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}" />
+                       <product:inputProductPricePanelGrid targetController="#{adminReceiptItemController}" />
                </p:panelGrid>
        </p:fieldset>
 </ui:composition>
index 980ccbcdd9a495c9cbe2d6128c591baffc2b1c66..67ee3e436e81f57eabb94c5051458770227026fc 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       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"
index fc88a1ccaa5bd7359ece538daf3b26459cdd2e1e..c6dd925e5c6616d19bc0d0ad688883c8d7fbccba 100644 (file)
@@ -1,7 +1,7 @@
 <?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:widgets="http://mxchange.org/jsf/core/widgets"
+                               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"
index 85d03110bae6b8300482d94144ede942347ab8af..46ba913cd5f6d2f2b81d34bb2359beb92ec9d244 100644 (file)
@@ -1,7 +1,7 @@
 <?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:widgets="http://mxchange.org/jsf/core/widgets"
+                               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"