IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Patch 2.7.1 applied

master
Preyea Regmi 5 years ago
parent
4d1cae0a44 b1fceb73e8
commit
d20bf0f8d7
8 changed files with 36 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 6
      .idea/encodings.xml
  3. 12
      .idea/modules.xml
  4. 11
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java
  5. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java
  6. 27
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
  7. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
  8. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java

BIN
.idea/caches/build_file_checksums.ser
View File

6
.idea/encodings.xml
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

12
.idea/modules.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" filepath="$PROJECT_DIR$/SpinnerDatePickerLib-release/SpinnerDatePickerLib-release.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/gme-android.iml" filepath="$PROJECT_DIR$/.idea/gme-android.iml" />
<module fileurl="file://$PROJECT_DIR$/httpclient-release/httpclient-release.iml" filepath="$PROJECT_DIR$/httpclient-release/httpclient-release.iml" />
<module fileurl="file://$PROJECT_DIR$/securitykeypad/securitykeypad.iml" filepath="$PROJECT_DIR$/securitykeypad/securitykeypad.iml" />
</modules>
</component>
</project>

11
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/PaymentBankModel.java
View File

@ -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;

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientlistingV3/ReceiverInfoV3Model.java
View File

@ -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);
}

27
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
View File

@ -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;
}
}

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/add/RecipientAddV3Presenter.java
View File

@ -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 = "";

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/edit/RecipientEditV3Presenter.java
View File

@ -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 = "";

Write Preview
Loading…
Cancel
Save