IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

DomesticRemit BL fixes

master
Preyea Regmi 5 years ago
parent
24ea672a9f
commit
67095b74c6
5 changed files with 53 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/gateway/DomesticRemitGateway.java
  3. 73
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
  4. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java
  5. 8
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java

BIN
.idea/caches/build_file_checksums.ser
View File

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/gateway/DomesticRemitGateway.java
View File

@ -51,8 +51,8 @@ public class DomesticRemitGateway extends PrivilegedGateway implements DomesticR
public Observable<ResponseBody> verifyKFTCBank(String auth, String customerId, String recieverBankCode, String recieverAccountNo) {
JsonObject jsonObject=new JsonObject();
jsonObject.addProperty("CustomerId",customerId);
jsonObject.addProperty("RecipientBankCode",recieverBankCode);
jsonObject.addProperty("RecipientAccountNo",recieverAccountNo);
jsonObject.addProperty("BankCode",recieverBankCode);
jsonObject.addProperty("AccountNumber",recieverAccountNo);
return HttpClientV2.getInstance().verifyAutoDebitBank(auth,jsonObject);
}

73
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterImpl.java
View File

@ -22,7 +22,9 @@ import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2;
import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel;
import com.gmeremit.online.gmeremittance_native.utils.security.SecurityUtils;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
@ -48,15 +50,15 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
@Override
public void getDomesticRemitRelatedInfo() {
// compositeDisposable.add(
// this.gateway.getDomesticRelatedData(gateway.getAuth(), gateway.getUserID())
// .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .doFinally(() -> view.showProgressBar(false, ""))
// .subscribeWith(new DomesticRelatedDataObserver())
// );
mockDomesticRemitRelatedData();
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())
);
// mockDomesticRemitRelatedData();
}
@ -181,15 +183,15 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
@Override
public void getRecipientDetailOnAccountNoValidated() {
// compositeDisposable.add(
// this.gateway.verifyKFTCBank(gateway.getAuth(), gateway.getUserID(),domesticRemitDataValidator.selectedRecipientBank.getBankCode(),domesticRemitDataValidator.bankAcNo)
// .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .doFinally(() -> view.showProgressBar(false, ""))
// .subscribeWith(new VerifyKFTCAccountObserver())
// );
mockAccountValidationSuccess();
compositeDisposable.add(
this.gateway.verifyKFTCBank(gateway.getAuth(), gateway.getUserIDNumber(),domesticRemitDataValidator.selectedRecipientBank.getBankCode(),domesticRemitDataValidator.bankAcNo)
.doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doFinally(() -> view.showProgressBar(false, ""))
.subscribeWith(new VerifyKFTCAccountObserver())
);
// mockAccountValidationSuccess();
}
@ -197,10 +199,10 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
DomesticReicipientInfoDTO data = gateway.getMockedDomesticRecipientInfo(view.getContext());
String message = "Do you want to send money to xxx?";
String formattedMessage = message.replace("xxx", data.getRecipientName());
String message = "The provided account number is associated with name \"ooo\". Do you want to continue?";
String formattedMessage = message.replace("ooo", data.getRecipientName());
view.promptToConfirmRecipientName(formattedMessage, new GenericPromptDialog.GenericDialogPromptListener() {
view.promptToConfirmRecipientName(getStringfromStringId(R.string.important_text),formattedMessage, new GenericPromptDialog.GenericDialogPromptListener() {
@Override
public void onNegativeBtnPressed() {
@ -426,7 +428,7 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
//Business requirement, not checking lower bound as it will be handled by server
// else if (formattedCurrentBalance <=formattedServiceCharge || netSendingAmount > formattedCurrentBalance)
else if (netSendingAmount > formattedCurrentBalance) {
view.setErrorOnWidgetAmount("You don't have sufficient amount to do the transaciton");
view.setErrorOnWidgetAmount("You don't have sufficient amount to do the transaction");
isValidSendAmount = false;
} else {
//User sending Amount is valid
@ -466,15 +468,27 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
public class DomesticRelatedDataObserver extends GenericApiObserverResponseV2<DomesticRemitRelatedInfoDTO> {
@Override
protected Type getDataType() {
return TypeToken.getParameterized(DomesticRemitRelatedInfoDTO.class).getType();
}
@Override
protected void onSuccess(GenericResponseDataModel<DomesticRemitRelatedInfoDTO> t) {
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
String serviceCharge = gateway.getMockedDomesticRelatedData(view.getContext()).getServiceFee();
String serviceCharge = t.getData().getServiceFee();
domesticRemitDataValidator.setServiceCharge(serviceCharge);
String messageServiceCharge = "Service charge: " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceCharge) + " KRW";
String messageServiceCharge = "Service charge: " + Utils.formatCurrencyWithoutTruncatingDecimal(serviceCharge) + " " + Constants.KRW_STRING;
view.updateServiceCharge(messageServiceCharge);
if(t.getData().getAccountList()==null||t.getData().getAccountList().size()<1)
{
String message="Please register an auto-debit account inorder to use this service.";
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
}
} else {
view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
}
@ -505,10 +519,10 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
DomesticReicipientInfoDTO data = t.getData();
String message = "Do you want to send money to xxx?";
String formattedMessage = message.replace("xxx", data.getRecipientName());
String message = "The provided account number is associated with name \"ooo\". Do you want to continue?";
String formattedMessage = message.replace("ooo", data.getRecipientName());
view.promptToConfirmRecipientName(formattedMessage, new GenericPromptDialog.GenericDialogPromptListener() {
view.promptToConfirmRecipientName(getStringfromStringId(R.string.important_text),formattedMessage, new GenericPromptDialog.GenericDialogPromptListener() {
@Override
public void onNegativeBtnPressed() {
@ -546,6 +560,11 @@ public class DomesticRemitPresenterImpl extends BasePresenter implements Domesti
public class KFTCAccountBalanceObserver extends GenericApiObserverResponseV2<KFTCBalanceCheckDTO> {
@Override
protected Type getDataType() {
return TypeToken.getParameterized(KFTCBalanceCheckDTO.class).getType();
}
@Override
protected void onSuccess(GenericResponseDataModel<KFTCBalanceCheckDTO> t) {
if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/presenter/DomesticRemitPresenterInterface.java
View File

@ -79,7 +79,7 @@ public interface DomesticRemitPresenterInterface extends BasePresenterInterface
void onRecipientBankAndAccountNoValidated(boolean validAccountNoAndBank);
void promptToConfirmRecipientName(String message, GenericPromptDialog.GenericDialogPromptListener callback);
void promptToConfirmRecipientName(String title,String message, GenericPromptDialog.GenericDialogPromptListener callback);
void showViewDependentOnBankAccountNo(boolean action);

8
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java
View File

@ -497,10 +497,10 @@ public class DomesticRemitActivity extends BaseActivity implements DomesticRemit
}
@Override
public void promptToConfirmRecipientName(String message, GenericPromptDialog.GenericDialogPromptListener callback) {
public void promptToConfirmRecipientName(String title,String message, GenericPromptDialog.GenericDialogPromptListener callback) {
GenericPromptDialog autoDebitRenewalPromptDialog = new GenericPromptDialog();
autoDebitRenewalPromptDialog.setBodyMessage(message);
autoDebitRenewalPromptDialog.setTitleMessage(getString(R.string.important_text));
autoDebitRenewalPromptDialog.setTitleMessage(title);
autoDebitRenewalPromptDialog.setIconsRes(R.drawable.alert);
autoDebitRenewalPromptDialog.setListener(callback);
if (!autoDebitRenewalPromptDialog.isAdded())
@ -557,10 +557,10 @@ public class DomesticRemitActivity extends BaseActivity implements DomesticRemit
presenter.onSenderAccountSelected(account);
senderAccountListingDialog.dismiss();
});
senderAccountListingDialog.setHintAndTitle(getString(R.string.search_language_text), getString(R.string.select_language_text), getString(R.string.no_language_found_text));
senderAccountListingDialog.setHintAndTitle(getString(R.string.search_account_text), getString(R.string.select_account_text), getString(R.string.no_account_found_text));
senderAccountListingDialog.disableSearch(false);
if (!senderAccountListingDialog.isAdded())
senderAccountListingDialog.show(getSupportFragmentManager(), "COUNTRY CHOOSER");
senderAccountListingDialog.show(getSupportFragmentManager(), "AccountSelector");
}
}

Write Preview
Loading…
Cancel
Save