From b1fceb73e846cec13a07c9890d56d92e1e96a652 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Thu, 21 Nov 2019 15:11:14 +0545 Subject: [PATCH] Reciever add/edit payoutPartner override mechanism added --- .idea/caches/build_file_checksums.ser | Bin 662 -> 662 bytes .idea/modules.xml | 4 --- .../dynamicvalidation/PaymentBankModel.java | 11 +++++++ .../ReceiverInfoV3Model.java | 3 +- .../RecipientDetailValidatorV3.java | 27 +++++++++++------- .../add/RecipientAddV3Presenter.java | 2 +- .../edit/RecipientEditV3Presenter.java | 2 +- 7 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b6b5b1f72b34c6e4ba1e626cc5de80d88e0b259d..5d1e71c92966a158d820a0f61f7204615d111e32 100644 GIT binary patch delta 44 zcmV+{0Mq}L1(pSnm;{X?#9fh`-jluoMw5C0M3V#pIFo7uD+6=@5tESt8 - - - - diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java index 166a5c85..6f0f90ae 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java @@ -10,6 +10,9 @@ public class PaymentBankModel { @SerializedName("Id") @Expose private String id; + @SerializedName("PayoutPartner") + @Expose + private String payoutPartner; @SerializedName("Code") @Expose private String code; @@ -96,6 +99,14 @@ public class PaymentBankModel { this.branchRequired = branchRequired; } + public String getPayoutPartner() { + return payoutPartner; + } + + public void setPayoutPartner(String payoutPartner) { + this.payoutPartner = payoutPartner; + } + @Override public String toString() { return this.name; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java index 86f0546d..a1008ee1 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java @@ -394,8 +394,6 @@ public class ReceiverInfoV3Model implements Parcelable { } - - public void updateSelectedBank(PaymentBankModel selectedBank) { AgentV3Model agentV3Model = new AgentV3Model(); agentV3Model.setId(selectedBank.getId()); @@ -404,6 +402,7 @@ public class ReceiverInfoV3Model implements Parcelable { if (agent != null) agentV3Model.setAccountNo(agent.getAccountNo()); + setAgent(agentV3Model); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java index 7be24946..04752e8a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java @@ -497,6 +497,11 @@ public class RecipientDetailValidatorV3 { view.setErrorOnWidgetBank(null); + if (selectedBank.getPayoutPartner() != null && selectedBank.getPayoutPartner().length() > 0) + recipientInfo.setPayoutPartner(selectedBank.getPayoutPartner()); + else + recipientInfo.setPayoutPartner(availableDynamicValidationModel.getPayoutPartner()); + //After successfull update of selected bank, determine weather it has corresponding dependency or not. // If dependency are there, override thee validation rule and manage the data @@ -1107,12 +1112,12 @@ public class RecipientDetailValidatorV3 { case FIELD_ID_NUMBER: if (rule.isFieldRequired() && !rule.isOptional()) - updateIdNumber(recipientInfo.getIdNumber()); + updateIdNumber(recipientInfo.getIdNumber()); break; case FIELD_FIRST_NAME: if (rule.isFieldRequired() && !rule.isOptional()) - updateFirstName(recipientInfo.getFirstName()); + updateFirstName(recipientInfo.getFirstName()); break; @@ -1124,33 +1129,33 @@ public class RecipientDetailValidatorV3 { case FIELD_LAST_NAME: if (rule.isFieldRequired() && !rule.isOptional()) - updateLastName(recipientInfo.getLastName()); + updateLastName(recipientInfo.getLastName()); break; case FIELD_FULL_NAME: if (rule.isFieldRequired() && !rule.isOptional()) - updateFullName(recipientInfo.getFullName()); + updateFullName(recipientInfo.getFullName()); break; case FIELD_FIRST_NAME_IN_LOCAL: if (rule.isFieldRequired() && !rule.isOptional()) - updateFirstNameLocal(recipientInfo.getLocalFirstName()); + updateFirstNameLocal(recipientInfo.getLocalFirstName()); break; case FIELD_MIDDLE_NAME_IN_LOCAL: if (rule.isFieldRequired() && !rule.isOptional()) - updateMiddleNameLocal(recipientInfo.getLocalMiddleName()); + updateMiddleNameLocal(recipientInfo.getLocalMiddleName()); break; case FIELD_LAST_NAME_IN_LOCAL: if (rule.isFieldRequired() && !rule.isOptional()) - updateLastNameLocal(recipientInfo.getLocalLastName()); + updateLastNameLocal(recipientInfo.getLocalLastName()); break; case FIELD_LOCAL_NAME: if (rule.isFieldRequired() && !rule.isOptional()) - updateLocalFullName(recipientInfo.getLocalFullName()); + updateLocalFullName(recipientInfo.getLocalFullName()); break; case FIELD_MOBILE_NUMBER: @@ -1163,18 +1168,18 @@ public class RecipientDetailValidatorV3 { case FIELD_CITY: if (rule.isFieldRequired() && !rule.isOptional()) - updateCity(recipientInfo.getCity()); + updateCity(recipientInfo.getCity()); break; case FIELD_ADDRESS: if (rule.isFieldRequired() && !rule.isOptional()) - updateAddress(recipientInfo.getAddress()); + updateAddress(recipientInfo.getAddress()); break; case FIELD_EMAIL: if (rule.isFieldRequired() && !rule.isOptional()) - updateEmail(recipientInfo.getEmail()); + updateEmail(recipientInfo.getEmail()); break; } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java index 426f48af..c3d4ef07 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java @@ -181,7 +181,7 @@ public class RecipientAddV3Presenter extends RecipientAddEditBaseV3Presenter { String country = validator.getRecipientDetail().getCountryCode(); String accountType = "1"; String amount = "10000.0"; - String payoutPartner = validator.getAvailableDynamicValidationModel().getPayoutPartner(); + String payoutPartner = validator.getRecipientDetail().getPayoutPartner(); String processId = ""; String bankId = ""; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java index bca33228..84fe811b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java @@ -197,7 +197,7 @@ public class RecipientEditV3Presenter extends RecipientAddEditBaseV3Presenter { String country = validator.getRecipientDetail().getCountryCode(); String accountType = "1"; String amount = "10000.0"; - String payoutPartner = validator.getAvailableDynamicValidationModel().getPayoutPartner(); + String payoutPartner = validator.getRecipientDetail().getPayoutPartner(); String processId = ""; String bankId = "";