From 524ebb88f1d4b542a27b7308f7eb8a0a6bcdd45b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 22 Sep 2017 22:09:02 +0200 Subject: [PATCH] Please cherry-pick: - renamed BaseController to BaseBean as 'Controller' is for interfaces and 'Bean' for classes (the actual backing bean) - added bean for static data (application-scoped) - added converter for PaymentType enumeration - added branchNumber which can be aside from the primary key a number e.g. from organigrams MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...ontroller.java => BaseFinancialsBean.java} | 4 +- ...ncialsAdminBusinessDataWebRequestBean.java | 4 +- .../FinancialsBusinessDataWebRequestBean.java | 4 +- ...ncialsAdminBranchOfficeWebRequestBean.java | 28 +++++++++- .../FinancialsBranchOfficeWebRequestBean.java | 4 +- ...alsAdminCompanyEmployeeWebRequestBean.java | 4 +- ...nancialsCompanyEmployeeWebRequestBean.java | 4 +- .../FinancialsAdminContactWebRequestBean.java | 4 +- .../FinancialsContactWebRequestBean.java | 4 +- ...ncialsAdminContactPhoneWebRequestBean.java | 4 +- .../FinancialsContactPhoneWebRequestBean.java | 4 +- .../FinancialsAdminCountryWebRequestBean.java | 4 +- .../FinancialsCountryWebRequestBean.java | 4 +- .../FinancialsDataWebApplicationBean.java | 55 +++++++++++++++++++ .../FinancialsFeatureWebApplicationBean.java | 4 +- .../FinancialsGenderWebApplicationBean.java | 4 +- .../FinancialsWebRequestHelperBean.java | 4 +- .../FinancialsLocalizationSessionBean.java | 4 +- ...ialsAdminMobileProviderWebRequestBean.java | 4 +- ...inancialsMobileProviderWebRequestBean.java | 4 +- .../FinancialsAdminPhoneWebRequestBean.java | 4 +- .../phone/FinancialsPhoneWebRequestBean.java | 4 +- .../FinancialsUserProfileWebRequestBean.java | 4 +- ...nancialsProfileModeWebApplicationBean.java | 4 +- .../FinancialsAdminUserWebRequestBean.java | 4 +- .../user/FinancialsUserWebRequestBean.java | 4 +- .../FinancialsUserActivityWebRequestBean.java | 4 +- ...ancialsConfirmationLinkWebRequestBean.java | 4 +- .../FinancialsEmailChangeWebRequestBean.java | 4 +- .../FinancialsUserLoginWebSessionBean.java | 4 +- .../FinancialsUserPasswordWebRequestBean.java | 4 +- .../FinancialsUserRegisterWebRequestBean.java | 4 +- .../FinancialsResendLinkWebRequestBean.java | 4 +- .../FinancialsPaymentTypeConverter.java | 39 +++++++++++++ .../localization/bundle_de_DE.properties | 1 + .../localization/bundle_en_US.properties | 1 + .../admin_form_branch_offices_data.tpl | 10 ++++ 37 files changed, 194 insertions(+), 64 deletions(-) rename src/java/org/mxchange/jfinancials/beans/{BaseFinancialsController.java => BaseFinancialsBean.java} (92%) create mode 100644 src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java create mode 100644 src/java/org/mxchange/jfinancials/converter/paymenttype/FinancialsPaymentTypeConverter.java diff --git a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java similarity index 92% rename from src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java rename to src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java index 52253356..3b03fa6e 100644 --- a/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java +++ b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsBean.java @@ -25,7 +25,7 @@ import org.mxchange.jcoreee.bean.faces.BaseFacesBean; *

* @author Roland Häder */ -public abstract class BaseFinancialsController extends BaseFacesBean { +public abstract class BaseFinancialsBean extends BaseFacesBean { /** * Serial number @@ -35,7 +35,7 @@ public abstract class BaseFinancialsController extends BaseFacesBean { /** * Protected constructor */ - protected BaseFinancialsController () { + protected BaseFinancialsBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsAdminBusinessDataWebRequestBean.java index f081680e..5b4943e8 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsAdminBusinessDataWebRequestBean.java @@ -32,7 +32,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -46,7 +46,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("adminCompanyDataController") @RequestScoped -public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsController implements FinancialsAdminBusinessDataWebRequestController { +public class FinancialsAdminBusinessDataWebRequestBean extends BaseFinancialsBean implements FinancialsAdminBusinessDataWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java index 8a5152e8..fca43152 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessi import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController; /** @@ -43,7 +43,7 @@ import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionCo */ @Named ("basicDataController") @RequestScoped -public class FinancialsBusinessDataWebRequestBean extends BaseFinancialsController implements FinancialsBusinessDataWebRequestController { +public class FinancialsBusinessDataWebRequestBean extends BaseFinancialsBean implements FinancialsBusinessDataWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java index 0a5153c4..235499b2 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsAdminBranchOfficeWebRequestBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffices; import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice; import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -47,7 +47,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("adminBranchOfficeController") @RequestScoped -public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsController implements FinancialsAdminBranchOfficeWebRequestController { +public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsBean implements FinancialsAdminBranchOfficeWebRequestController { /** * Serial number @@ -90,6 +90,11 @@ public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsCon */ private Short branchHouseNumber; + /** + * Number of branch office + */ + private Long branchNumber; + /** * An event being fired when a branch office has been successfully added */ @@ -311,6 +316,24 @@ public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsCon this.branchHouseNumber = branchHouseNumber; } + /** + * Getter for branch office number + *

+ * @return Branch office number + */ + public Long getBranchNumber () { + return this.branchNumber; + } + + /** + * Setter for branch office number + *

+ * @param branchNumber Branch office number + */ + public void setBranchNumber (final Long branchNumber) { + this.branchNumber = branchNumber; + } + /** * Getter for store *

@@ -523,6 +546,7 @@ public class FinancialsAdminBranchOfficeWebRequestBean extends BaseFinancialsCon // Add all other fields, too branchOffice.setBranchContactEmployee(this.getBranchContactEmployee()); branchOffice.setBranchEmailAddress(this.getBranchEmailAddress()); + branchOffice.setBranchNumber(this.getBranchNumber()); branchOffice.setBranchStore(this.getBranchStore()); branchOffice.setBranchSuiteNumber(this.getBranchSuiteNumber()); branchOffice.setBranchUserOwner(this.getBranchUserOwner()); diff --git a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java index 335d161a..369717e7 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/branchoffice/FinancialsBranchOfficeWebRequestBean.java @@ -32,7 +32,7 @@ import javax.inject.Named; import org.mxchange.jcontactsbusiness.events.branchoffice.added.ObservableBranchOfficeAddedEvent; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * A general bean for branch offices @@ -41,7 +41,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("branchOfficeController") @RequestScoped -public class FinancialsBranchOfficeWebRequestBean extends BaseFinancialsController implements FinancialsBranchOfficeWebRequestController { +public class FinancialsBranchOfficeWebRequestBean extends BaseFinancialsBean implements FinancialsBranchOfficeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminCompanyEmployeeWebRequestBean.java index 42eee1b7..ebe70099 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsAdminCompanyEmployeeWebRequestBean.java @@ -20,7 +20,7 @@ import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * A request-scoped bean for administrative purposes for company employees. @@ -29,7 +29,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("adminCompanyEmployeeController") @RequestScoped -public class FinancialsAdminCompanyEmployeeWebRequestBean extends BaseFinancialsController implements FinancialsAdminCompanyEmployeeWebRequestController { +public class FinancialsAdminCompanyEmployeeWebRequestBean extends BaseFinancialsBean implements FinancialsAdminCompanyEmployeeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java index a6fda677..a371b3b5 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java @@ -28,7 +28,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.employee.Employee; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * A request-scoped bean for general purposes for company employees. @@ -37,7 +37,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("companyEmployeeController") @RequestScoped -public class FinancialsCompanyEmployeeWebRequestBean extends BaseFinancialsController implements FinancialsCompanyEmployeeWebRequestController { +public class FinancialsCompanyEmployeeWebRequestBean extends BaseFinancialsBean implements FinancialsCompanyEmployeeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java index 824e3a36..69d14feb 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java @@ -40,7 +40,7 @@ import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.model.phonenumbers.DialableNumber; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; @@ -57,7 +57,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminContactController") @RequestScoped -public class FinancialsAdminContactWebRequestBean extends BaseFinancialsController implements FinancialsAdminContactWebRequestController { +public class FinancialsAdminContactWebRequestBean extends BaseFinancialsBean implements FinancialsAdminContactWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java index 1162fded..f91ba1a6 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebRequestBean.java @@ -39,7 +39,7 @@ import org.mxchange.jcontacts.model.contact.ContactUtils; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController; import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; @@ -64,7 +64,7 @@ import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; */ @Named ("contactController") @RequestScoped -public class FinancialsContactWebRequestBean extends BaseFinancialsController implements FinancialsContactWebRequestController { +public class FinancialsContactWebRequestBean extends BaseFinancialsBean implements FinancialsContactWebRequestController { /** * Serial number 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 b98ce2c7..de5753c4 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsAdminContactPhoneWebRequestBean.java @@ -43,7 +43,7 @@ import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobi import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent; @@ -66,7 +66,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("adminContactPhoneController") @RequestScoped -public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsController implements FinancialsAdminContactPhoneWebRequestController { +public class FinancialsAdminContactPhoneWebRequestBean extends BaseFinancialsBean implements FinancialsAdminContactPhoneWebRequestController { /** * Call-stack instance (5 may show BeanELResolver.getValue as caller) diff --git a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java index 181656cc..24a3e32a 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebRequestBean.java @@ -32,7 +32,7 @@ import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumb import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent; import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.landline.created.ObservableCreatedLandLineNumberEvent; @@ -50,7 +50,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("contactPhoneController") @RequestScoped -public class FinancialsContactPhoneWebRequestBean extends BaseFinancialsController implements FinancialsContactPhoneWebRequestController { +public class FinancialsContactPhoneWebRequestBean extends BaseFinancialsBean implements FinancialsContactPhoneWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java index 576f72a3..47ef456e 100644 --- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java @@ -32,7 +32,7 @@ import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; import org.mxchange.jcountry.events.AdminAddedCountryEvent; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * An administrative country bean @@ -41,7 +41,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("adminCountryController") @RequestScoped -public class FinancialsAdminCountryWebRequestBean extends BaseFinancialsController implements FinancialsAdminCountryWebRequestController { +public class FinancialsAdminCountryWebRequestBean extends BaseFinancialsBean implements FinancialsAdminCountryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java index b22fda17..2a792435 100644 --- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebRequestBean.java @@ -31,7 +31,7 @@ import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountrySingletonBeanRemote; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * A country bean @@ -40,7 +40,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("countryController") @RequestScoped -public class FinancialsCountryWebRequestBean extends BaseFinancialsController implements FinancialsCountryWebRequestController { +public class FinancialsCountryWebRequestBean extends BaseFinancialsBean implements FinancialsCountryWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java new file mode 100644 index 00000000..db014c53 --- /dev/null +++ b/src/java/org/mxchange/jfinancials/beans/data/FinancialsDataWebApplicationBean.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2017 Roland Haeder + * + * 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.data; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Named; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jproduct.model.payment.PaymentType; + +/** + * An application-scoped data bean for any kind of static data + *

+ * @author Roland Haeder + */ +@Named ("dataController") +@ApplicationScoped +public class FinancialsDataWebApplicationBean extends BaseFinancialsBean { + + /** + * Serial number + */ + private static final long serialVersionUID = 34_869_872_672_641L; + + /** + * Default constructor + */ + public FinancialsDataWebApplicationBean () { + // Call super constructor + super(); + } + + /** + * Returns a list of all payment types + *

+ * @return A list of all payment types + */ + public PaymentType[] getPaymentTypes () { + return PaymentType.values(); + } + +} diff --git a/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java index 396338ba..fc5278d9 100644 --- a/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java @@ -19,7 +19,7 @@ package org.mxchange.jfinancials.beans.features; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * A feature bean @@ -28,7 +28,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("featureController") @ApplicationScoped -public class FinancialsFeatureWebApplicationBean extends BaseFinancialsController implements FinancialsFeaturesWebApplicationController { +public class FinancialsFeatureWebApplicationBean extends BaseFinancialsBean implements FinancialsFeaturesWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java index 7933c02b..82f68f55 100644 --- a/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java @@ -21,7 +21,7 @@ import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; /** * A gender and title bean @@ -30,7 +30,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsController; */ @Named ("genderController") @ApplicationScoped -public class FinancialsGenderWebApplicationBean extends BaseFinancialsController implements FinancialsGenderWebApplicationController { +public class FinancialsGenderWebApplicationBean extends BaseFinancialsBean implements FinancialsGenderWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java index 3d56cad9..db9384a1 100644 --- a/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java @@ -25,7 +25,7 @@ import javax.inject.Named; import org.mxchange.jcontacts.events.contact.created.CreatedContactEvent; import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController; import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController; import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController; @@ -50,7 +50,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("beanHelper") @RequestScoped -public class FinancialsWebRequestHelperBean extends BaseFinancialsController implements FinancialsWebRequestHelperController { +public class FinancialsWebRequestHelperBean extends BaseFinancialsBean implements FinancialsWebRequestHelperController { /** * Call-stack instance (5 may show BeanELResolver.getValue as caller) diff --git a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java index fe261c7e..953909bf 100644 --- a/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java @@ -32,7 +32,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.events.locale.LocaleChangeEvent; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent; import org.mxchange.juserlogincore.events.logout.ObservableUserLogoutEvent; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.events.logout.ObservableUserLogoutEvent; */ @Named ("localizationController") @SessionScoped -public class FinancialsLocalizationSessionBean extends BaseFinancialsController implements FinancialsLocalizationSessionController { +public class FinancialsLocalizationSessionBean extends BaseFinancialsBean implements FinancialsLocalizationSessionController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java index 7b05ed37..1e10d8b2 100644 --- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java @@ -27,7 +27,7 @@ import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.events.mobileprovider.added.AdminMobileProviderAddedEvent; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; @@ -42,7 +42,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminMobileProviderController") @RequestScoped -public class FinancialsAdminMobileProviderWebRequestBean extends BaseFinancialsController implements FinancialsAdminMobileProviderWebRequestController { +public class FinancialsAdminMobileProviderWebRequestBean extends BaseFinancialsBean implements FinancialsAdminMobileProviderWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java index 2c37e83d..7e5a8af3 100644 --- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java @@ -29,7 +29,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; @@ -41,7 +41,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingl */ @Named ("mobileProviderController") @RequestScoped -public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsController implements FinancialsMobileProviderWebRequestController { +public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsBean implements FinancialsMobileProviderWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java index 04506c8b..834b1802 100644 --- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java @@ -28,7 +28,7 @@ import javax.enterprise.inject.Any; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminFaxNumberDeletedEvent; @@ -66,7 +66,7 @@ import org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote; */ @Named ("adminPhoneController") @RequestScoped -public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsController implements FinancialsAdminPhoneWebRequestController { +public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsBean implements FinancialsAdminPhoneWebRequestController { /** * Call-stack position diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java index d6bc2711..2c515c89 100644 --- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebRequestBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEv import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent; import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent; import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent; @@ -55,7 +55,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("phoneController") @RequestScoped -public class FinancialsPhoneWebRequestBean extends BaseFinancialsController implements FinancialsPhoneWebRequestController { +public class FinancialsPhoneWebRequestBean extends BaseFinancialsBean implements FinancialsPhoneWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java index f441134e..ee5c7f1b 100644 --- a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java @@ -21,7 +21,7 @@ import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController; import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named (value = "profileController") @RequestScoped -public class FinancialsUserProfileWebRequestBean extends BaseFinancialsController implements FinancialsUserProfileWebRequestController { +public class FinancialsUserProfileWebRequestBean extends BaseFinancialsBean implements FinancialsUserProfileWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java index b6e461f4..54d720bf 100644 --- a/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; /** @@ -31,7 +31,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("profileModeController") @ApplicationScoped -public class FinancialsProfileModeWebApplicationBean extends BaseFinancialsController implements FinancialsProfileModeWebApplicationController { +public class FinancialsProfileModeWebApplicationBean extends BaseFinancialsBean implements FinancialsProfileModeWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java index 08e0c489..3d5e7b5b 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java @@ -31,7 +31,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; @@ -71,7 +71,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("adminUserController") @RequestScoped -public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController implements FinancialsAdminUserWebRequestController { +public class FinancialsAdminUserWebRequestBean extends BaseFinancialsBean implements FinancialsAdminUserWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java index bc617033..401119e5 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebRequestBean.java @@ -36,7 +36,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController; @@ -72,7 +72,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("userController") @RequestScoped -public class FinancialsUserWebRequestBean extends BaseFinancialsController implements FinancialsUserWebRequestController { +public class FinancialsUserWebRequestBean extends BaseFinancialsBean implements FinancialsUserWebRequestController { /** * Serial number 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 1c9d9bfb..af485ef8 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebRequestBean.java @@ -29,7 +29,7 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; @@ -57,7 +57,7 @@ import org.mxchange.juserlogincore.events.user.password_change.ObservableUpdated */ @Named ("userActivityController") @RequestScoped -public class FinancialsUserActivityWebRequestBean extends BaseFinancialsController implements FinancialsUserActivityWebRequestController { +public class FinancialsUserActivityWebRequestBean extends BaseFinancialsBean implements FinancialsUserActivityWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java index 4ed0d081..5863b799 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java @@ -30,7 +30,7 @@ import javax.inject.Named; import org.mxchange.jcoreee.events.helper.clear.HelperCleanupEvent; import org.mxchange.jcoreee.events.helper.clear.ObservableHelperCleanupEvent; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController; import org.mxchange.jusercore.events.user.created.CreatedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; @@ -49,7 +49,7 @@ import org.mxchange.juserlogincore.events.confirmation.UserConfirmedAccountEvent */ @Named ("userConfirmationLinkController") @RequestScoped -public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsController implements FinancialsConfirmationLinkWebRequestController { +public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsBean implements FinancialsConfirmationLinkWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java index e76cc97b..2903b237 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebRequestBean.java @@ -30,7 +30,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; */ @Named ("userEmailChangeController") @RequestScoped -public class FinancialsEmailChangeWebRequestBean extends BaseFinancialsController implements FinancialsEmailChangeWebRequestController { +public class FinancialsEmailChangeWebRequestBean extends BaseFinancialsBean implements FinancialsEmailChangeWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/login/FinancialsUserLoginWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/login/FinancialsUserLoginWebSessionBean.java index 69273e53..e98d9253 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/login/FinancialsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/login/FinancialsUserLoginWebSessionBean.java @@ -28,7 +28,7 @@ import javax.enterprise.inject.Any; import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusLockedException; @@ -56,7 +56,7 @@ import org.mxchange.juserlogincore.model.user.login.UserLoginSessionBeanRemote; */ @Named ("userLoginController") @SessionScoped -public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController implements FinancialsUserLoginWebSessionController { +public class FinancialsUserLoginWebSessionBean extends BaseFinancialsBean implements FinancialsUserLoginWebSessionController { /** * Path name for guest base template diff --git a/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java index 45033bc4..c92a32a6 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java @@ -25,7 +25,7 @@ import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.login.UserLoginUtils; */ @Named ("userPasswordController") @RequestScoped -public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsController implements FinancialsUserPasswordWebRequestController { +public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsBean implements FinancialsUserPasswordWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java index e9a7a296..2e94b1b0 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebRequestBean.java @@ -26,7 +26,7 @@ import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController; import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController; @@ -56,7 +56,7 @@ import org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBe */ @Named ("userRegistrationController") @RequestScoped -public class FinancialsUserRegisterWebRequestBean extends BaseFinancialsController implements FinancialsUserRegisterWebRequestController { +public class FinancialsUserRegisterWebRequestBean extends BaseFinancialsBean implements FinancialsUserRegisterWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/beans/user/resendlink/FinancialsResendLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/resendlink/FinancialsResendLinkWebRequestBean.java index 4ed34bd5..2b1466ed 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/resendlink/FinancialsResendLinkWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/resendlink/FinancialsResendLinkWebRequestBean.java @@ -26,7 +26,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; import org.mxchange.jcoreee.utils.FacesUtils; -import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.BaseFinancialsBean; import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController; import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; @@ -46,7 +46,7 @@ import org.mxchange.juserlogincore.model.user.resendlink.ResendLinkSessionBeanRe */ @Named ("userResendConfirmationController") @RequestScoped -public class FinancialsResendLinkWebRequestBean extends BaseFinancialsController implements FinancialsResendLinkWebRequestController { +public class FinancialsResendLinkWebRequestBean extends BaseFinancialsBean implements FinancialsResendLinkWebRequestController { /** * Serial number diff --git a/src/java/org/mxchange/jfinancials/converter/paymenttype/FinancialsPaymentTypeConverter.java b/src/java/org/mxchange/jfinancials/converter/paymenttype/FinancialsPaymentTypeConverter.java new file mode 100644 index 00000000..e69b97b5 --- /dev/null +++ b/src/java/org/mxchange/jfinancials/converter/paymenttype/FinancialsPaymentTypeConverter.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2017 Roland Häder + * + * 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.converter.paymenttype; + +import javax.faces.convert.EnumConverter; +import javax.faces.convert.FacesConverter; +import org.mxchange.jproduct.model.payment.PaymentType; + +/** + * A converter for payment types + *

+ * @author Roland Häder + */ +@FacesConverter("PaymentTypeConverter") +public class FinancialsPaymentTypeConverter extends EnumConverter { + + /** + * Default constructor which calls the super constructor with the proper + * enumeration as class type. + */ + public FinancialsPaymentTypeConverter () { + super(PaymentType.class); + } + +} diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 7d5d2658..238101e7 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -949,3 +949,4 @@ LABEL_COMPANIES=Firmen FILTER_BY_MULTIPLE_COMPANIES_TITLE=Liste durch Auswahl von ein oder mehr Unternehmen durchsuchen. 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: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index d6dc029f..27ce2d3e 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -896,3 +896,4 @@ LABEL_COMPANIES=Companies FILTER_BY_MULTIPLE_COMPANIES_TITLE=Filter list by selecting one or more companies. 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: diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl index 48f7352e..e798ed35 100644 --- a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl +++ b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl @@ -160,6 +160,16 @@ + + +

+ +
+ +
+ +
+
-- 2.39.5