Don't cherry-pick:

- moved out bonus_card entity to jbonuscard-core

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

diff --git a/nbproject/project.properties b/nbproject/project.properties
index fdbca91671205700bf8a224a52799bbf876e9a7e..187b76a6ad26f6f8e3a7a1e3aa77c1b7c72b0d3b 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,6 +35,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
+file.reference.jbonuscard-core.jar=lib/jbonuscard-core.jar
 file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar
@@ -90,6 +91,7 @@ javac.classpath=\
     ${file.reference.juser-activity-lib.jar}:\
     ${file.reference.juser-login-core.jar}:\
     ${file.reference.juser-login-lib.jar}:\
+    ${file.reference.jbonuscard-core.jar}:\
     ${reference.jfinancials-core.jar}:\
     ${reference.jfinancials-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
@@ -121,6 +123,7 @@ javadoc.notree=false
 javadoc.preview=true
 javadoc.private=true
 javadoc.reference.cdi-api.jar=https://docs.oracle.com/javaee/7/api/
+javadoc.reference.jbonuscard-core.jar=https://docs.mxchange.org/javadoc/jbonuscard-core/
 javadoc.reference.jcoreee.jar=https://docs.mxchange.org/javadoc/jcoreee.
 javadoc.splitindex=true
 javadoc.use=true
@@ -142,6 +145,7 @@ run.test.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
 runmain.jvmargs=
 source.encoding=UTF-8
+source.reference.jbonuscard-core.jar=..jbonuscard-core/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-business-lib.jar=../jcontacts-business-lib/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index f6ca96a2ddd876abff52941ec1820cd2f713729c..be4dbfffb9a58893da2d818bfa5ca43884ddb67e 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -66,6 +66,9 @@
                 <library dirs="200">
                     <file>${file.reference.juser-login-lib.jar}</file>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jbonuscard-core.jar}</file>
+                </library>
                 <library dirs="200">
                     <file>${reference.jfinancials-core.jar}</file>
                 </library>

diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java
index eb2a0be4e9da0907e07d984c7282f3a60bbde18e..22ea399c84efa5009bc33ccb95e3524d13ac010f 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt/action/FinancialAdminReceiptActionWebViewBean.java
@@ -27,6 +27,7 @@ import javax.faces.application.FacesMessage;
 import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.mxchange.jbonuscard.model.bonus_card.BonusCard;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
 import org.mxchange.jcontactsbusiness.model.employee.Employable;
 import org.mxchange.jfinancials.beans.BaseFinancialsBean;
@@ -37,7 +38,6 @@ import org.mxchange.jfinancials.events.receipt.updated.ObservableReceiptUpdatedE
 import org.mxchange.jfinancials.events.receipt.updated.ReceiptUpdatedEvent;
 import org.mxchange.jfinancials.exceptions.receipt.ReceiptAlreadyAddedException;
 import org.mxchange.jfinancials.exceptions.receipt.ReceiptNotFoundException;
-import org.mxchange.jfinancials.model.bonus_card.BonusCard;
 import org.mxchange.jfinancials.model.receipt.BillableReceipt;
 import org.mxchange.jfinancials.model.receipt.FinancialAdminReceiptSessionBeanRemote;
 import org.mxchange.jfinancials.model.receipt.FinancialReceipt;