|
@ -61,23 +61,6 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
.subscribeWith(new DomesticRelatedDataObserver()) |
|
|
.subscribeWith(new DomesticRelatedDataObserver()) |
|
|
); |
|
|
); |
|
|
// mockDomesticRemitRelatedData(); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void mockDomesticRemitRelatedData() { |
|
|
|
|
|
// DomesticRemitRelatedInfoDTO domesticRelatedData = gateway.getMockedDomesticRelatedData(view.getContext()); |
|
|
|
|
|
// String serviceCharge = domesticRelatedData.getServiceFee(); |
|
|
|
|
|
// |
|
|
|
|
|
// domesticRemitDataValidator.setServiceCharge(serviceCharge); |
|
|
|
|
|
// |
|
|
|
|
|
// String messageServiceCharge = getStringfromStringId(R.string.transfer_charge_text)+": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceCharge) + " " + Constants.KRW_STRING; |
|
|
|
|
|
// view.updateServiceCharge(messageServiceCharge); |
|
|
|
|
|
// |
|
|
|
|
|
// availableBankList=domesticRelatedData.getBankList(); |
|
|
|
|
|
// availableAccountList=domesticRelatedData.getAccountList(); |
|
|
|
|
|
// |
|
|
|
|
|
// domesticRemitDataValidator.validateSenderAccount(availableAccountList.get(0)); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -165,9 +148,8 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void onSendingAmountChanged(String sendingAmount) { |
|
|
public void onSendingAmountChanged(String sendingAmount) { |
|
|
if(domesticRemitDataValidator.validateSendAmount(sendingAmount)) |
|
|
|
|
|
onValidAmountInputbyUser(); |
|
|
|
|
|
// view.listenForAmountFocusChangeOrActionDone(domesticRemitDataValidator.validateSendAmount(sendingAmount)); |
|
|
|
|
|
|
|
|
if (domesticRemitDataValidator.validateSendAmount(sendingAmount)) |
|
|
|
|
|
onValidAmountInputbyUser(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -205,30 +187,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
.subscribeWith(new VerifyKFTCAccountObserver()) |
|
|
.subscribeWith(new VerifyKFTCAccountObserver()) |
|
|
); |
|
|
); |
|
|
// mockAccountValidationSuccess(); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void mockAccountValidationSuccess() { |
|
|
|
|
|
// DomesticReicipientInfoDTO data = gateway.getMockedDomesticRecipientInfo(view.getContext()); |
|
|
|
|
|
// |
|
|
|
|
|
// |
|
|
|
|
|
// String message = getStringfromStringId(R.string.check_recipient_name_text); |
|
|
|
|
|
// String formattedMessage = message.replace("ooo", data.getRecipientName()); |
|
|
|
|
|
// |
|
|
|
|
|
// view.promptToConfirmRecipientName(data.getRecipientName(),formattedMessage, new RecipientConfirmDialog.RecipientConfirmDialogListener() { |
|
|
|
|
|
// @Override |
|
|
|
|
|
// public void onNegativeBtnPressed() { |
|
|
|
|
|
// |
|
|
|
|
|
// } |
|
|
|
|
|
// |
|
|
|
|
|
// @Override |
|
|
|
|
|
// public void onPositiveBtnPressed() { |
|
|
|
|
|
// view.showViewDependentOnBankAccountNo(true); |
|
|
|
|
|
// view.updateWidgetFullName(data.getRecipientName()); |
|
|
|
|
|
// view.updateWidgetMobileNumber(data.getRecipientPhone()); |
|
|
|
|
|
// } |
|
|
|
|
|
// }); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -237,7 +196,6 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
view.showViewDependentOnSenderBankAndAmount(true); |
|
|
view.showViewDependentOnSenderBankAndAmount(true); |
|
|
view.showOkButton(!domesticRemitDataValidator.areAllFormValid()); |
|
|
view.showOkButton(!domesticRemitDataValidator.areAllFormValid()); |
|
|
view.enableVerifyBankButton(domesticRemitDataValidator.isValidRecipientBank && domesticRemitDataValidator.isValidBankAcNo); |
|
|
view.enableVerifyBankButton(domesticRemitDataValidator.isValidRecipientBank && domesticRemitDataValidator.isValidBankAcNo); |
|
|
// view.listenForAmountFocusChangeOrActionDone(false); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
@ -263,22 +221,8 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
.doFinally(() -> view.showProgressBar(false, "")) |
|
|
.subscribeWith(new PaymentAccountBalanceObserver()) |
|
|
.subscribeWith(new PaymentAccountBalanceObserver()) |
|
|
); |
|
|
); |
|
|
// mockCurrentBalance(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void mockCurrentBalance() { |
|
|
|
|
|
String balance = "30000"; |
|
|
|
|
|
|
|
|
|
|
|
domesticRemitDataValidator.setCurrentBalance(balance); |
|
|
|
|
|
|
|
|
|
|
|
view.showCurrentBalance(getStringfromStringId(R.string.available_balance_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(balance) + " " + Constants.KRW_STRING); |
|
|
|
|
|
view.showCheckBalanceButton(false); |
|
|
|
|
|
|
|
|
|
|
|
domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount(); |
|
|
|
|
|
domesticRemitDataValidator.validateAll(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class DomesticRemitDataValidator { |
|
|
class DomesticRemitDataValidator { |
|
|
private DomesticAccountsDTO selectedSenderAccount; |
|
|
private DomesticAccountsDTO selectedSenderAccount; |
|
|
private String sendAmount; |
|
|
private String sendAmount; |
|
@ -370,16 +314,32 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
|
|
|
|
|
|
if (sendAmountFormatted < 10000) { |
|
|
if (sendAmountFormatted < 10000) { |
|
|
view.setErrorOnWidgetAmount(getStringfromStringId(R.string.amount_minimum_error_text)); |
|
|
view.setErrorOnWidgetAmount(getStringfromStringId(R.string.amount_minimum_error_text)); |
|
|
|
|
|
view.showDeductionAmount(""); |
|
|
isValidSendAmount = false; |
|
|
isValidSendAmount = false; |
|
|
} else { |
|
|
} else { |
|
|
view.setErrorOnWidgetAmount(null); |
|
|
view.setErrorOnWidgetAmount(null); |
|
|
isValidSendAmount = true; |
|
|
isValidSendAmount = true; |
|
|
|
|
|
calcDeducationAmount(); |
|
|
validateCurrentBalanceWithSendingAmount(); |
|
|
validateCurrentBalanceWithSendingAmount(); |
|
|
} |
|
|
} |
|
|
validateAll(); |
|
|
validateAll(); |
|
|
return isValidSendAmount; |
|
|
return isValidSendAmount; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void calcDeducationAmount() { |
|
|
|
|
|
String serviceChargeOnBasisOnType = ""; |
|
|
|
|
|
if ("autodebit".equalsIgnoreCase(selectedSenderAccount.getType())) |
|
|
|
|
|
serviceChargeOnBasisOnType = serviceCharge; |
|
|
|
|
|
else |
|
|
|
|
|
serviceChargeOnBasisOnType = serviceChargeWallet; |
|
|
|
|
|
|
|
|
|
|
|
double deductionAmount = Utils.formatCurrencyForComparision(sendAmount) + Utils.formatCurrencyForComparision(serviceChargeOnBasisOnType); |
|
|
|
|
|
|
|
|
|
|
|
String message = "It will deduct " + deductionAmount + " " + Constants.KRW_STRING + " (Amount + ServiceFee)"; |
|
|
|
|
|
|
|
|
|
|
|
view.showDeductionAmount(message); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void validateRecipientBank(DomesticBankDTO selectedReceiverBank) { |
|
|
public void validateRecipientBank(DomesticBankDTO selectedReceiverBank) { |
|
|
this.selectedRecipientBank = selectedReceiverBank; |
|
|
this.selectedRecipientBank = selectedReceiverBank; |
|
@ -457,7 +417,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
if (netSendingAmount == 0) { |
|
|
if (netSendingAmount == 0) { |
|
|
view.setErrorOnWidgetAmount(null); |
|
|
view.setErrorOnWidgetAmount(null); |
|
|
isValidSendAmount = false; |
|
|
isValidSendAmount = false; |
|
|
|
|
|
|
|
|
|
|
|
view.showDeductionAmount(""); |
|
|
} |
|
|
} |
|
|
//Business requirement, not checking lower bound as it will be handled by server |
|
|
//Business requirement, not checking lower bound as it will be handled by server |
|
|
// else if (formattedCurrentBalance <=formattedServiceCharge || netSendingAmount > formattedCurrentBalance) |
|
|
// else if (formattedCurrentBalance <=formattedServiceCharge || netSendingAmount > formattedCurrentBalance) |
|
@ -468,6 +428,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
//User sending Amount is valid |
|
|
//User sending Amount is valid |
|
|
view.setErrorOnWidgetAmount(null); |
|
|
view.setErrorOnWidgetAmount(null); |
|
|
isValidSendAmount = true; |
|
|
isValidSendAmount = true; |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
@ -578,6 +539,8 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti |
|
|
view.showViewDependentOnBankAccountNo(true); |
|
|
view.showViewDependentOnBankAccountNo(true); |
|
|
view.updateWidgetFullName(data.getRecipientName()); |
|
|
view.updateWidgetFullName(data.getRecipientName()); |
|
|
view.updateWidgetMobileNumber(data.getRecipientPhone()); |
|
|
view.updateWidgetMobileNumber(data.getRecipientPhone()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
} else { |
|
|