From 3bfc119b632df9ea7498c41b6f57a02230cbbb61 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Wed, 8 May 2019 14:19:15 +0545 Subject: [PATCH] Payout partner added to bank list and fb link fixes --- .../model/payoutmode/BankList.java | 12 +++++++++ .../presenter/SendMoneyV2Presenter.java | 25 +++++++++++-------- .../static_pages/view/AboutGME.java | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java index f205b04b..934db0d8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/payoutmode/BankList.java @@ -32,6 +32,10 @@ public class BankList { @Expose private List branchList = null; + @SerializedName("PayoutPartner") + @Expose + private String payoutPartner; + public String getId() { return id; } @@ -95,4 +99,12 @@ public class BankList { public void setCode(String code) { this.code = code; } + + public String getPayoutPartner() { + return payoutPartner; + } + + public void setPayoutPartner(String payoutPartner) { + this.payoutPartner = payoutPartner; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java index aa934565..f89f1384 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -67,7 +67,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.selectedPaymentType = sendMoneyRequiredData.getSelectedAutoDebitAccount(); this.gateway = new SendMoneyV2Gateway(this); this.compositeObservable = new CompositeDisposable(); - countDownRemainingValue=-1; + countDownRemainingValue = -1; } @@ -90,12 +90,11 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.selectedBankData = selectedBank; if (selectedBank.getIsAccountRequired().equalsIgnoreCase(Constants.TRUE_STRING)) { if (accNo != null && accNo.length() > 0) { - accNo=accNo.trim(); - if(Utils.isAlphaNumeric(accNo)) { + accNo = accNo.trim(); + if (Utils.isAlphaNumeric(accNo)) { this.selectedAccountNo = accNo; this.isAccountValidationRequired = selectedBank.getIsAccountValidation().equalsIgnoreCase(Constants.TRUE_STRING); - } - else { + } else { errorMessage = getStringfromStringId(R.string.account_no_validation_error_text); } } else @@ -203,7 +202,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr public void onCancelled() { } - },countDownRemainingValue); + }, countDownRemainingValue); } @@ -222,7 +221,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override public void updateRemainingCountDownValue(long value) { - this.countDownRemainingValue=value; + this.countDownRemainingValue = value; } @Override @@ -232,7 +231,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override public String getTransactionAmount() { - return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); + return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); } @@ -252,9 +251,13 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr selectedBankData.getBranchRequired().equalsIgnoreCase(Constants.TRUE_STRING) && selectedBranchData != null) ? selectedBranchData.getBranchId() : ""); - sendMoneyAPIRequestBody.setPayOutPartner(selectedPaymentModeData.getPayoutPartner()); - sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); + if (selectedBankData != null && selectedBankData.getPayoutPartner() != null && selectedBankData.getPayoutPartner().length() > 0) + sendMoneyAPIRequestBody.setPayOutPartner(selectedBankData.getPayoutPartner()); + else + sendMoneyAPIRequestBody.setPayOutPartner(selectedPaymentModeData.getPayoutPartner()); + + sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); sendMoneyAPIRequestBody.setReceiverAccountNo(selectedAccountNo != null ? selectedAccountNo : ""); @@ -431,7 +434,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr protected void unauthorizedAccess(String message) { gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java index 0a3e9e4c..b1e2ab1d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/static_pages/view/AboutGME.java @@ -163,7 +163,7 @@ public class AboutGME extends AppCompatActivity implements StaticPagesContract.I switch (localeCode) { case "en": - return "https://www.facebook.com/gmephilippines/?ref=br_rs"; + return "https://www.facebook.com/gmenepal/?ref=br_rs"; case "km": return "https://www.facebook.com/gmecambodia/?ref=br_rs"; case "ko":