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 2a5866e3..22c268a3 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 @@ -117,7 +117,6 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti remitTxnRequestBody.setKftcAccountId(domesticRemitDataValidator.selectedSenderAccount.getKftcAccountId()); remitTxnRequestBody.setType(domesticRemitDataValidator.selectedSenderAccount.getType()); - Log.d(this.getClass().getSimpleName(), remitTxnRequestBody.toString()); compositeDisposable.add( this.gateway.doDomesticTransaction(gateway.getAuth(), remitTxnRequestBody) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/model/topup/LocalTopUpTxnRequestBodyDTO.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/model/topup/LocalTopUpTxnRequestBodyDTO.java index bb228219..1c6b0a0b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/model/topup/LocalTopUpTxnRequestBodyDTO.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/model/topup/LocalTopUpTxnRequestBodyDTO.java @@ -11,7 +11,9 @@ public class LocalTopUpTxnRequestBodyDTO { @SerializedName("CustomerId") @Expose private String customerId; - + @SerializedName("UserId") + @Expose + private String userId; @SerializedName("ChargeType") @Expose private String chargeType; @@ -25,8 +27,9 @@ public class LocalTopUpTxnRequestBodyDTO { @Expose private String price; - //UseWalletMoney - //UseBalancePrice + @SerializedName("isUseBiometric") + @Expose + private Boolean isUseBiometric; @SerializedName("UseBalancePrice") @Expose private String useWalletMoney; @@ -121,4 +124,20 @@ public class LocalTopUpTxnRequestBodyDTO { public void setAccountType(String accountType) { this.accountType = accountType; } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public Boolean getUseBiometric() { + return isUseBiometric; + } + + public void setUseBiometric(Boolean useBiometric) { + isUseBiometric = useBiometric; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/presenter/topup/LocalTopUpPresenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/presenter/topup/LocalTopUpPresenter.java index 76974de8..c01eff9d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/presenter/topup/LocalTopUpPresenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/topup/local/presenter/topup/LocalTopUpPresenter.java @@ -1,7 +1,5 @@ package com.gmeremit.online.gmeremittance_native.topup.local.presenter.topup; -import android.util.Log; - import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -229,6 +227,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres if (walletBalance != null && walletBalance.length() > 0) { // userCurrentBalance=Utils.formatCurrencyWithoutTruncatingDecimal(walletBalance); + //TODO Dummy userCurrentBalance="20000"; updateBalance(userCurrentBalance); } @@ -256,7 +255,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres view.promptBiometricAuthDialog(new TransactionBiometricPromptDialog.BiometricPromptResultListener() { @Override public void onBiometricAuthSuccess(String password) { - prepareAndPerformRegularTopUpTxn(password); + prepareAndPerformRegularTopUpTxn(password,true); } }); @@ -264,7 +263,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres view.promptPassword(new PasswordPromptListener() { @Override public void onPasswordSubmit(String password) { - prepareAndPerformRegularTopUpTxn(password); + prepareAndPerformRegularTopUpTxn(password,false); } @@ -301,7 +300,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres view.promptBiometricAuthDialog(new TransactionBiometricPromptDialog.BiometricPromptResultListener() { @Override public void onBiometricAuthSuccess(String password) { - prepareAndPerformFixedTopUpTxn(password); + prepareAndPerformFixedTopUpTxn(password,true); } }); @@ -309,7 +308,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres view.promptPassword(new PasswordPromptListener() { @Override public void onPasswordSubmit(String password) { - prepareAndPerformFixedTopUpTxn(password); + prepareAndPerformFixedTopUpTxn(password,false); } @Override @@ -338,7 +337,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres view.promptBiometricAuthDialog(new TransactionBiometricPromptDialog.BiometricPromptResultListener() { @Override public void onBiometricAuthSuccess(String password) { - prepareAndPerformDataTopUpTxn(password); + prepareAndPerformDataTopUpTxn(password,true); } }); @@ -346,7 +345,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres view.promptPassword(new PasswordPromptListener() { @Override public void onPasswordSubmit(String password) { - prepareAndPerformDataTopUpTxn(password); + prepareAndPerformDataTopUpTxn(password,false); } @Override @@ -364,7 +363,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres } - private void prepareAndPerformRegularTopUpTxn(String password) { + private void prepareAndPerformRegularTopUpTxn(String password, boolean isBiometricUsed) { LocalTopUpTxnRequestBodyDTO localTopUpTxnRequestBodyDTO = new LocalTopUpTxnRequestBodyDTO(); localTopUpTxnRequestBodyDTO.setBuyType(REGULAR_CARD_TYPE); localTopUpTxnRequestBodyDTO.setCustomerId(this.gateway.getUserIDNumber()); @@ -376,10 +375,12 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres localTopUpTxnRequestBodyDTO.setPassWord(password); localTopUpTxnRequestBodyDTO.setAccountType(selectedPaymentSource.getType()); localTopUpTxnRequestBodyDTO.setFintechUseNo(selectedPaymentSource.getFintechUseNo()); + localTopUpTxnRequestBodyDTO.setUserId(gateway.getUserID()); + localTopUpTxnRequestBodyDTO.setUseBiometric(isBiometricUsed); performLocalTopupTxn(localTopUpTxnRequestBodyDTO); } - private void prepareAndPerformFixedTopUpTxn(String password) { + private void prepareAndPerformFixedTopUpTxn(String password,boolean isBiometricUsed) { LocalTopUpTxnRequestBodyDTO localTopUpTxnRequestBodyDTO = new LocalTopUpTxnRequestBodyDTO(); localTopUpTxnRequestBodyDTO.setBuyType(FIXED_CARD_TYPE); @@ -401,11 +402,13 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres localTopUpTxnRequestBodyDTO.setAccountType(selectedPaymentSource.getType()); localTopUpTxnRequestBodyDTO.setFintechUseNo(selectedPaymentSource.getFintechUseNo()); + localTopUpTxnRequestBodyDTO.setUserId(gateway.getUserID()); + localTopUpTxnRequestBodyDTO.setUseBiometric(isBiometricUsed); performLocalTopupTxn(localTopUpTxnRequestBodyDTO); } - private void prepareAndPerformDataTopUpTxn(String password) { + private void prepareAndPerformDataTopUpTxn(String password, boolean isBiometricUsed) { LocalTopUpTxnRequestBodyDTO localTopUpTxnRequestBodyDTO = new LocalTopUpTxnRequestBodyDTO(); localTopUpTxnRequestBodyDTO.setBuyType(DATA_PACK_CARD_TYPE); @@ -418,6 +421,8 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres localTopUpTxnRequestBodyDTO.setPassWord(password); localTopUpTxnRequestBodyDTO.setAccountType(selectedPaymentSource.getType()); localTopUpTxnRequestBodyDTO.setFintechUseNo(selectedPaymentSource.getFintechUseNo()); + localTopUpTxnRequestBodyDTO.setUserId(gateway.getUserID()); + localTopUpTxnRequestBodyDTO.setUseBiometric(isBiometricUsed); performLocalTopupTxn(localTopUpTxnRequestBodyDTO); } @@ -668,6 +673,7 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres if (walletBalance != null && walletBalance.length() > 0) { // userCurrentBalance=Utils.formatCurrencyWithoutTruncatingDecimal(walletBalance); + //TODO Dummy userCurrentBalance="45000"; updateBalance(userCurrentBalance); } @@ -728,9 +734,11 @@ public class LocalTopUpPresenter extends BasePresenter implements LocalTopUpPres @Override protected void onSuccess(GenericResponseDataModel t) { + //TODO Dummy updateBalance("40000"); regularTopUpValidator.validateAll(); fixedTopUpValidator.validateAll(); + // if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { // updateBalance(t.getData().getBalanceAmt()); // regularTopUpValidator.validateAll();