|
|
@ -67,7 +67,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
this.selectedPaymentType = sendMoneyRequiredData.getSelectedAutoDebitAccount(); |
|
|
|
this.gateway = new SendMoneyV2Gateway(this); |
|
|
|
this.compositeObservable = new CompositeDisposable(); |
|
|
|
countDownRemainingValue=-1; |
|
|
|
countDownRemainingValue = -1; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -90,12 +90,11 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
this.selectedBankData = selectedBank; |
|
|
|
if (selectedBank.getIsAccountRequired().equalsIgnoreCase(Constants.TRUE_STRING)) { |
|
|
|
if (accNo != null && accNo.length() > 0) { |
|
|
|
accNo=accNo.trim(); |
|
|
|
if(Utils.isAlphaNumeric(accNo)) { |
|
|
|
accNo = accNo.trim(); |
|
|
|
if (Utils.isAlphaNumeric(accNo)) { |
|
|
|
this.selectedAccountNo = accNo; |
|
|
|
this.isAccountValidationRequired = selectedBank.getIsAccountValidation().equalsIgnoreCase(Constants.TRUE_STRING); |
|
|
|
} |
|
|
|
else { |
|
|
|
} else { |
|
|
|
errorMessage = getStringfromStringId(R.string.account_no_validation_error_text); |
|
|
|
} |
|
|
|
} else |
|
|
@ -203,7 +202,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
public void onCancelled() { |
|
|
|
|
|
|
|
} |
|
|
|
},countDownRemainingValue); |
|
|
|
}, countDownRemainingValue); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -222,7 +221,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
|
|
|
|
@Override |
|
|
|
public void updateRemainingCountDownValue(long value) { |
|
|
|
this.countDownRemainingValue=value; |
|
|
|
this.countDownRemainingValue = value; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -232,7 +231,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
|
|
|
|
@Override |
|
|
|
public String getTransactionAmount() { |
|
|
|
return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); |
|
|
|
return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -252,9 +251,13 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
selectedBankData.getBranchRequired().equalsIgnoreCase(Constants.TRUE_STRING) |
|
|
|
&& selectedBranchData != null) |
|
|
|
? selectedBranchData.getBranchId() : ""); |
|
|
|
sendMoneyAPIRequestBody.setPayOutPartner(selectedPaymentModeData.getPayoutPartner()); |
|
|
|
sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); |
|
|
|
|
|
|
|
if (selectedBankData != null && selectedBankData.getPayoutPartner() != null && selectedBankData.getPayoutPartner().length() > 0) |
|
|
|
sendMoneyAPIRequestBody.setPayOutPartner(selectedBankData.getPayoutPartner()); |
|
|
|
else |
|
|
|
sendMoneyAPIRequestBody.setPayOutPartner(selectedPaymentModeData.getPayoutPartner()); |
|
|
|
|
|
|
|
sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); |
|
|
|
|
|
|
|
sendMoneyAPIRequestBody.setReceiverAccountNo(selectedAccountNo != null ? selectedAccountNo : ""); |
|
|
|
|
|
|
@ -431,7 +434,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr |
|
|
|
protected void unauthorizedAccess(String message) { |
|
|
|
gateway.clearAllUserData(); |
|
|
|
|
|
|
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout()); |
|
|
|
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|