diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index bb30cbcd..dfa93d98 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java index 149e234b..e0481017 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java @@ -6,6 +6,8 @@ import android.content.SharedPreferences; import com.gmeremit.online.gmeremittance_native.GmeApplication; import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoModelV2; +import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_PREFERRED_LOCALE; + /** * Created by Preyea * The purpose of this class is to get user related info, updating user related from this class will broadcast update to each observer willing to listen for data change event. @@ -127,6 +129,10 @@ public abstract class PrivilegedGateway implements PrivilegedGatewayInterface { return GmeApplication.getStorage().getString(PrefKeys.USER_PENNY_TEST_STATUS, ""); } + @Override + public String getPreferredLanguage() { + return GmeApplication.getStorage().getString(USER_PREFERRED_LOCALE, "en"); + } /** * diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java index c0839d73..bf01afb4 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java @@ -42,6 +42,8 @@ public interface PrivilegedGatewayInterface extends BaseGatewayInterface { String getPennyTestStatus(); + String getPreferredLanguage(); + boolean isUserKYCVerified(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java index 51dfa599..30bcc591 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java @@ -30,7 +30,7 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override public void requestForPennyTest() { compositeDisposable.add( - this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(),"N") + this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(), "N") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new PennyTestRequestObserver()) @@ -41,14 +41,14 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override public void performPennyTest(String cerNumber) { view.hideKeyBoard(); - new android.os.Handler().postDelayed(()->{ + new android.os.Handler().postDelayed(() -> { compositeDisposable.add( - this.gateway.postDataForPennyTest(this.gateway.getAuth(), this.gateway.getBankAccountNumber(), cerNumber,this.gateway.getUserIDNumber()) + this.gateway.postDataForPennyTest(this.gateway.getAuth(), this.gateway.getBankAccountNumber(), cerNumber, this.gateway.getUserIDNumber()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new PennyTestResultObserver()) ); - },400); + }, 400); } @@ -65,7 +65,7 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override public void requestPennyTestAgain() { compositeDisposable.add( - this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(),"Y") + this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(), "Y") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new PennyTestReRequestObserver(false)) @@ -76,7 +76,7 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override public void requestPennyTestAgainInternally() { compositeDisposable.add( - this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(),"N") + this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(), "N") .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new PennyTestReRequestObserver(true)) @@ -88,7 +88,7 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera gateway.updateLasKnownPennyTestResultMessage(null); } - private void updateFlagOnPennyTestAfterRequest(String id,String message) { + private void updateFlagOnPennyTestAfterRequest(String id, String message) { gateway.cacheAccountId(id); gateway.updatePennyTestStatus("1"); gateway.updateLasKnownPennyTestResultMessage(message); @@ -104,34 +104,30 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override protected void onSuccess(GenericResponseDataModel t) { - if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) - { - view.morphProgressBarIntoButton(()->{ - updateFlagOnPennyTestAfterRequest(t.getId(),t.getData().getMsg()); + if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + view.morphProgressBarIntoButton(() -> { + updateFlagOnPennyTestAfterRequest(t.getId(), t.getData().getMsg()); view.navigateToPennyTestConfirmView(t.getData().getMsg()); }); - } - else - { - view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + } else { + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.morphProgressBarIntoButton(null)); } } @Override public void onFailed(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.morphProgressBarIntoButton(null)); } @Override protected void onConnectionNotEstablished(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.morphProgressBarIntoButton(null)); } } public class PennyTestResultObserver extends GenericApiObserverResponseV2 { - @Override protected Type setType() { return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType(); @@ -139,32 +135,29 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override protected void onSuccess(GenericResponseDataModel t) { - if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) - { - view.morphProgressBarIntoButton(()->{ + if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + view.morphProgressBarIntoButton(() -> { updateFlagOnPennyTestSuccess(); - view.showPopUpMessage(t.getData().getMsg(),CustomAlertDialog.AlertType.SUCCESS,alertType -> { + view.showPopUpMessage(t.getData().getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> { view.onPennyTestSuccess(); }); }); - } - else - { - view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + } else { + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.morphProgressBarIntoButton(null)); } } @Override public void onFailed(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.morphProgressBarIntoButton(null)); } @Override protected void onConnectionNotEstablished(String message) { - view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.morphProgressBarIntoButton(null)); } } @@ -173,8 +166,9 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera private final boolean hasRequestedInternally; public PennyTestReRequestObserver(boolean hasRequestedInternally) { - this.hasRequestedInternally=hasRequestedInternally; + this.hasRequestedInternally = hasRequestedInternally; } + @Override protected Type setType() { return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType(); @@ -182,39 +176,36 @@ public class PennyTestPresenter extends BasePresenter implements PennyTestIntera @Override protected void onSuccess(GenericResponseDataModel t) { - if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) - { - view.morphProgressBarIntoButton(()->{ - updateFlagOnPennyTestAfterRequest(t.getId(),t.getData().getMsg()); - if(hasRequestedInternally) - view.updateDepositedMessage(t.getData().getMsg()); - view.showPopUpMessage(t.getData().getMsg(),CustomAlertDialog.AlertType.SUCCESS,null); + if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { + view.morphProgressBarIntoButton(() -> { + updateFlagOnPennyTestAfterRequest(t.getId(), t.getData().getMsg()); + view.updateDepositedMessage(t.getData().getMsg()); + if (!hasRequestedInternally) + view.showPopUpMessage(t.getData().getMsg(), CustomAlertDialog.AlertType.SUCCESS, null); }); - } - else - { - if(!hasRequestedInternally) - view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + } else { + if (!hasRequestedInternally) + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.morphProgressBarIntoButton(null)); else - view.showPopUpMessage(t.getMsg(),CustomAlertDialog.AlertType.FAILED,alertType->view.exitView()); + view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); } } @Override public void onFailed(String message) { - if(!hasRequestedInternally) - view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.morphProgressBarIntoButton(null)); + if (!hasRequestedInternally) + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.morphProgressBarIntoButton(null)); else - view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,alertType->view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); } @Override protected void onConnectionNotEstablished(String message) { - if(!hasRequestedInternally) - view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.morphProgressBarIntoButton(null)); + if (!hasRequestedInternally) + view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.morphProgressBarIntoButton(null)); else - view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,alertType->view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, alertType -> view.exitView()); } } 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 66d09a17..205e5238 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 @@ -59,12 +59,10 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr private String selectedTransferAmount = null; - - public SendMoneyV2Presenter(SendMoneyV2ContractInterface view, SendMoneyRequiredData sendMoneyRequiredData) { this.view = view; this.selectedRecipient = sendMoneyRequiredData.getRecipientInfoModel(); - this.selectedPaymentType =sendMoneyRequiredData.getSelectedAutoDebitAccount(); + this.selectedPaymentType = sendMoneyRequiredData.getSelectedAutoDebitAccount(); this.gateway = new SendMoneyV2Gateway(this); this.compositeObservable = new CompositeDisposable(); } @@ -113,7 +111,10 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override public String getPaymentModeTitle() { - return getStringfromStringId(R.string.pick_money_text)+" "+ this.selectedRecipient.getCountry() + "?"; + if (this.gateway.getPreferredLanguage().equalsIgnoreCase("ne")) + return this.selectedRecipient.getCountry() + " " + getStringfromStringId(R.string.pick_money_text) + "?"; + else + return getStringfromStringId(R.string.pick_money_text) + " " + this.selectedRecipient.getCountry() + "?"; } @Override @@ -143,7 +144,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr String mobile = this.selectedRecipient.getMobileNumber(); String pCountry = this.selectedRecipient.getCountry(); String pMode = this.selectedPaymentModeData.getMode(); - String pAmount = this.selectedRecievingAmount +" "+ selectedSendingCurrency; + String pAmount = this.selectedRecievingAmount + " " + selectedSendingCurrency; String exRate = this.selectedExRate; String serviceCharge = Utils.formatCurrency(this.selectedTransferFee) + " KRW"; @@ -154,13 +155,12 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr pAgent = selectedBankData.getName(); - return new VerificationViewModel(fullName, address, country, mobile, pCountry, pMode, pAmount, exRate, serviceCharge, pAgent,this.selectedAccountNo); + return new VerificationViewModel(fullName, address, country, mobile, pCountry, pMode, pAmount, exRate, serviceCharge, pAgent, this.selectedAccountNo); } @Override public void setSendingAmount(String sendingAmount, String recipientCurrencyCode, String selectedExRate, String recievingAmount, String transferFee, - boolean shouldCalcByRecipient, String forexId,String transferAmount) - { + boolean shouldCalcByRecipient, String forexId, String transferAmount) { this.selectedSendingAmount = sendingAmount; this.selectedSendingCurrency = recipientCurrencyCode; this.selectedExRate = selectedExRate; @@ -168,7 +168,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr this.selectedTransferFee = transferFee; this.selectedCalcBy = shouldCalcByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER; this.selectedForexId = forexId; - this.selectedTransferAmount=transferAmount; + this.selectedTransferAmount = transferAmount; } @Override @@ -177,7 +177,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr selectedExRate = null; selectedSendingCurrency = null; selectedRecievingAmount = null; - selectedTransferAmount=null; + selectedTransferAmount = null; } @Override @@ -197,7 +197,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override public WebRequestModel getWebRequestDataForTermsAndCondition() { - return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text),"https://online.gmeremit.com/Terms",null); + return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), "https://online.gmeremit.com/Terms", null); } @@ -212,8 +212,8 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr sendMoneyAPIRequestBody.setDeliveryMethodId(selectedPaymentModeData.getId()); - sendMoneyAPIRequestBody.setpAgent((selectedBankData != null )? selectedBankData.getId() : ""); - sendMoneyAPIRequestBody.setpBranch((selectedBankData!=null&& + sendMoneyAPIRequestBody.setpAgent((selectedBankData != null) ? selectedBankData.getId() : ""); + sendMoneyAPIRequestBody.setpBranch((selectedBankData != null && selectedBankData.getBranchRequired().equalsIgnoreCase(Constants.TRUE_STRING) && selectedBranchData != null) ? selectedBranchData.getBranchId() : ""); @@ -221,7 +221,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr sendMoneyAPIRequestBody.setPaymentType(selectedPaymentType.getType()); - sendMoneyAPIRequestBody.setReceiverAccountNo(selectedAccountNo!=null?selectedAccountNo:""); + sendMoneyAPIRequestBody.setReceiverAccountNo(selectedAccountNo != null ? selectedAccountNo : ""); sendMoneyAPIRequestBody.setpCurr(selectedSendingCurrency); sendMoneyAPIRequestBody.setCollAmt(Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount)); @@ -316,7 +316,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr return gateway.sendDataForForexCalculation(gateway.getAuth(), senderCountryId, senderCurrency, recieverCurrency, senderAmount, recieveAmount, paymentMethodId, calculationPreference, recipientCountryName, - recipientCountryID, bankId, paymentPartnerId, gateway.getUserID(),selectedPaymentType.getType()) + recipientCountryID, bankId, paymentPartnerId, gateway.getUserID(), selectedPaymentType.getType()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()); } @@ -365,7 +365,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr @Override protected void onSuccess(SendMoneyTransactionResponseBody sendMoneyResponse) { if (sendMoneyResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { - UserInfoModelV2 userInfoModelV2=new UserInfoModelV2(); + UserInfoModelV2 userInfoModelV2 = new UserInfoModelV2(); userInfoModelV2.setAvailableBalance(sendMoneyResponse.getExtra()); userInfoModelV2.setYearlyLimit(sendMoneyResponse.getExtra2()); gateway.updateUserInfoInBatch(userInfoModelV2); diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 10782cdb..1fee3eae 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -129,7 +129,7 @@ भुक्तनी लिने तरिका रकम विवरण रुजु - प्राप्तकर्ताले कसरी पैसा लिना चाहनुहुन्छ ? + मा प्राप्तकर्ताले कसरी पैसा लिन चाहनुहुन्छ बैंक छान्नुहोस शाखा छान्नुहोस खाता नम्बर