Max threshold validation added

4 years ago · 9c60dc94b2
16 changed files with 42 additions and 60 deletions
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
@ -55,6 +55,8 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
    private List<DomesticAccountsDTO> availableAccountList;
    private List<PaymentSourceDTO> paymentSourceList;
    private final PaymentSourceSelectionInteractorInterface.PaymentSourceSelectionGatewayInterface paymentSourceSelectionGateway;
+    private final double MAX_SENDING_AMOUNT=6500000.0;
+


    public DomesticRemitPresenterImpl(DomesticRemitContractInterface view, DomesticRemitGatewayInterface gatewayInterface, PaymentSourceSelectionInteractorInterface.PaymentSourceSelectionGatewayInterface paymentSourceSelectionGateway) {
@ -69,15 +71,6 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti

    @Override
    public void getDomesticRemitRelatedInfo() {
-//        compositeDisposable.add(
-//                this.gateway.getDomesticRelatedData(gateway.getAuth(), gateway.getUserIDNumber())
-//                        .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
-//                        .subscribeOn(Schedulers.io())
-//                        .observeOn(AndroidSchedulers.mainThread())
-//                        .doFinally(() -> view.showProgressBar(false, ""))
-//                        .subscribeWith(new DomesticRelatedDataObserver())
-//        );
-

        this.compositeDisposable.add(
                Observable.zip(
@ -334,38 +327,6 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
            this.serviceCharge = serviceCharge;
        }

-        //        public void validateSenderAccount(DomesticAccountsDTO selectedAccount) {
-//            currentBalance = null;
-//
-//            if (selectedAccount == null) {
-//                view.setErrorOnWidgetSenderAccount("Please select an account");
-//                view.showSelectedSenderAccount("");
-//                isValidSenderAccount = false;
-//            } else {
-//                this.selectedSenderAccount = selectedAccount;
-//                view.setErrorOnWidgetSenderAccount(null);
-//                view.showSelectedSenderAccount(selectedAccount.toString());
-//                isValidSenderAccount = true;
-//
-//                String serviceChargeOnBasisOnType = "";
-//                if ("autodebit".equalsIgnoreCase(selectedSenderAccount.getType()))
-//                    serviceChargeOnBasisOnType = serviceCharge;
-//                else
-//                    serviceChargeOnBasisOnType = serviceChargeWallet;
-//
-//                String messageServiceCharge = getStringfromStringId(R.string.transfer_charge_text) + ": " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceChargeOnBasisOnType) + " " + Constants.KRW_STRING;
-//                view.updateServiceCharge(messageServiceCharge);
-//
-//                if (sendAmount != null && sendAmount.length() > 0)
-//                    validateSendAmount(sendAmount);
-//
-//
-//            }
-//            validateAll();
-//
-//            view.showCheckBalanceButton(true);
-//
-//        }
        public void validateSenderAccount(PaymentSourceDTO selectedAccount) {
            currentBalance = null;

@ -412,7 +373,15 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
                view.setErrorOnWidgetAmount(getStringfromStringId(R.string.amount_minimum_error_text));
                view.showDeductionAmount("");
                isValidSendAmount = false;
-            } else {
+            }
+            else if(sendAmountFormatted>MAX_SENDING_AMOUNT)
+            {
+                String maxAmountErrorHint=getStringfromStringId(R.string.amount_max_error_text).replaceAll("xxx",Utils.formatCurrency(MAX_SENDING_AMOUNT+""));
+                view.setErrorOnWidgetAmount(maxAmountErrorHint);
+                view.showDeductionAmount("");
+                isValidSendAmount = false;
+            }
+            else {
                view.setErrorOnWidgetAmount(null);
                isValidSendAmount = true;
                calcDeductionAmount();
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java
@ -25,8 +25,9 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
    private final WithdrawV2GatewayInterface gateway;
    private final CompositeDisposable compositeDisposables;
    private RefundRelatedMetaDataModel refundRelatedData;
+    private final double MAX_SENDING_AMOUNT=6500000.0;

-    public WithdrawV2Presenter(WithdrawV2ContractInterface view,WithdrawV2GatewayInterface gateway) {
+    public WithdrawV2Presenter(WithdrawV2ContractInterface view, WithdrawV2GatewayInterface gateway) {
        this.view = view;
        this.gateway = gateway;
        compositeDisposables = new CompositeDisposable();
@ -79,8 +80,16 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
        if (inputAmount < minAmount) {
            view.showToastMessage("Amount cannot be minimum than " + Utils.formatCurrency(Utils.removeSpecialCharacterAndDecimalFromCurrency(minAmount + "")));
            return false;
-        } else
-            return true;
+        }
+
+        if (inputAmount > MAX_SENDING_AMOUNT) {
+            String maxAmountErrorHint=getStringfromStringId(R.string.amount_max_error_text).replaceAll("xxx",Utils.formatCurrency(MAX_SENDING_AMOUNT+""));
+
+            view.showToastMessage(maxAmountErrorHint);
+            return false;
+        }
+
+        return true;

    }

@ -89,7 +98,7 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres

        compositeDisposables.add(
                this.gateway.getWithdrawRelatedData(this.gateway.getUserID(), this.gateway.getAuth())
-                        .doOnSubscribe(action ->  view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
+                        .doOnSubscribe(action -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                        .subscribeOn(Schedulers.io())
                        .observeOn(AndroidSchedulers.mainThread())
                        .doFinally(() -> view.showProgressBar(false, ""))
@ -114,8 +123,8 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres

                if (refundRelatedMetaDataResponse.getData() != null) {
                    refundRelatedData = refundRelatedMetaDataResponse.getData();
-                    view.updateAvailableBalance(getStringfromStringId(R.string.available_balance_text)+" : " + Utils.formatCurrency(refundRelatedData.getCurrentBalance()) + " KRW");
-                    view.updateServiceCharge(getStringfromStringId(R.string.per_refund_bank_charge)+" : " + Utils.formatCurrency(refundRelatedData.getRefundCharge()) + " KRW");
+                    view.updateAvailableBalance(getStringfromStringId(R.string.available_balance_text) + " : " + Utils.formatCurrency(refundRelatedData.getCurrentBalance()) + " KRW");
+                    view.updateServiceCharge(getStringfromStringId(R.string.per_refund_bank_charge) + " : " + Utils.formatCurrency(refundRelatedData.getRefundCharge()) + " KRW");
                } else
                    view.showPopUpMessage("Invalid data. Please contact support", CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());

--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -728,6 +728,6 @@

    <string name="confirm_coupon_text">কনফার্ম</string>
    <string name="cancel_coupon_text">বাতিল</string>
-    <string name="gme_fraud_warning_text">2. GME Remittamce জালিয়াতি সতর্কতা</string>
+    <string name="gme_fraud_warning_text">2. জালিয়াতি সতর্কতা</string>

 </resources>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -694,5 +694,6 @@

    <string name="confirm_coupon_text">Setuju</string>
    <string name="cancel_coupon_text">Batal</string>
+    <string name="gme_fraud_warning_text">2. Peringatan Penipuan</string>

 </resources>
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@ -764,6 +764,6 @@

    <string name="confirm_coupon_text">ទទួលយក</string>
    <string name="cancel_coupon_text">លុបចោល</string>
-    <string name="gme_fraud_warning_text">2. សូមប្រយ័ត្នទៅលើការក្លែងបន្លំផ្ទេរប្រាក់ តាមGME</string>
+    <string name="gme_fraud_warning_text">2. សូមប្រយ័ត្នទៅលើការឆបោកទៅលើការផ្ទេរប្រាក់</string>

 </resources>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -766,7 +766,7 @@

    <string name="confirm_coupon_text">승인</string>
    <string name="cancel_coupon_text">취소</string>
-    <string name="gme_fraud_warning_text">2. GME 송금 사기 주의</string>
+    <string name="gme_fraud_warning_text">2.  송금 사기 주의</string>


 </resources>
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@ -758,5 +758,6 @@

    <string name="confirm_coupon_text">Батлах</string>
    <string name="cancel_coupon_text">Цуцлах</string>
+    <string name="gme_fraud_warning_text">2. Залилангаас сэрэмжлэх</string>

 </resources>
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@ -438,6 +438,6 @@

    <string name="confirm_coupon_text">အတည္ျပဳရန္</string>
    <string name="cancel_coupon_text">ဖ်က္သိမ္းရန္</string>
-    <string name="gme_fraud_warning_text">2. ငွေကြေးဆိုင်ရာ လိမ်လည်မှုများသတိပြုရန်</string>
+    <string name="gme_fraud_warning_text">2. ေငြေၾကးဆိုင္ရာ လိမ္လည္မွုမ်ားသတိျပဳရန္</string>

 </resources>
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@ -761,7 +761,7 @@

    <string name="confirm_coupon_text">निश्चित गर्नु</string>
    <string name="cancel_coupon_text">रद्द गर्नु</string>
-    <string name="gme_fraud_warning_text">2. GME रेमिट्यान्स: ठगी चेतावनी</string>
+    <string name="gme_fraud_warning_text">2. रेमिट्यान्स फ्रड सावधानी</string>


 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -731,7 +731,7 @@

    <string name="confirm_coupon_text">Подтверждение</string>
    <string name="cancel_coupon_text">Отмена</string>
-    <string name="gme_fraud_warning_text">2. GME REMITTANCE: Предупреждение о мошенничестве</string>
+    <string name="gme_fraud_warning_text">2. Предупреждение о мошенничествах</string>


 </resources>
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@ -753,6 +753,6 @@

    <string name="confirm_coupon_text">තහවුරු කරන්න</string>
    <string name="cancel_coupon_text">අවලංගු කරන්න</string>
-    <string name="gme_fraud_warning_text">2. GME Remittance වංචා අනතුරු ඇඟවීම</string>
+    <string name="gme_fraud_warning_text">2. වංචා අනතුරු ඇඟවීම</string>

 </resources>
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@ -717,6 +717,6 @@

    <string name="confirm_coupon_text">ยืนยัน</string>
    <string name="cancel_coupon_text">ยกเลิก</string>
-    <string name="gme_fraud_warning_text">2. GME ประกาศเตือนภัยมิจฉาชีพ</string>
+    <string name="gme_fraud_warning_text">2. ประกาศเตือนภัยมิจฉาชีพ</string>

 </resources>
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@ -556,5 +556,6 @@

    <string name="confirm_coupon_text">تصدیق کریں</string>
    <string name="cancel_coupon_text">منسوخ کریں</string>
+    <string name="gme_fraud_warning_text">2. فراڈ کی وارننگ</string>

 </resources>
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@ -716,7 +716,7 @@
    <string name="will_proceed_to_check_otp_title_text">OTP tekshiruviga o\'tish</string>
    <string name="new_otp_number_has_sent_text">Yangi OTP kod jo\'natildi</string>
    <string name="verification_completed_title_text">Tasdiqlanish to\'liq yakunlandi</string>
-    <string name="gme_fraud_warning_text">2. GME REMITTANCE: firibgarliklar haqida ogohlantirish</string>
+    <string name="gme_fraud_warning_text">2. Firibgarliklar haqida ogohlantirish</string>


 </resources>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -755,6 +755,6 @@

    <string name="confirm_coupon_text">Xác nhận</string>
    <string name="cancel_coupon_text">Từ chối</string>
-    <string name="gme_fraud_warning_text">"2. Chuyển tiền GME cảnh báo hành vi lừa đảo "</string>
+    <string name="gme_fraud_warning_text">"2. Cảnh báo lừa đảo "</string>

 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -788,10 +788,10 @@
    <string name="will_proceed_to_check_otp_title_text">Will proceed to check OTP</string>
    <string name="new_otp_number_has_sent_text">New OTP number has re-sent</string>
    <string name="verification_completed_title_text">Verification is all completed</string>
-    <string name="gme_fraud_warning_text">2. GME Remittance Fraud Warning</string>
+    <string name="gme_fraud_warning_text">2. Fraud Warning</string>

    <string name="coupon_guideline_title_text">Precautions when using</string>
-    <string name="possessed_coupon_number_text">xxx coupon(s) possessed</string>
+    <string name="possessed_coupon_number_text">xxx coupon(s) Available</string>
    <string name="couponbox_title_text">Couponbox</string>
    <string name="customerranking_title_text">CustomerRanking</string>
    <string name="no_coupon_text">There are no coupon(s)</string>
@ -802,6 +802,7 @@
    <string name="coupon_title_text">Coupon(s)</string>
    <string name="confirm_coupon_text">Confirm</string>
    <string name="cancel_coupon_text">Cancel</string>
+    <string name="amount_max_error_text">Maximum sending amount should not exceed xxx KRW</string>


 </resources>