CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Edit share account is not working because of merge

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2016-04-14 13:45:14 +05:30
parent 08c553f9fc
commit fe6e1e88fe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java
+4 -4
View File
@@ -354,10 +354,10 @@ public class ShareAccount extends AbstractPersistable<Long> {
} }
public void updateRequestedShares(ShareAccountTransaction purchased) { public void updateRequestedShares(ShareAccountTransaction purchased) {
if (!this.shareAccountTransactions.isEmpty()) { for(ShareAccountTransaction transaction: this.shareAccountTransactions) {
Iterator<ShareAccountTransaction> iter = this.shareAccountTransactions.iterator(); if(!transaction.isChargeTransaction() && transaction.getId().equals(purchased.getId())) {
ShareAccountTransaction existing = iter.next(); transaction.update(purchased.getPurchasedDate(), purchased.getTotalShares(), purchased.getPurchasePrice());
existing.update(purchased.getPurchasedDate(), purchased.getTotalShares(), purchased.getPurchasePrice()); }
} }
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountTransaction.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class ShareAccountTransaction extends AbstractPersistable<Long> {
final Integer status = PurchasedSharesStatusType.APPROVED.getValue() ; final Integer status = PurchasedSharesStatusType.APPROVED.getValue() ;
final Integer type = PurchasedSharesStatusType.CHARGE_PAYMENT.getValue() ; final Integer type = PurchasedSharesStatusType.CHARGE_PAYMENT.getValue() ;
BigDecimal amount = charge.percentageOrAmount() ; BigDecimal amount = charge.percentageOrAmount() ;
BigDecimal chargeAmount = amount ; BigDecimal chargeAmount = null ;
return new ShareAccountTransaction(transactionDate, totalShares, unitPrice, status, type, amount, chargeAmount) ; return new ShareAccountTransaction(transactionDate, totalShares, unitPrice, status, type, amount, chargeAmount) ;
} }