Browse Source

Allow to proceed to SendMoney on basic of isForceUpdate flag - Android

new_design
Mukesh Dhungana 2 years ago
parent
commit
4bc8feb2c3
  1. 12
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java
  2. 20
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java
  3. 1
      app/src/main/res/values/strings.xml

12
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/ReceiverInfoV3Model.java

@ -120,6 +120,10 @@ public class ReceiverInfoV3Model implements Parcelable {
@Expose
private boolean hasVerifiedOTP;
@SerializedName("isForceUpdate")
@Expose
private String isForceUpdate;
public boolean getHasVerifiedOTP() {
return hasVerifiedOTP;
}
@ -392,6 +396,14 @@ public class ReceiverInfoV3Model implements Parcelable {
this.isPartnerChanged = isPartnerChanged;
}
public String getIsForceUpdate() {
return isForceUpdate;
}
public void setIsForceUpdate(String isForceUpdate) {
this.isForceUpdate = isForceUpdate;
}
public void updateSelectedServiceTypeData(ServiceTypeModel selectedServiceType) {
this.agent = new AgentV3Model(selectedServiceType.getId(), selectedServiceType.getDescription(), "", null, "");
printLog();

20
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java

@ -32,8 +32,6 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
private List<ReceiverInfoV3Model> availableRecipientList;
public RecipientListingV3Presenter(RecipientListingV3ContractInterface view, RecipientListingV3InteractorInterface.RecipientListingV3GatewayInterface gatewayInterface) {
this.view = view;
this.gateway = gatewayInterface;
@ -70,7 +68,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
@Override
public void verifyEmailCode(String OTP) {
compositeDisposable.add( gateway.verifyEmailCode(
compositeDisposable.add(gateway.verifyEmailCode(
gateway.getBasicAuth(view.getContext()),
gateway.getUserID(),
OTP,
@ -120,13 +118,15 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
@Override
public void saveSelectedRecipientInfomation(ReceiverInfoV3Model recipientInfoModel) {
if (recipientInfoModel.getPaymentMethod() == null || recipientInfoModel.hasPartnerChanged()) {
if (recipientInfoModel.getPaymentMethod() == null || recipientInfoModel.hasPartnerChanged() || recipientInfoModel.getIsForceUpdate().equals("Y")) {
String message = "";
if (recipientInfoModel.getPaymentMethod() != null && recipientInfoModel.getPaymentMethod().getId() == null)
if (recipientInfoModel.getIsForceUpdate().equals("Y")) {
message = getStringfromStringId(R.string.recipient_force_update_prompt_text);
} else if (recipientInfoModel.getPaymentMethod() != null && recipientInfoModel.getPaymentMethod().getId() == null)
message = getStringfromStringId(R.string.recipient_profile_update_prompt_text);
else
message = getStringfromStringId(R.string.recipient_bank_update_prompt_text);
view.promptToEditRecipient(new GenericPromptDialog.GenericDialogPromptListener() {
view.promptToEditRecipient(new GenericPromptDialog.GenericDialogPromptListener() {
@Override
public void onNegativeBtnPressed() {
@ -188,7 +188,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
@Override
public void requestForOtp(ReceiverInfoV3Model recipientInfoModel) {
this.selectedRecipient=recipientInfoModel;
this.selectedRecipient = recipientInfoModel;
compositeDisposable.add(
this.gateway.requestForOtp(
gateway.getBasicAuth(view.getContext()),
@ -282,7 +282,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
Runnable task;
public RequestEmailCodeObserver(Runnable task) {
this.task=task;
this.task = task;
}
@Override
@ -324,9 +324,9 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
saveSelectedRecipientInfomation(selectedRecipient);
} else {
if(t.getErrorCode().equalsIgnoreCase(Constants.OPT_EXPIRED_CODE_V2)){
if (t.getErrorCode().equalsIgnoreCase(Constants.OPT_EXPIRED_CODE_V2)) {
view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> requestForOtp(selectedRecipient));
}else{
} else {
view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
}

1
app/src/main/res/values/strings.xml

@ -601,5 +601,6 @@
<string name="choose_language_text" translatable="false">Choose Language</string>
<string name="cancel_transaction_text" translatable="false">Cancel Transaction</string>
<string name="recipient_force_update_prompt_text" translatable="false">Please update receiver details before sending transaction!</string>
</resources><!---->
Loading…
Cancel
Save