Merge pull request apache#441 from Nenge1/FINERACT-574

FINERACT-574
swagatikapanda123 · Dec 4, 2018 · 5db61a2 · 5db61a2
2 parents c113ef4 + 613b802
commit 5db61a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...in/java/org/apache/fineract/portfolio/shareaccounts/domain/PurchasedSharesStatusType.java b/...in/java/org/apache/fineract/portfolio/shareaccounts/domain/PurchasedSharesStatusType.java
@@ -69,6 +69,10 @@ public String getCode() {
     public boolean isApproved() {
         return this.value.equals(PurchasedSharesStatusType.APPROVED.getValue());
     }
+
+    public boolean isRejected() {
+        return this.value.equals(PurchasedSharesStatusType.REJECTED.getValue());
+    }
 
     public boolean isPurchased() {
         return this.value.equals(PurchasedSharesStatusType.PURCHASED.getValue());

diff --git a/...ovider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java b/...ovider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java
@@ -439,7 +439,7 @@ public void reject(final Date rejectedDate, final AppUser rejectedUser) {
         this.totalSharesPending = null;
         this.totalSharesApproved = null;
         for (ShareAccountTransaction transaction : this.shareAccountTransactions) {
-            if(transaction.isPurchasTransaction()) {
+            if(transaction.isPendingForApprovalTransaction()) {
                 transaction.reject();
             }
         }