From: Roland Häder Date: Mon, 14 May 2018 23:03:34 +0000 (+0200) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f23667bfe980bdac13bd651333f5de24fa5a5690;p=jfinancials-war.git Don't cherry-pick: - added helper bean for fiancial beans, renderReceipt() was moved here - need to have > of in own line to avoid editing 2 lines when adding an another XML namespace - wrapped all (?) long JSF/PF tags to have their attributes in separates lines - using no longer tableStyleClass attribute - continued with single receipt item p:dialog (all fields exposed there) - position of it set to "top" - oh, no more columnClasses="label,value" ... ;-) - also no more styleClass="submit|reset" (themed) - added process="@form" as a workaround for an exception (BalusC said this) Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java new file mode 100644 index 00000000..acca0d62 --- /dev/null +++ b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2016 - 2018 Free Software Foundation + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.jfinancials.beans.helper.receipt; + +import java.text.DateFormat; +import javax.faces.view.ViewScoped; +import javax.inject.Named; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jfinancials.model.receipt.BillableReceipt; + +/** + * A receipt helper for beans + *

+ * @author Roland Häder + */ +@Named ("receiptBeanHelper") +@ViewScoped +public class FinancialsWebViewReceiptHelperBean extends BaseFinancialsBean implements FinancialsWebViewReceiptHelperController { + + /** + * Serial number + */ + private static final long serialVersionUID = 17_258_793_567_145_811L; + + /** + * Default constructor + */ + public FinancialsWebViewReceiptHelperBean () { + // Call super constructor + super(); + } + + /** + * Returns the receipt number and more. If null is provided, an empty string is returned. + *

+ * @param receipt Receipt instance + *

+ * @return Receipt number and more + */ + public String renderReceipt (final BillableReceipt receipt) { + // Default is empty string, so let's get started + 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? + if (receipt.getReceiptNumber() != null) { + // Append it + sb.append(", ").append(this.getMessageFromBundle("RECEIPT_NUMBER")).append(" "); //NOI18N + sb.append(receipt.getReceiptNumber()); + } + + // Add company (over branch office) + sb.append(" ("); //NOI18N + sb.append(receipt.getReceiptBranchOffice().getBranchCompany().getCompanyName()); + sb.append(")"); //NOI18N + } + + // Return it + return sb.toString(); + } + +} diff --git a/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperController.java b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperController.java new file mode 100644 index 00000000..7bdf9f1f --- /dev/null +++ b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperController.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2016 - 2018 Free Software Foundation + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.jfinancials.beans.helper.receipt; + +import java.io.Serializable; + +/** + * An interface for receipt bean helper + *

+ * @author Roland Häder + */ +public interface FinancialsWebViewReceiptHelperController extends Serializable { + +} diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index adaec546..b0531713 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -133,7 +133,6 @@ ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Aendert Daten der Produktkategorie ab. #@TODO Please fix German umlauts! ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Loescht die Produktkategorie aus der Datenbank. -ADMIN_PRODUCT_GROSS_PRICE_HEADER=Bruttopreis: #@TODO Please fix German umlauts! PRODUCT_AVAILABILITY_HEADER=Produkt verfuegbar: #@TODO Please fix German umlauts! @@ -199,14 +198,14 @@ ADMIN_ENTERED_PRODUCT_I18N_KEY_ALREADY_ADDED=Der von Ihnen eingegebene Uebersetz ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY=Uebersetzungschluessel der Einheit fuer Stueckzahl eingeben: #@TODO Please fix German umlauts! 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: +ADMIN_ASSIGN_PRODUCT_MANUFACTURER=Hersteller 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. #@TODO Please fix German umlauts! SELECT_RECEIPT_ITEM_MANUFACTURER=Hersteller zum Kassenboneintrah auswaehlen: ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER=Hersteller des Boneintrages: -ENTER_RECEIPT_ITEM_BRAND_NAME=Warenzeichen/Marke eingeben: -ENTER_RECEIPT_ITEM_BRAND_NAME_TITLE=Geben Sie das Warenzeichen ein, dass Sie auf dem Kassenbon finden. +ENTER_RAND_NAME=Warenzeichen/Marke eingeben: +ENTER_RAND_NAME_TITLE=Geben Sie das Warenzeichen ein, dass Sie auf dem Kassenbon finden. #@TODO Please fix German umlauts! ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Bitte geben Sie den Waehrungscode fuer das Produkt ein. Beispiele: EUR, USD, PHP #@TODO Please fix German umlauts! @@ -222,11 +221,11 @@ ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Geben Sie die Nummer des Produktes ein. ENTER_RECEIPT_ITEM_NUMBER=Artikelnumber: ENTER_RECEIPT_ITEM_NUMBER_TITLE=Geben Sie die Artikelnummer vom Kassenbon ein. #@TODO Please fix German umlauts! -CHOOSE_RECEIPT_ITEM_IS_A_REFUND=Ist dieser Artikel eine Rueckgabe? +CHOOSE_RECEIPT_ITEM_IS_REFUND=Ist dieser Artikel eine Rueckgabe? #@TODO Please fix German umlauts! -CHOOSE_RECEIPT_ITEM_IS_A_REFUND_REQUIRED=Bitte waehlen Sie aus, ob der Artikel eine Rueckgabe ist. +CHOOSE_RECEIPT_ITEM_IS_REFUND_REQUIRED=Bitte waehlen Sie aus, ob der Artikel eine Rueckgabe ist. #@TODO Please fix German umlauts! -CHOOSE_RECEIPT_ITEM_IS_A_REFUND_TITLE=Gibt an, ob der Artikel eine Rueckgabe, zum Beispiel zurueckgegebenes Flaschenpfand, ist. +CHOOSE_RECEIPT_ITEM_IS_REFUND_TITLE=Gibt an, ob der Artikel eine Rueckgabe, zum Beispiel zurueckgegebenes Flaschenpfand, ist. ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE=Zeigt Produktdaten des Artikels an. ENTER_RECEIPT_ITEM_COUPON_NUMBER=Coupon-Nummer eingeben: #@TODO Please fix German umlauts! @@ -234,11 +233,11 @@ ENTER_RECEIPT_ITEM_COUPON_NUMBER_TITLE=Geben Sie die Nummer des eingeloesten Cou ADMIN_RECEIPT_DATE_OF_ISSUE_TITLE=Bitte geben Sie das Ausstellungsdatum mit Uhrzeit fuer den Kassenbon ein. Falls Sie keine Uhrzeit haben, einfach auf 00:00 Uhr lassen. #@TODO Please fix German umlauts! ENTERED_RECEIPT_REGISTER_NUMBER_INVALID=Die eingegebene Kassennummer ist kleiner 1 oder groesser 999. -CHOOSE_RECEIPT_ITEM_IS_A_DISCOUNT=Ist dies ein Nachlass? +CHOOSE_RECEIPT_ITEM_IS_DISCOUNT=Ist dies ein Nachlass? #@TODO Please fix German umlauts! -CHOOSE_RECEIPT_ITEM_IS_A_DISCOUNT_REQUIRED=Bitte waehlen Sie aus, ob dies ein Nachlass ist. +CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_REQUIRED=Bitte waehlen Sie aus, ob dies ein Nachlass ist. #@TODO Please fix German umlauts! -CHOOSE_RECEIPT_ITEM_IS_A_DISCOUNT_TITLE=Waehlen Sie aus, ob dies ein Nachlass auf einen Artikel ist. +CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_TITLE=Waehlen Sie aus, ob dies ein Nachlass auf einen Artikel ist. #@TODO Please fix German umlauts! ADMIN_SELECT_PRODUCT_AGE_GROUP=Altersklasse zum Produkt auswaehlen: #@TODO Please fix German umlauts! @@ -259,7 +258,7 @@ ADMIN_PRODUCT_DETAILS_HEADER=Details zum Produkt "{0}" (Id {1}): ADMIN_SINGLE_PRODUCT_DETAILS_HEADER=Details zum einzelnen Produkt PRODUCT_ID_NUMBER_TITLE=Id-Nummer des Produktes #@TODO Please fix German umlauts! -PRODUCT_I18N_KEY_TITLE=Internationalisierungsschluessel fuer das Produkt +PRODUCT_I18N_KEY_TITLE=Internationalisierungsschluessel fuer das Produkt. #@TODO Please fix German umlauts! PRODUCT_AVAILABILITY_TITLE=Ob das Produkt zur Verfuegung steht. AGE_GROUP_HEADER=Altersgruppe: @@ -269,11 +268,8 @@ PRODUCT_HAS_NO_AGE_GROUP=Das Produkt hat keine Altersgruppe. CURRENCY_CODE_HEADER=Waehrungscode #@TODO Please fix German umlauts! PRODUCT_CURRENCY_CODE_TITLE=Waehrungscode des Produktpreises -PRODUCT_GROSS_PRICE_HEADER=Bruttopreis: PRODUCT_GROSS_PRICE_TITLE=Bruttopreis des Produktes -PRODUCT_NET_PRICE_HEADER=Nettopreis: PRODUCT_NET_PRICE_TITLE=Nettopreis des Produktes -PRODUCT_TAX_RATE_HEADER=Steuersatz: PRODUCT_TAX_RATE_TITLE=Steuersatz des Produktes PRODUCT_NUMBER_HEADER=Produktnummer: PRODUCT_NUMBER_TITLE=Nummer des Produktes @@ -335,3 +331,36 @@ CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_DELETE=Produkt loeschen: ERROR_PARAMETER_PRODUCT_ID_NOT_SET=Fehler: Produkt-Id nicht gesetzt (Parameter: productId). #@TODO Please fix German umlauts! PARAMETER_PRODUCT_ID_INVALID=Parameter "productId" ist ungueltig. +ADMIN_SINGLE_RECEIPT_ITEM_DETAILS_HEADER=Details zum einzelnen Kassenboneintrag +RECEIPT_ITEM_NUMBER_HEADER=Nummer des Eintrages: +RECEIPT_ITEM_NUMBER_TITLE=Nummer des Kassenboneintrages (optional). +RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER=Menge des Eintrages: +RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE=Menge des Kassenboneintrages. +RECEIPT_ITEM_BRAND_NAME_TITLE=Warenzeichen des Kassenboneintrages. +PRODUCT_I18N_KEY_HEADER=Internationalisierungsschluessel des Produktes: +ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_HEADER=Zum Eintrag zugewiesene Kategorie: +ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_TITLE=Dem Kassenboneintrag zugewiesene Kategorie. +RECEIPT_ITEM_GROSS_PRICE_TITLE=Gesamtbruttopreis eines einzelnen Kassenboneintrages. +RECEIPT_ITEM_NET_PRICE_TITLE=GesamtNettopreis eines einzelnen Kassenboneintrages. +ADMIN_ASSIGNED_MANUFACTURER_HEADER=Zugewiesener Hersteller: +ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE=Zum Kassenboneintrag zugewiesene Grunddaten des Herstellers (optional). +RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED=Dieser Kassenboneintrag hat keinen Hersteller zugewiesen. +GROSS_PRICE_HEADER=Bruttopreis: +NET_PRICE_HEADER=Nettopreis: +TAX_RATE_HEADER=Steuersatz: +BRAND_NAME_HEADER=Warenzeichen: +IS_DISCOUNT_HEADER=Ist ein Nachlass? +RECEIPT_ITEM_IS_DISCOUNT_TITLE=Gibt an, ob der Kassenboneintrag ein Nachlass ist. +#@TODO Please fix German umlauts! +IS_REFUND_HEADER=Ist eine Rueckerstattung? +#@TODO Please fix German umlauts! +RECEIPT_ITEM_IS_REFUND_TITLE=Gibt an, ob der Kassenboneintrag eine Rueckerstattung ist. +ASSIGNED_RECEIPT_HEADER=Zugewiesener Kassenbon: +RECEIPT_ITEM_ASSIGNED_RECEIPT_TITLE=Dem Kassenkoneintrag zugewiesener Kassenbon. +#@TODO Please fix German umlauts! +RECEIPT_ENTRY_CREATED_TITLE=Wann dieser Kassenbon der Datenbank hinzugefuegt wurde. +ADMIN_EDIT_GENERIC_PRODUCT_TITLE=Produkt-Id {0} editieren +#@TODO Please fix German umlauts! +ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA=Sie koennen hier alle Werte aendern aber geben oder waehlen Sie mindestens die markierten (*) ein/aus. +#@TODO Please fix German umlauts! +BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Allgemeines Produkt aendern diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index 1f7e04de..4e26cf27 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -99,7 +99,6 @@ FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Filter list by selecting one or more ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Shows product category data. ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Edits product category data. ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Deletes product category data. -ADMIN_PRODUCT_GROSS_PRICE_HEADER=Gross price: PRODUCT_AVAILABILITY_HEADER=Product available: 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). @@ -146,8 +145,8 @@ ADMIN_ASSIGN_PRODUCT_MANUFACTURER_TITLE=Assign a manufacturing/producing company SELECT_RECEIPT_ITEM_MANUFACTURER=Choose manufacturer for receipt item: ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER=Manufacturer of product item: 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. +ENTER_RAND_NAME=Enter item's brand name: +ENTER_RAND_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 ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Please enter a unit amount. Example 500 for 500 grams. ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Please enter unit's i18n key. Example: UNIT_TYPE_GRAMS for grams @@ -159,12 +158,12 @@ ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Enter product number: ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Enter number of product. ENTER_RECEIPT_ITEM_NUMBER=Item number: ENTER_RECEIPT_ITEM_NUMBER_TITLE=Enter receipt item's number. -CHOOSE_RECEIPT_ITEM_IS_A_REFUND=Is this item a refund? -CHOOSE_RECEIPT_ITEM_IS_A_REFUND_REQUIRED=Please choose whether the item is a refund. -CHOOSE_RECEIPT_ITEM_IS_A_REFUND_TITLE=Choose whether the item is a refund, like from a deposit of a bottle or can. -CHOOSE_RECEIPT_ITEM_IS_A_DISCOUNT=Is this item a discount? -CHOOSE_RECEIPT_ITEM_IS_A_DISCOUNT_REQUIRED=Please choose whether the item is a discount. -CHOOSE_RECEIPT_ITEM_IS_A_DISCOUNT_TITLE=Choose whether this is a discount on an item. +CHOOSE_RECEIPT_ITEM_IS_REFUND=Is this item a refund? +CHOOSE_RECEIPT_ITEM_IS_REFUND_REQUIRED=Please choose whether the item is a refund. +CHOOSE_RECEIPT_ITEM_IS_REFUND_TITLE=Choose whether the item is a refund, like from a deposit of a bottle or can. +CHOOSE_RECEIPT_ITEM_IS_DISCOUNT=Is this item a discount? +CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_REQUIRED=Please choose whether the item is a discount. +CHOOSE_RECEIPT_ITEM_IS_DISCOUNT_TITLE=Choose whether this is a discount on an item. ADMIN_LINK_SHOW_RECEIPT_ITEM_PRODUCT_TITLE=Shows receipt item's product data. ENTER_RECEIPT_ITEM_COUPON_NUMBER=Enter coupon number: ENTER_RECEIPT_ITEM_COUPON_NUMBER_TITLE=Please enter the number of the used coupon. @@ -185,18 +184,15 @@ LABEL_RECEIPT_SELLERS=Seller ADMIN_PRODUCT_DETAILS_HEADER=Details of product "{0}" (Id {1}): ADMIN_SINGLE_PRODUCT_DETAILS_HEADER=Details of a single product PRODUCT_ID_NUMBER_TITLE=Id number of product -PRODUCT_I18N_KEY_TITLE=Internationalization key of product +PRODUCT_I18N_KEY_TITLE=Internationalization key of product. PRODUCT_AVAILABILITY_TITLE=Whether product is available. AGE_GROUP_HEADER=Age group: PRODUCT_AGE_GROUP_TITLE=Age group of product. PRODUCT_HAS_NO_AGE_GROUP=The product has no age group. CURRENCY_CODE_HEADER=Currency code PRODUCT_CURRENCY_CODE_TITLE=Currency code of product's price -PRODUCT_GROSS_PRICE_HEADER=Gross price: PRODUCT_GROSS_PRICE_TITLE=Gross price of product -PRODUCT_NET_PRICE_HEADER=Net price: PRODUCT_NET_PRICE_TITLE=Net price of product -PRODUCT_TAX_RATE_HEADER=Tax rate: PRODUCT_TAX_RATE_TITLE=Tax rate of product PRODUCT_NUMBER_HEADER=Product number: PRODUCT_NUMBER_TITLE=Number of product @@ -246,3 +242,31 @@ PAGE_TITLE_ADMIN_GENERIC_PRODUCT_DELETE=Delete product CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_DELETE=Delete product: ERROR_PARAMETER_PRODUCT_ID_NOT_SET=Error: Product Id is not set (parameter: productId). PARAMETER_PRODUCT_ID_INVALID=Parameter "productId" is invalid. +ADMIN_SINGLE_RECEIPT_ITEM_DETAILS_HEADER=Details of a single receipt item +RECEIPT_ITEM_NUMBER_HEADER=Receipt item's number: +RECEIPT_ITEM_NUMBER_TITLE=Number of the receipt item (optional). +RECEIPT_ITEM_PRODUCT_QUANTITY_HEADER=Quantity of receipt item: +RECEIPT_ITEM_PRODUCT_QUANTITY_TITLE=Quantity of the receipt item. +RECEIPT_ITEM_BRAND_NAME_TITLE=Brand name of receipt item. +PRODUCT_I18N_KEY_HEADER=Product's internationalization key: +ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_HEADER=Assigned category to receipt item: +ADMIN_ASSIGNED_RECEIPT_ITEM_CATEGORY_TITLE=Category assigned to receipt item. +RECEIPT_ITEM_GROSS_PRICE_TITLE=Total gross price of a single receipt item. +RECEIPT_ITEM_NET_PRICE_TITLE=Total net price of a single receipt item. +ADMIN_ASSIGNED_MANUFACTURER_HEADER=Assigned manufacturer: +ADMIN_ASSIGNED_RECEIPT_ITEM_MANUFACTURER_TITLE=Manufacturer (basic data) assigned to receipt item (optional). +RECEIPT_ITEM_HAS_NO_MANUFACTURER_ASSIGNED=This receipt item has no manufacturer assigned. +GROSS_PRICE_HEADER=Gross price: +NET_PRICE_HEADER=Net price: +TAX_RATE_HEADER=Tax rate: +BRAND_NAME_HEADER=Brand name: +IS_DISCOUNT_HEADER=Is a discount? +RECEIPT_ITEM_IS_DISCOUNT_TITLE=Whether the receipt item is a discount. +IS_REFUND_HEADER=Is a refund? +RECEIPT_ITEM_IS_REFUND_TITLE=Whether the receipt item is a refund. +ASSIGNED_RECEIPT_HEADER=Assigned receipt: +RECEIPT_ITEM_ASSIGNED_RECEIPT_TITLE=Receipt item's assigned receipt. +RECEIPT_ENTRY_CREATED_TITLE=When this receipt entry has been added to database. +ADMIN_EDIT_GENERIC_PRODUCT_TITLE=Edit product id {0} +ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA=You can edit all values here but enter or select at least all marked (*) values. +BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Change generic product diff --git a/web/WEB-INF/project-links.jsf.taglib.xml b/web/WEB-INF/project-links.jsf.taglib.xml index c1cb5658..edeaec83 100644 --- a/web/WEB-INF/project-links.jsf.taglib.xml +++ b/web/WEB-INF/project-links.jsf.taglib.xml @@ -15,10 +15,12 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> - + http://mxchange.org/jsf/jfinancials/links outputReceiptAdminMiniLinks diff --git a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl index 264c6ca5..49241dca 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt/admin_receipt_links.tpl @@ -4,7 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" - xmlns:p="http://primefaces.org/ui"> + xmlns:p="http://primefaces.org/ui" + >

    diff --git a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl index a3157e4d..89e4c708 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/financial/receipt_item/admin_receipt_item_links.tpl @@ -4,7 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" - xmlns:p="http://primefaces.org/ui"> + xmlns:p="http://primefaces.org/ui" + >
      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 f62cff09..c25e5c0a 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 @@ -6,10 +6,16 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core" xmlns:ui="http://xmlns.jcp.org/jsf/facelets" - xmlns:p="http://primefaces.org/ui"> + xmlns:p="http://primefaces.org/ui" + > - + - + @@ -83,7 +89,12 @@ - + + xmlns:p="http://primefaces.org/ui" + > - - + + @@ -66,23 +72,23 @@ title="#{project.ENTER_RECEIPT_ITEM_QUANTITY_TITLE}" /> - + - + @@ -108,7 +114,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 6a5bc355..1662ce4e 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 @@ -5,14 +5,19 @@ 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"> + xmlns:p="http://primefaces.org/ui" + >
      - + - + @@ -76,7 +81,11 @@ - + + id="receiptRegisterNumber" + size="3" + maxlength="10" + value="#{receiptController.receiptRegisterNumber}" + validatorMessage="#{project.ENTERED_RECEIPT_REGISTER_NUMBER_INVALID}" + > diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml index b3be3052..69821d59 100644 --- a/web/admin/financial/receipt/admin_receipt_list.xhtml +++ b/web/admin/financial/receipt/admin_receipt_list.xhtml @@ -1,13 +1,15 @@ - + @@ -23,7 +25,6 @@ id="receiptList" var="receipt" value="#{receiptListController.allReceipts}" - tableStyleClass="table table-full" paginator="true" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" filteredValue="#{receiptListController.filteredReceipts}" @@ -45,14 +46,25 @@ - + - + + @@ -81,7 +93,7 @@ title="#{msg.FILTER_BY_MULTIPLE_BRANCH_OFFICES_TITLE}" > - + @@ -141,8 +153,8 @@ - - + + @@ -176,11 +188,11 @@ hideEffect="fade" showEffect="fade" widgetVar="receiptDialog" - position="center,center" + position="top" responsive="true" > - + @@ -194,8 +206,8 @@ - - + + @@ -223,13 +235,21 @@ + + + + + - +

      @@ -238,7 +258,7 @@ - + + xmlns:p="http://primefaces.org/ui" + > @@ -24,7 +25,6 @@ id="receiptItemList" var="receiptItem" value="#{receiptItemListController.allReceiptItems}" - tableStyleClass="table table-full" paginator="true" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" filteredValue="#{receiptItemListController.filteredReceiptItems}" @@ -46,14 +46,26 @@ - + - + + + @@ -67,7 +79,7 @@ - + @@ -82,11 +94,11 @@ title="#{project.FILTER_BY_MULTIPLE_RECEIPTS_TITLE}" > - + - + @@ -130,12 +142,12 @@ - + - - + + @@ -152,11 +164,11 @@ hideEffect="fade" showEffect="fade" widgetVar="receiptItemDialog" - position="center,center" + position="top" responsive="true" > - + @@ -165,13 +177,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +

      @@ -180,7 +262,7 @@ - + - + @@ -16,7 +18,7 @@ - +
      @@ -64,11 +66,19 @@       -
      - + + - -
      + +       diff --git a/web/user/financials/login_financials_add_receipt.xhtml b/web/user/financials/login_financials_add_receipt.xhtml index 92febe16..270c8760 100644 --- a/web/user/financials/login_financials_add_receipt.xhtml +++ b/web/user/financials/login_financials_add_receipt.xhtml @@ -1,10 +1,12 @@ - + @@ -16,7 +18,10 @@ - + @@ -26,8 +31,17 @@ - - + + + diff --git a/web/user/financials/login_financials_overview.xhtml b/web/user/financials/login_financials_overview.xhtml index 2b85206a..5b92d7a2 100644 --- a/web/user/financials/login_financials_overview.xhtml +++ b/web/user/financials/login_financials_overview.xhtml @@ -1,10 +1,12 @@ - + @@ -21,23 +23,23 @@ - + - + - + - + - + - +