diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 537d40fa..fc326400 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2996d531..efb0da98 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,6 +8,15 @@ diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java index 0c401b45..18396078 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java @@ -1,5 +1,7 @@ package com.gmeremit.online.gmeremittance_native.resendV2.presenter.resend; +import android.util.Log; + import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.autodebitV2.model.autodebitaccountlisting.WebRequestModel; import com.gmeremit.online.gmeremittance_native.base.BasePresenter; @@ -46,8 +48,13 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney this.compositeObservable = new CompositeDisposable(); this.previousTransactionRelatedData = previousTransactionRelatedData; this.exRateSubject = BehaviorSubject.create(); + init(); } + private void init() + { + + } @Override public void clearPaymentData() { @@ -79,11 +86,10 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney } @Override - public void setSendingAmount(String sendingAmount, String recipientCurrencyCode, String selectedExRate, String recievingAmount, String transferFee, + public void setSendingAmount(String sendingAmount, String selectedExRate, String recievingAmount, String transferFee, boolean shouldCalcByRecipient, String forexId, String transferAmount) { resendRelatedData.getRemitDetail().setCollAmt(Utils.removeSpecialCharacterAndDecimalFromCurrency(sendingAmount)); - resendRelatedData.getRemitDetail().setTpPCurr(recipientCurrencyCode); resendRelatedData.getRemitDetail().setExRate(selectedExRate); resendRelatedData.getRemitDetail().setTpExRate(selectedExRate); resendRelatedData.getRemitDetail().setPayoutAmt(recievingAmount); @@ -122,7 +128,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney @Override public String getPaymentType() { - return null; + return previousTransactionRelatedData.getSelectedAutoDebitAccount().getType(); } @Override @@ -144,16 +150,13 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney public void performSendMoneyTransaction(String password) { - SendMoneyAPIRequestBody sendMoneyAPIRequestBody = resendRelatedData.getRemitDetail(); - - sendMoneyAPIRequestBody.setIsAgreed(Constants.TRUE_STRING); - sendMoneyAPIRequestBody.setKftcAccountId(previousTransactionRelatedData.getSelectedAutoDebitAccount().getKftcAccountId()); - sendMoneyAPIRequestBody.setPaymentType(previousTransactionRelatedData.getSelectedAutoDebitAccount().getType()); - - sendMoneyAPIRequestBody.setTxnPassword(password); + resendRelatedData.getRemitDetail().setTxnPassword(password); + resendRelatedData.getRemitDetail().setIsAgreed(Constants.TRUE_STRING); + resendRelatedData.getRemitDetail().setKftcAccountId(previousTransactionRelatedData.getSelectedAutoDebitAccount().getKftcAccountId()); + resendRelatedData.getRemitDetail().setPaymentType(previousTransactionRelatedData.getSelectedAutoDebitAccount().getType()); compositeObservable.add( - gateway.performSendMoneyTransaction(gateway.getAuth(), sendMoneyAPIRequestBody) + gateway.performSendMoneyTransaction(gateway.getAuth(), resendRelatedData.getRemitDetail()) .subscribeOn(Schedulers.io()) .doOnSubscribe(d -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text))) .doFinally(() -> view.showProgressBar(false, "")) @@ -174,8 +177,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney @Override - public void getForex(String recieveAmount, String senderAmount, boolean shouldCaulatedByRecipient, String recieverCurrency) { - resendRelatedData.getExRate().setPCurrency(recieverCurrency); + public void getForex(String recieveAmount, String senderAmount, boolean shouldCaulatedByRecipient) { resendRelatedData.getExRate().setCalcBy(shouldCaulatedByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER); resendRelatedData.getExRate().setCAmount(senderAmount); resendRelatedData.getExRate().setPAmount(recieveAmount); @@ -209,6 +211,11 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney @Override protected void onSuccess(GenericResponseDataModel t) { resendRelatedData = t.getData(); + + resendRelatedData.getExRate().setPaymentType(previousTransactionRelatedData.getSelectedAutoDebitAccount().getType()); + resendRelatedData.getExRate().setUserId(gateway.getUserID()); + + Log.d("ResendRelatedData",resendRelatedData.getRemitDetail().toString()); getExRateFromNetwork(); } @@ -243,7 +250,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney @Override public void onComplete() { - exRateSubject.onComplete(); + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java index e31ed204..8ec1c1a0 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2PresenterInterface.java @@ -20,7 +20,7 @@ import io.reactivex.Observable; public interface ReSendMoneyV2PresenterInterface extends BasePresenterInterface { - void getForex(String recieveAmount, String sendMoneyEditTextText, boolean shouldCaulatedByRecipient,String recieverCurrency); + void getForex(String recieveAmount, String sendMoneyEditTextText, boolean shouldCaulatedByRecipient); Observable subscribeToForExChangeEvent(); @@ -29,7 +29,7 @@ public interface ReSendMoneyV2PresenterInterface extends BasePresenterInterface VerificationViewModel getVerificationRelatedData(); - void setSendingAmount(String sendingAmount, String recipientCurrencyCode, String selectedExRate, String recievingAmount, String transferFee, boolean calcBy, String forexId,String transferAmount); + void setSendingAmount(String sendingAmount, String selectedExRate, String recievingAmount, String transferFee, boolean calcBy, String forexId,String transferAmount); void clearExRateData(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java index 10b1ec26..e1899774 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/ReSendMoneyV2Activity.java @@ -22,6 +22,7 @@ import com.gmeremit.online.gmeremittance_native.transactionpasspromt.Transaction import butterknife.BindView; import butterknife.ButterKnife; +import static com.gmeremit.online.gmeremittance_native.resendV2.view.TransactionListingV2Activity.PREV_TXN_RELATED_DATA_BUNDLE_KEY; import static com.gmeremit.online.gmeremittance_native.transactionpasspromt.TransactionPasswordPromptActivity.PAYMENT_TYPE_BUNDLE_KEY; public class ReSendMoneyV2Activity extends BaseActivity implements ReSendMoneyV2PresenterInterface.ReSendMoneyV2ContractInterface, ReSendMoneyActionListener, View.OnClickListener { @@ -55,7 +56,7 @@ public class ReSendMoneyV2Activity extends BaseActivity implements ReSendMoneyV2 private void performDefaultAction(Bundle savedInstanceState) { if (savedInstanceState == null) { try { - reSendMoneyRequiredData = getIntent().getExtras().getParcelable("SOME KEY NAME"); + reSendMoneyRequiredData = getIntent().getParcelableExtra(PREV_TXN_RELATED_DATA_BUNDLE_KEY); } catch (Exception e) { reSendMoneyRequiredData = null; @@ -63,8 +64,8 @@ public class ReSendMoneyV2Activity extends BaseActivity implements ReSendMoneyV2 } else { reSendMoneyRequiredData = savedInstanceState.getParcelable(RESEND_DATA); } - addScreenToSendMoneyOnly(R.layout.fragment_amount_detail_resend_money_v2, false); + getPresenter().getPrepData(); } @@ -100,7 +101,6 @@ public class ReSendMoneyV2Activity extends BaseActivity implements ReSendMoneyV2 private void initialize() { toolbar_title.setText(getString(R.string.resend_money_text)); - getPresenter().getPrepData(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java index 891c30d3..cbcf7888 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/TransactionListingV2Activity.java @@ -18,6 +18,7 @@ import com.gmeremit.online.gmeremittance_native.autodebitV2.view.autodebitaccoun import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; import com.gmeremit.online.gmeremittance_native.resendV2.adapter.TransactionListingRVAdapter; +import com.gmeremit.online.gmeremittance_native.resendV2.model.transactionlisting.PreviousTransactionRelatedData; import com.gmeremit.online.gmeremittance_native.resendV2.model.transactionlisting.TransactionModel; import com.gmeremit.online.gmeremittance_native.resendV2.presenter.transactionlisting.TransactionListingV2Presenter; import com.gmeremit.online.gmeremittance_native.resendV2.presenter.transactionlisting.TransactionListingV2PresenterInterface; @@ -67,7 +68,7 @@ public class TransactionListingV2Activity extends BaseActivity implements Transa private TransactionListingV2PresenterInterface presenter; private TransactionListingRVAdapter adapter; private AutoDebitAccountListingDialog autoDebitAccountListingDialog; - + public static final String PREV_TXN_RELATED_DATA_BUNDLE_KEY="prevTxnDataBundleKey"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -189,9 +190,9 @@ public class TransactionListingV2Activity extends BaseActivity implements Transa autoDebitAccountListingDialog.setListener(new AccountListingRvAdapter.AccountSelectionListener() { @Override public void onAccountSelected(AutoDebitAccount selectedAccount) { - Parcelable resendMoneyRequiredData=presenter.getResendMoneyRequiredData(selectedAccount); + PreviousTransactionRelatedData resendMoneyRequiredData=presenter.getResendMoneyRequiredData(selectedAccount); Intent intent = new Intent(TransactionListingV2Activity.this, ReSendMoneyV2Activity.class); - intent.putExtra(ReSendMoneyV2Activity.RESEND_DATA, resendMoneyRequiredData); + intent.putExtra(PREV_TXN_RELATED_DATA_BUNDLE_KEY, resendMoneyRequiredData); startActivity(intent); if(autoDebitAccountListingDialog !=null&& autoDebitAccountListingDialog.isAdded()) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java index 39e7ef8b..aa69a9e7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java @@ -1,9 +1,6 @@ package com.gmeremit.online.gmeremittance_native.resendV2.view.amountdetail; -import android.app.Activity; -import android.content.Context; import android.os.Bundle; -import android.os.Handler; import android.support.annotation.Nullable; import android.support.v4.view.ViewCompat; import android.text.Editable; @@ -30,9 +27,6 @@ import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.Excha import com.gmeremit.online.gmeremittance_native.exchange_rate.model.datav2.ExchangeCalculationModel; import com.gmeremit.online.gmeremittance_native.resendV2.ReSendMoneyActionListener; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.AmountDetailRelatedDataModel; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.amountdetail.RecipientCurrencyModel; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener; -import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.amountdetail.AmountDetailExRateCountryListingDialog; import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.Utils; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; @@ -41,7 +35,7 @@ import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.disposables.CompositeDisposable; -public class ResendMoneyAmountDetailFragment extends BaseFragment implements View.OnClickListener, TextView.OnEditorActionListener { +public class ResendMoneyAmountDetailFragment extends BaseFragment implements View.OnClickListener, TextView.OnEditorActionListener { @BindView(R.id.amountDetailContinueButton) Button continueBtn; @@ -76,10 +70,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie CompositeDisposable compositeDisposable = null; + ExchangeRateCalcObserver rateCalcObserver; + private Interpolator interpolator; - private AmountDetailRelatedDataModel amountDetailRelatedData; private String selectedTransferFeeAmount; private String selectedExRate; @@ -114,8 +109,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie compositeDisposable = new CompositeDisposable(); interpolator = new AccelerateDecelerateInterpolator(); registerTextWatchers(true); - - + rateCalcObserver = new ExchangeRateCalcObserver(); } @Override @@ -139,25 +133,6 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie } -// @Override -// public void onAttach(Context context) { -// super.onAttach(context); -// ((ReSendMoneyActionListener) context).updateCurrentIndexFrom(R.layout.fragment_amount_detail_send_money_v2); -// } -// -// @Override -// public void onAttach(Activity activity) { -// super.onAttach(activity); -// ((ReSendMoneyActionListener) activity).updateCurrentIndexFrom(R.layout.fragment_amount_detail_send_money_v2); -// -// } -// -// @Override -// public void onDetach() { -// super.onDetach(); -// ((ReSendMoneyActionListener) getActivity()).updateCurrentScreenByLayoutId(R.layout.fragment_amount_detail_send_money_v2); -// -// } @Override public void onDestroy() { @@ -169,20 +144,17 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie } - private void performDefaultAction(Bundle savedInstance) { shouldCaulatedByRecipient = false; - - + compositeDisposable.add(((ReSendMoneyActionListener) getActivity()).getPresenter().subscribeToForExChangeEvent().subscribeWith(rateCalcObserver)); } - private boolean focusOutAndHideKeyboard() { - if(sendMoneyEditText.hasFocus()||recieveMoneyEditText.hasFocus()) - { + private boolean focusOutAndHideKeyboard() { + if (sendMoneyEditText.hasFocus() || recieveMoneyEditText.hasFocus()) { - View currentViewWithFocus=rootView.getFocusedChild(); - if(currentViewWithFocus!=null) + View currentViewWithFocus = rootView.getFocusedChild(); + if (currentViewWithFocus != null) currentViewWithFocus.clearFocus(); hideKeyBoard(); @@ -205,7 +177,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie sendMoneyEditText.clearFocus(); recieveMoneyEditText.clearFocus(); hideKeyBoard(); - ((ReSendMoneyActionListener) getActivity()).getPresenter().setSendingAmount(sendMoneyEditText.getText().toString(), amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode(), selectedExRateWithoutTrunc, selectedRecipientAmount, selectedTransferFeeAmount, shouldCaulatedByRecipient, selectedExRateId,selectedTransferAmount); + ((ReSendMoneyActionListener) getActivity()).getPresenter().setSendingAmount(sendMoneyEditText.getText().toString(), selectedExRateWithoutTrunc, selectedRecipientAmount, selectedTransferFeeAmount, shouldCaulatedByRecipient, selectedExRateId, selectedTransferAmount); ((ReSendMoneyActionListener) getActivity()).showTransactionReviewPage(); } @@ -224,12 +196,9 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie showToastMessage(getString(R.string.receiving_amount_error)); return; } -// compositeDisposable.add( -// ((ReSendMoneyActionListener) getActivity()).getPresenter().getForex( -// recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient, amountDetailRelatedData.getDefaultSelectedCurrency().getCurrencyCode() -// ).doOnSubscribe(d -> showProgressBar(true, getString(R.string.processing_request_text))) -// .subscribeWith(new ExchangeRateCalcObserver()) -// ); + ((ReSendMoneyActionListener) getActivity()).getPresenter().getForex(recieveMoneyEditText.getText().toString(), sendMoneyEditText.getText().toString(), shouldCaulatedByRecipient); + + //TODO request for exchange rates } private void showSelectedCurrency(String selectedCountryCode, String selectedCountryCurrency) { @@ -321,10 +290,10 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie selectedSendAmount = data.getCollAmt(); selectedsendingCurrency = data.getCollCurr(); selectedExRateId = data.getExrateId(); - selectedTransferAmount=data.getsAmt(); + selectedTransferAmount = data.getsAmt(); - String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " ("+getString(R.string.transfer_fee_included_text)+")"; - String exRateDisplay = " " + selectedExRate + " ("+getString(R.string.current_exchange_rate_text)+")"; + String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (" + getString(R.string.transfer_fee_included_text) + ")"; + String exRateDisplay = " " + selectedExRate + " (" + getString(R.string.current_exchange_rate_text) + ")"; showTransferfeeAndExRate(true, transferDisplay, exRateDisplay); showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); @@ -332,10 +301,8 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie } else showPopUpMessage(exchangeCalculationApiResponse.getMsg(), CustomAlertDialog.AlertType.FAILED, null); - } - else - { - scheduleTaskLater(()->{ + } else { + scheduleTaskLater(() -> { showProgressBar(false, ""); if (exchangeCalculationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { ExchangeCalculationModel data = exchangeCalculationApiResponse.getData(); @@ -346,10 +313,10 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie selectedSendAmount = data.getCollAmt(); selectedsendingCurrency = data.getCollCurr(); selectedExRateId = data.getExrateId(); - selectedTransferAmount=data.getsAmt(); + selectedTransferAmount = data.getsAmt(); - String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " ("+getString(R.string.transfer_fee_included_text)+")"; - String exRateDisplay = " " + selectedExRate + " ("+getString(R.string.current_exchange_rate_text)+")"; + String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (" + getString(R.string.transfer_fee_included_text) + ")"; + String exRateDisplay = " " + selectedExRate + " (" + getString(R.string.current_exchange_rate_text) + ")"; showTransferfeeAndExRate(true, transferDisplay, exRateDisplay); showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); @@ -364,13 +331,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie @Override public void onFailed(String message) { - if(isUIReady()) { + if (isUIReady()) { showProgressBar(false, ""); showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); - } - else - { - scheduleTaskLater(()->{ + } else { + scheduleTaskLater(() -> { showProgressBar(false, ""); showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null); }); @@ -379,13 +344,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie @Override protected void onConnectionNotEstablished(String message) { - if(isUIReady()) { + if (isUIReady()) { showProgressBar(false, ""); showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null); - } - else - { - scheduleTaskLater(()->{ + } else { + scheduleTaskLater(() -> { showProgressBar(false, ""); showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null); }); @@ -395,18 +358,17 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie @Override protected void unauthorizedAccess(String message) { GmeApplication.getStorage().edit().clear().commit(); - showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> logout()); + showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> logout()); } } private boolean validateAll() { - return validateAmountIsNotEmpty(sendMoneyEditText.getText().toString())&&validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString()); + return validateAmountIsNotEmpty(sendMoneyEditText.getText().toString()) && validateAmountIsNotEmpty(recieveMoneyEditText.getText().toString()); } - private void updateButtonToCalculate(boolean action) { shouldCalculateExRate = action; if (action) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyAPIRequestBody.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyAPIRequestBody.java index 4eaa1d66..4449f105 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyAPIRequestBody.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyAPIRequestBody.java @@ -352,4 +352,40 @@ public class SendMoneyAPIRequestBody { } + @Override + public String toString() { + return "SendMoneyAPIRequestBody{" + + "user='" + user + '\'' + + ", senderId='" + senderId + '\'' + + ", receiverId='" + receiverId + '\'' + + ", deliveryMethodId='" + deliveryMethodId + '\'' + + ", pBranch='" + pBranch + '\'' + + ", pAgent='" + pAgent + '\'' + + ", pCurr='" + pCurr + '\'' + + ", collCurr='" + collCurr + '\'' + + ", collAmt='" + collAmt + '\'' + + ", payoutAmt='" + payoutAmt + '\'' + + ", transferAmt='" + transferAmt + '\'' + + ", serviceCharge='" + serviceCharge + '\'' + + ", discount='" + discount + '\'' + + ", exRate='" + exRate + '\'' + + ", calBy='" + calBy + '\'' + + ", purposeOfRemittance='" + purposeOfRemittance + '\'' + + ", sourceOfFund='" + sourceOfFund + '\'' + + ", relWithSender='" + relWithSender + '\'' + + ", occupation='" + occupation + '\'' + + ", ipAddress='" + ipAddress + '\'' + + ", rState='" + rState + '\'' + + ", rLocation='" + rLocation + '\'' + + ", tpExRate='" + tpExRate + '\'' + + ", tpPCurr='" + tpPCurr + '\'' + + ", payOutPartner='" + payOutPartner + '\'' + + ", foreXSESSIONID='" + foreXSESSIONID + '\'' + + ", paymentType='" + paymentType + '\'' + + ", isAgreed='" + isAgreed + '\'' + + ", txnPassword='" + txnPassword + '\'' + + ", receiverAccountNo='" + receiverAccountNo + '\'' + + ", kftcAccountId='" + kftcAccountId + '\'' + + '}'; + } }