From 7862e62c4936c0d46eee5f5b3fa0d9204aa06fbf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 6 Mar 2020 15:12:12 +0100 Subject: [PATCH] Product-only: - displayed manufacturer's short company name if assigned - UNIT_TYPE_MILLILITTER is correct spelling of "milliliter" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../helper/product/FinancialsProductWebViewHelperBean.java | 7 +++++++ .../org/mxchange/localization/product_de_DE.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java index 5b4c3aa9..912fc73d 100644 --- a/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java @@ -19,6 +19,7 @@ package org.mxchange.jfinancials.beans.helper.product; import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController; import org.mxchange.jproduct.model.category.Category; @@ -94,6 +95,12 @@ public class FinancialsProductWebViewHelperBean extends BaseFinancialsBean imple sb.append(", ").append(this.getMessageFromBundle("SIZE")).append(product.getProductSize()); //NOI18N } + // Is manufacturer assigned? + if (product.getProductManufacturer() instanceof BasicData) { + // Yes, then take at least short name + sb.append(", ").append(product.getProductManufacturer().getCompanyShortName()); + } + // Add price sb.append(" ("); //NOI18N sb.append(this.localizationController.formatCurrency(product.getProductGrossPrice().floatValue())); diff --git a/src/java/org/mxchange/localization/product_de_DE.properties b/src/java/org/mxchange/localization/product_de_DE.properties index 571948cf..e8bf2f42 100644 --- a/src/java/org/mxchange/localization/product_de_DE.properties +++ b/src/java/org/mxchange/localization/product_de_DE.properties @@ -101,7 +101,7 @@ ADMIN_ENTERED_CATEGORY_I18N_KEY_ALREADY_ADDED=Der von Ihnen eingegebene Ueberset ADMIN_ENTERED_PRODUCT_I18N_KEY_ALREADY_ADDED=Der von Ihnen eingegebene Uebersetzungsschl\u00fcssel f\u00fcr das Produkt ist bereits vorhanden. Bitte gebene Sie einen anderen an. #@TODO Please fix German umlauts! ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY=Uebersetzungschl\u00fcssel der Einheit f\u00fcr St\u00fcckzahl eingeben: -ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE=Geben Sie hier die Einheit f\u00fcr die Produktst\u00fcckzahl ein, wie z.B. "UNT_TYPE_MILLI_LITER" f\u00fcr Milliliter oder "UNT_TYPE_GRAMS" f\u00fcr Gramm. +ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE=Geben Sie hier die Einheit f\u00fcr die Produktst\u00fcckzahl ein, wie z.B. "UNT_TYPE_MILLILITER" f\u00fcr Milliliter oder "UNT_TYPE_GRAMS" f\u00fcr Gramm. ADMIN_ASSIGN_PRODUCT_MANUFACTURER=Hersteller dem Produkt zuweisen: #@TODO Please fix German umlauts! ADMIN_ASSIGN_PRODUCT_MANUFACTURER_TITLE=Weisen Sie hier ein Hersteller dem Produkt zu. Supermaerke verkaufen oefters nur die Produkte, die ein anderes Unternehmen hergestellt hat. -- 2.39.5