From 473c13f114957523e4dfc1fcc5a3a3990e1dbb4a Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Mon, 7 Oct 2019 13:32:23 +0900
Subject: [PATCH] Service charge inclusive validation added for domestic
 transfer

---
 .idea/caches/build_file_checksums.ser           | Bin 661 -> 661 bytes
 .../send/model/DomesticAccountsDTO.java         |   5 +++++
 .../presenter/DomesticRemitPresenterImpl.java   |  14 ++++++++++----
 .../main/res/layout/activity_domestic_remit.xml |   6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 86f2a9e04fa9a3541d3c5a6044c3e2002dd0cbea..e3fae6d95af22ca18622c9b86d41364c59fe5970 100644
GIT binary patch
delta 15
XcmbQrI+b<843;IS&oVd8`N;?XGXMtw

delta 15
XcmbQrI+b<843=)YFXuPT`N;?XGkFIz

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticAccountsDTO.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticAccountsDTO.java
index 32441aee..43fff334 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticAccountsDTO.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/model/DomesticAccountsDTO.java
@@ -251,6 +251,11 @@ public class DomesticAccountsDTO {
         this.tokenType = tokenType;
     }
 
+    public boolean isAccountAutoDebitType()
+    {
+       return (type!=null&&type.equalsIgnoreCase("autodebit"));
+    }
+
     @Override
     public String toString() {
         if("autodebit".equalsIgnoreCase(this.type))
diff --git 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
index 21ba2154..2671e129 100644
--- 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
@@ -254,7 +254,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
     @Override
     public void checkBalance() {
         compositeDisposable.add(
-                this.gateway.checkPaymentAccountBalance(gateway.getAuth(), gateway.getUserIDNumber(), domesticRemitDataValidator.selectedSenderAccount.getFintechUseNo(),domesticRemitDataValidator.selectedSenderAccount.getType())
+                this.gateway.checkPaymentAccountBalance(gateway.getAuth(), gateway.getUserIDNumber(), domesticRemitDataValidator.selectedSenderAccount.getFintechUseNo(), domesticRemitDataValidator.selectedSenderAccount.getType())
                         .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
@@ -439,9 +439,15 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
             double formattedSendAmount = Double.parseDouble(sendAmount);
             double formattedServiceCharge = 0.0;
 
-            //Current business requirement:  service charge is not inclusive with net sending amount
-//            if (serviceCharge != null && serviceCharge.length() > 0)
-//                formattedServiceCharge = Double.parseDouble(serviceCharge);
+            if (selectedSenderAccount != null) {
+                if (selectedSenderAccount.isAccountAutoDebitType()) {
+                    if (serviceCharge != null && serviceCharge.length() > 0)
+                        formattedServiceCharge = Double.parseDouble(serviceCharge);
+                } else {
+                    if (serviceChargeWallet != null && serviceChargeWallet.length() > 0)
+                        formattedServiceCharge = Double.parseDouble(serviceChargeWallet);
+                }
+            }
 
             double netSendingAmount = formattedSendAmount + formattedServiceCharge;
 
diff --git a/app/src/main/res/layout/activity_domestic_remit.xml b/app/src/main/res/layout/activity_domestic_remit.xml
index 20f18f55..cc746cf5 100644
--- a/app/src/main/res/layout/activity_domestic_remit.xml
+++ b/app/src/main/res/layout/activity_domestic_remit.xml
@@ -68,7 +68,7 @@
                     android:layout_marginBottom="@dimen/_5sdp"
                     android:id="@+id/currentBalanceTextView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:gravity="center"
@@ -92,7 +92,7 @@
                     android:layout_marginBottom="@dimen/_5sdp"
                     android:id="@+id/checkBalanceTxt"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:background="@drawable/ic_rounded_country_listing_gray"
@@ -115,7 +115,7 @@
                     android:layout_marginBottom="5dp"
                     android:id="@+id/serviceChargeTxtView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
                     android:gravity="center"