diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java index a6de7208..202fd11e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java @@ -39,6 +39,9 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti private final CompositeDisposable compositeDisposable; private long countDownRemainingValue; + private List availableBankList; + private List availableAccountList; + public DomesticRemitPresenterImpl(DomesticRemitContractInterface view, DomesticRemitGatewayInterface gatewayInterface) { this.view = view; this.gateway = gatewayInterface; @@ -63,13 +66,19 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti } private void mockDomesticRemitRelatedData() { - String serviceCharge = gateway.getMockedDomesticRelatedData(view.getContext()).getServiceFee(); + DomesticRemitRelatedInfoDTO domesticRelatedData = gateway.getMockedDomesticRelatedData(view.getContext()); + String serviceCharge = domesticRelatedData.getServiceFee(); domesticRemitDataValidator.setServiceCharge(serviceCharge); String messageServiceCharge = getStringfromStringId(R.string.service_charge_text)+": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceCharge) + " " + Constants.KRW_STRING; view.updateServiceCharge(messageServiceCharge); + availableBankList=domesticRelatedData.getBankList(); + availableAccountList=domesticRelatedData.getAccountList(); + + domesticRemitDataValidator.validateSenderAccount(availableAccountList.get(0)); + } @@ -241,15 +250,15 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti @Override public void checkBalance() { - compositeDisposable.add( - this.gateway.checkAutoDebitBalance(gateway.getAuth(), gateway.getUserIDNumber(),domesticRemitDataValidator.selectedSenderAccount.getFintechUseNo()) - .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .doFinally(() -> view.showProgressBar(false, "")) - .subscribeWith(new KFTCAccountBalanceObserver()) - ); -// mockCurrentBalance(); +// compositeDisposable.add( +// this.gateway.checkAutoDebitBalance(gateway.getAuth(), gateway.getUserIDNumber(),domesticRemitDataValidator.selectedSenderAccount.getFintechUseNo()) +// .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) +// .subscribeOn(Schedulers.io()) +// .observeOn(AndroidSchedulers.mainThread()) +// .doFinally(() -> view.showProgressBar(false, "")) +// .subscribeWith(new KFTCAccountBalanceObserver()) +// ); + mockCurrentBalance(); } private void mockCurrentBalance() { @@ -485,11 +494,19 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti String messageServiceCharge = getStringfromStringId(R.string.service_charge_text)+": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceCharge) + " " + Constants.KRW_STRING; view.updateServiceCharge(messageServiceCharge); + availableBankList=t.getData().getBankList(); + availableAccountList=t.getData().getAccountList(); + if(t.getData().getAccountList()==null||t.getData().getAccountList().size()<1) { String message=getStringfromStringId(R.string.doesnt_have_auto_debit_text); view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView()); } + else + { + domesticRemitDataValidator.validateSenderAccount(availableAccountList.get(0)); + } + } else { view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java index 91b95559..e6c850f9 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java @@ -163,6 +163,7 @@ public class DomesticRemitActivity extends BaseActivity implements DomesticRemit recipientAccountNoFormInputField.getEditTextView().setRegExInputFilter("[a-zA-Z0-9\\s]+"); senderBankSelectionFormInputField.getEditTextView().setFilters(new InputFilter[]{}); recipientBankSelectionFormInputField.getEditTextView().setFilters(new InputFilter[]{}); + recipientFullNameFormInputField.getEditTextView().setFilters(new InputFilter[]{}); recipientFullNameFormInputField.getEditTextView().setEnabled(false); } diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index 70d8ee30..7737169b 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -34,6 +34,7 @@ android:layout_centerHorizontal="true" />