Block transfer between different currencies (FINERACT-1355)
This commit is contained in:
+28
@@ -0,0 +1,28 @@
|
|||||||
|
/**
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.fineract.portfolio.account.exception;
|
||||||
|
|
||||||
|
import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
|
||||||
|
|
||||||
|
public class DifferentCurrenciesException extends AbstractPlatformDomainRuleException {
|
||||||
|
|
||||||
|
public DifferentCurrenciesException(final String currency1, final String currency2) {
|
||||||
|
super("error.msg.accounttransfer.different.currencies", "Trying to transfer from " + currency1 + " to " + currency2);
|
||||||
|
}
|
||||||
|
}
|
||||||
+6
@@ -44,6 +44,7 @@ import org.apache.fineract.portfolio.account.domain.AccountTransferDetails;
|
|||||||
import org.apache.fineract.portfolio.account.domain.AccountTransferRepository;
|
import org.apache.fineract.portfolio.account.domain.AccountTransferRepository;
|
||||||
import org.apache.fineract.portfolio.account.domain.AccountTransferTransaction;
|
import org.apache.fineract.portfolio.account.domain.AccountTransferTransaction;
|
||||||
import org.apache.fineract.portfolio.account.domain.AccountTransferType;
|
import org.apache.fineract.portfolio.account.domain.AccountTransferType;
|
||||||
|
import org.apache.fineract.portfolio.account.exception.DifferentCurrenciesException;
|
||||||
import org.apache.fineract.portfolio.loanaccount.data.HolidayDetailDTO;
|
import org.apache.fineract.portfolio.loanaccount.data.HolidayDetailDTO;
|
||||||
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
|
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
|
||||||
import org.apache.fineract.portfolio.loanaccount.domain.LoanAccountDomainService;
|
import org.apache.fineract.portfolio.loanaccount.domain.LoanAccountDomainService;
|
||||||
@@ -144,6 +145,11 @@ public class AccountTransfersWritePlatformServiceImpl implements AccountTransfer
|
|||||||
final SavingsAccountTransaction deposit = this.savingsAccountDomainService.handleDeposit(toSavingsAccount, fmt, transactionDate,
|
final SavingsAccountTransaction deposit = this.savingsAccountDomainService.handleDeposit(toSavingsAccount, fmt, transactionDate,
|
||||||
transactionAmount, paymentDetail, isAccountTransfer, isRegularTransaction);
|
transactionAmount, paymentDetail, isAccountTransfer, isRegularTransaction);
|
||||||
|
|
||||||
|
if (!fromSavingsAccount.getCurrency().getCode().equals(toSavingsAccount.getCurrency().getCode())) {
|
||||||
|
throw new DifferentCurrenciesException(fromSavingsAccount.getCurrency().getCode(),
|
||||||
|
toSavingsAccount.getCurrency().getCode());
|
||||||
|
}
|
||||||
|
|
||||||
final AccountTransferDetails accountTransferDetails = this.accountTransferAssembler.assembleSavingsToSavingsTransfer(command,
|
final AccountTransferDetails accountTransferDetails = this.accountTransferAssembler.assembleSavingsToSavingsTransfer(command,
|
||||||
fromSavingsAccount, toSavingsAccount, withdrawal, deposit);
|
fromSavingsAccount, toSavingsAccount, withdrawal, deposit);
|
||||||
this.accountTransferDetailRepository.saveAndFlush(accountTransferDetails);
|
this.accountTransferDetailRepository.saveAndFlush(accountTransferDetails);
|
||||||
|
|||||||
Reference in New Issue
Block a user