Please cherry-pick:

- need to change java.util.Calendar (bye bye) to java.util.Date in favour of
  PrimeFaces' p:calendar [!] tag
- added more i18n strings

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
index de5753c40c1813e2cecd4254479e02e32502c927..767ed93f50e3fd3ab29fd68e8f0eb41a1fda7d53 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java
@@ -17,7 +17,7 @@
 package org.mxchange.jfinancials.beans.contact.phone;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
+import java.util.Date;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
@@ -180,12 +180,12 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBea
        /**
         * When fax number has been created
         */
-       private Calendar phoneEntryCreated;
+       private Date phoneEntryCreated;
 
        /**
         * When fax number has been updated
         */
-       private Calendar phoneEntryUpdated;
+       private Date phoneEntryUpdated;
 
        /**
         * Phone id (primary key)
@@ -1031,7 +1031,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBea
         * @param faxNumberEntryCreated Phone entry created
         */
        @SuppressWarnings ("ReturnOfDateField")
-       private Calendar getPhoneEntryCreated () {
+       private Date getPhoneEntryCreated () {
                return this.phoneEntryCreated;
        }
 
@@ -1041,7 +1041,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBea
         * @param phoneEntryCreated Phone entry created
         */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       private void setPhoneEntryCreated (final Calendar phoneEntryCreated) {
+       private void setPhoneEntryCreated (final Date phoneEntryCreated) {
                this.phoneEntryCreated = phoneEntryCreated;
        }
 
@@ -1051,7 +1051,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBea
         * @return Phone entry updated
         */
        @SuppressWarnings ("ReturnOfDateField")
-       private Calendar getPhoneEntryUpdated () {
+       private Date getPhoneEntryUpdated () {
                return this.phoneEntryUpdated;
        }
 
@@ -1061,7 +1061,7 @@ public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBea
         * @param phoneEntryUpdated Phone entry updated
         */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       private void setPhoneEntryUpdated (final Calendar phoneEntryUpdated) {
+       private void setPhoneEntryUpdated (final Date phoneEntryUpdated) {
                this.phoneEntryUpdated = phoneEntryUpdated;
        }
 

diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
index 834b180236d65bf2b9ef9a2e5f4c3497ae37acb4..dea6604a56734945c80826a951b6183eb3fb4f3c 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java
@@ -17,7 +17,7 @@
 package org.mxchange.jfinancials.beans.phone;
 
 import java.text.MessageFormat;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import javax.ejb.EJB;
@@ -165,12 +165,12 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
        /**
         * When the phone entry has been created (persisted)
         */
-       private Calendar phoneEntryCreated;
+       private Date phoneEntryCreated;
 
        /**
         * When the phone entry has been updated
         */
-       private Calendar phoneEntryUpdated;
+       private Date phoneEntryUpdated;
 
        /**
         * Phone id (aka primary key)
@@ -834,7 +834,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         * @return Phone entry created timestamp
         */
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getPhoneEntryCreated () {
+       public Date getPhoneEntryCreated () {
                return this.phoneEntryCreated;
        }
 
@@ -844,7 +844,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         * @param phoneEntryCreated Phone entry created timestamp
         */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setPhoneEntryCreated (final Calendar phoneEntryCreated) {
+       public void setPhoneEntryCreated (final Date phoneEntryCreated) {
                this.phoneEntryCreated = phoneEntryCreated;
        }
 
@@ -854,7 +854,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         * @return Phone entry updated timestamp
         */
        @SuppressWarnings ("ReturnOfDateField")
-       public Calendar getPhoneEntryUpdated () {
+       public Date getPhoneEntryUpdated () {
                return this.phoneEntryUpdated;
        }
 
@@ -864,7 +864,7 @@ public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean imple
         * @param phoneEntryUpdated Phone entry updated timestamp
         */
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setPhoneEntryUpdated (final Calendar phoneEntryUpdated) {
+       public void setPhoneEntryUpdated (final Date phoneEntryUpdated) {
                this.phoneEntryUpdated = phoneEntryUpdated;
        }
 

diff --git a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java
index af485ef8e116953392b263f6805c6c901d169bf9..31473bf41f840d6c33bfa758552457aa98650d3e 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java
@@ -19,7 +19,7 @@ package org.mxchange.jfinancials.beans.user.activity;
 import fish.payara.cdi.jsr107.impl.NamedCache;
 import java.text.MessageFormat;
 import java.util.Collections;
-import java.util.GregorianCalendar;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -589,7 +589,7 @@ public class FinancialsUserActivityWebRequestBean extends BaseFinancialsBean imp
                }
 
                // Create new activity object
-               final LogableUserActivity userActivity = new UserActivityLog(activityType, user, new GregorianCalendar(), this.determinePrincipalName());
+               final LogableUserActivity userActivity = new UserActivityLog(activityType, user, new Date(), this.determinePrincipalName());
 
                // Call bean to add it
                this.userActivityBean.addUserActivityLog(userActivity);
@@ -631,7 +631,7 @@ public class FinancialsUserActivityWebRequestBean extends BaseFinancialsBean imp
                }
 
                // Create new activity object
-               final LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new GregorianCalendar(), this.determinePrincipalName());
+               final LogableUserActivity userActivity = new UserActivityLog(message, activityType, user, new Date(), this.determinePrincipalName());
 
                // Call bean to add it
                this.userActivityBean.addUserActivityLog(userActivity);

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 238101e707b030ea15ed20532814aca0e3e3ef96..24a7af1954a44c1918cc06313edfa7804c3d66bf 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -950,3 +950,14 @@ FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unterne
 LABEL_COMPANY_EMPLOYEES=Mitarbeiter
 FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE=Liste durch Auswahl von ein oder mehr Mitarbeiter durchsuchen.
 ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Filialnummer eingeben:
+#@TODO Please fix German umlauts!
+ADMIN_SELECT_BRANCH_OFFICE=Filiale auswaehlen:
+#@TODO Please fix German umlauts!
+PLEASE_SELECT=Bitte auswaehlen
+#@TODO Please fix German umlauts!
+ADMIN_SELECT_PAYMENT_TYPE=Bezahlungsart auswaehlen:
+PAYMENT_TYPE_CASH=Bargeld
+PAYMENT_TYPE_CREDIT_CARD=Kreditkarte
+PAYMENT_TYPE_DEBIT_CARD=Kundenkarte
+PAYMENT_TYPE_PREPAYMENT=Vorkasse
+PAYMENT_TYPE_INVOICE=Auf Rechnung

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 27ce2d3edb45c3c94734046f372f42813f328fd6..d94c15cfef44846c39ed775da85f670e96463d09 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -897,3 +897,11 @@ FILTER_BY_MULTIPLE_COMPANIES_TITLE=Filter list by selecting one or more companie
 LABEL_COMPANY_EMPLOYEES=Employees
 FILTER_BY_MULTIPLE_COMPANY_EMPLOYEES_TITLE=Filter list by selecting one or more employees.
 ADMIN_ENTER_BRANCH_OFFICE_NUMBER=Enter branch office number:
+ADMIN_SELECT_BRANCH_OFFICE=Select branch office:
+PLEASE_SELECT=Please select
+ADMIN_SELECT_PAYMENT_TYPE=Select payment type:
+PAYMENT_TYPE_CASH=Cash
+PAYMENT_TYPE_CREDIT_CARD=Credit card
+PAYMENT_TYPE_DEBIT_CARD=Debit card
+PAYMENT_TYPE_PREPAYMENT=Prepayment
+PAYMENT_TYPE_INVOICE=Per invoice