Browse Source

Domestic remit validation fixes

master
Preyea Regmi 5 years ago
parent
commit
a56f859931
  1. 7
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java

7
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java

@ -151,7 +151,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
public void onValidAmountInputbyUser() { public void onValidAmountInputbyUser() {
view.showViewDependentOnSenderBankAndAmount(true); view.showViewDependentOnSenderBankAndAmount(true);
view.showOkButton(!domesticRemitDataValidator.areAllFormValid()); view.showOkButton(!domesticRemitDataValidator.areAllFormValid());
view.enableOkButton(false);
view.enableVerifyBankButton(domesticRemitDataValidator.isValidRecipientBank&&domesticRemitDataValidator.isValidBankAcNo);
view.listenForAmountFocusChangeOrActionDone(false); view.listenForAmountFocusChangeOrActionDone(false);
} }
@ -175,7 +175,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
} }
private void mockCurrentBalance() { private void mockCurrentBalance() {
String balance="15000";
String balance="150000";
domesticRemitDataValidator.setCurrentBalance(balance); domesticRemitDataValidator.setCurrentBalance(balance);
@ -183,6 +183,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
view.showCheckBalanceButton(false); view.showCheckBalanceButton(false);
domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount(); domesticRemitDataValidator.validateCurrentBalanceWithSendingAmount();
domesticRemitDataValidator.validateAll();
} }
@Override @Override
@ -350,7 +351,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
isValidSendAmount = false; isValidSendAmount = false;
} }
//Businesss requirement, not checking lower bound as it will 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)
else if (netSendingAmount > formattedCurrentBalance) else if (netSendingAmount > formattedCurrentBalance)
{ {

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java

@ -90,7 +90,7 @@ public interface DomesticRemitPresenterInterface extends BasePresenterInterface
void updateWidgetMobileNumber(String mobileNumber); void updateWidgetMobileNumber(String mobileNumber);
void enableSubmitButton(boolean action); void enableSubmitButton(boolean action);
void enableOkButton(boolean action);
void enableVerifyBankButton(boolean action);
void showOkButton(boolean aciton); void showOkButton(boolean aciton);
void updateWidgetAccountNo(String recipientAccount); void updateWidgetAccountNo(String recipientAccount);

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java

@ -376,7 +376,7 @@ public class DomesticRemitActivity extends BaseActivity implements DomesticRemit
} }
@Override @Override
public void enableOkButton(boolean action) {
public void enableVerifyBankButton(boolean action) {
okBtn.setEnabled(action); okBtn.setEnabled(action);
} }

Loading…
Cancel
Save