From 35e102b858b3f3beb09658369582e7a4c5c312a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 28 Oct 2017 18:38:14 +0200 Subject: [PATCH] Don't cherry-pick: - renamed namespace from widgets to core as also other custom widgets (JSF tags) may come MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...nancialAdminReceiptItemWebRequestBean.java | 92 +++++++++++++++++++ .../localization/project_de_DE.properties | 1 + .../localization/project_en_US.properties | 1 + .../receipt/admin_form_financial_receipt.tpl | 2 +- .../admin_form_financial_receipt_item.tpl | 5 +- .../receipt/login_form_financial_receipt.tpl | 2 +- .../admin_receipt_item_list.xhtml | 2 +- .../receipts/admin_receipt_list.xhtml | 2 +- 8 files changed, 102 insertions(+), 5 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java index a71396e3..3d21e850 100644 --- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/FinancialAdminReceiptItemWebRequestBean.java @@ -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 + *

+ * @return Product's currency symbol + */ + public String getProductCurrencyCode () { + return this.productCurrencyCode; + } + + /** + * Setter for product's currency symbol + *

+ * @param productCurrencyCode Product's currency symbol + */ + public void setProductCurrencyCode (final String productCurrencyCode) { + this.productCurrencyCode = productCurrencyCode; + } + + /** + * Getter for product's gross price + *

+ * @return Product's gross price + */ + public Float getProductGrossPrice () { + return this.productGrossPrice; + } + + /** + * Setter for product's gross price + *

+ * @param productGrossPrice Product's gross price + */ + public void setProductGrossPrice (final Float productGrossPrice) { + this.productGrossPrice = productGrossPrice; + } + + /** + * Getter for product's net price + *

+ * @return Product's net price + */ + public Float getProductNetPrice () { + return this.productNetPrice; + } + + /** + * Setter for product's net price + *

+ * @param productNetPrice Product's net price + */ + public void setProductNetPrice (final Float productNetPrice) { + this.productNetPrice = productNetPrice; + } + + /** + * Getter for product's tax rate + *

+ * @return Product's tax rate + */ + public Float getProductTaxRate () { + return this.productTaxRate; + } + + /** + * Setter for product's tax rate + *

+ * @param productTaxRate Product's tax rate + */ + public void setProductTaxRate (final Float productTaxRate) { + this.productTaxRate = productTaxRate; + } + /** * Clears this bean */ diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index a35ed504..b7961692 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -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. diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index 7f80ad92..302118f4 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -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. diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl index ef9329fd..b07db952 100644 --- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl +++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl @@ -1,7 +1,7 @@ + + + diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl index 980ccbcd..67ee3e43 100644 --- a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl +++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl @@ -1,7 +1,7 @@