From 5ea220d50ff5a60052d2d5bccab108741a37c6b5 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Thu, 23 Apr 2020 13:45:15 +0545 Subject: [PATCH] MoneyGram Related UI changes --- .../SendMoneyTransactionCompleteModel.java | 134 +++++++++++++++++- ...ndMoneyTransactionCompleteV2Presenter.java | 13 +- ...ansactionCompleteV2PresenterInterface.java | 2 + .../presenter/SendMoneyV2Presenter.java | 5 + .../SendMoneyV2PresenterInterface.java | 2 + ...endMoneyV2TransactionCompleteActivity.java | 57 ++++++++ .../VerificationSendMoneyFragment.java | 17 ++- ...ity_send_money_v2_transaction_complete.xml | 41 ++++++ .../fragment_verification_send_money_v2.xml | 18 ++- app/src/main/res/values/strings.xml | 4 +- 10 files changed, 282 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java index 490d909b..142459e3 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java @@ -6,6 +6,7 @@ import com.google.gson.annotations.SerializedName; public class SendMoneyTransactionCompleteModel { + @SerializedName("controlNo") @Expose private String controlNo; @@ -90,7 +91,18 @@ public class SendMoneyTransactionCompleteModel { @SerializedName("discountPercent") @Expose private String discountPercent; - + @SerializedName("logoUrl") + @Expose + private String logoUrl; + @SerializedName("logoText") + @Expose + private String logoText; + @SerializedName("showPartnerLogo") + @Expose + private String showPartnerLogo; + @SerializedName("note") + @Expose + private String note; public String getControlNo() { return controlNo; } @@ -328,4 +340,124 @@ public class SendMoneyTransactionCompleteModel { public void setDiscountPercent(String discountPercent) { this.discountPercent = discountPercent; } + + public String getrFirstName() { + return rFirstName; + } + + public void setrFirstName(String rFirstName) { + this.rFirstName = rFirstName; + } + + public String getrMiddleName() { + return rMiddleName; + } + + public void setrMiddleName(String rMiddleName) { + this.rMiddleName = rMiddleName; + } + + public String getrLastName() { + return rLastName; + } + + public void setrLastName(String rLastName) { + this.rLastName = rLastName; + } + + public String getrAddress() { + return rAddress; + } + + public void setrAddress(String rAddress) { + this.rAddress = rAddress; + } + + public String getrCountryName() { + return rCountryName; + } + + public void setrCountryName(String rCountryName) { + this.rCountryName = rCountryName; + } + + public String getrContactNo() { + return rContactNo; + } + + public void setrContactNo(String rContactNo) { + this.rContactNo = rContactNo; + } + + public String getrCity() { + return rCity; + } + + public void setrCity(String rCity) { + this.rCity = rCity; + } + + public String getrEmail() { + return rEmail; + } + + public void setrEmail(String rEmail) { + this.rEmail = rEmail; + } + + public String getrState() { + return rState; + } + + public void setrState(String rState) { + this.rState = rState; + } + + public String getpAmount() { + return pAmount; + } + + public void setpAmount(String pAmount) { + this.pAmount = pAmount; + } + + public String getpAgentBank() { + return pAgentBank; + } + + public void setpAgentBank(String pAgentBank) { + this.pAgentBank = pAgentBank; + } + + public String getLogoUrl() { + return logoUrl; + } + + public void setLogoUrl(String logoUrl) { + this.logoUrl = logoUrl; + } + + public String getLogoText() { + return logoText; + } + + public void setLogoText(String logoText) { + this.logoText = logoText; + } + + public String getShowPartnerLogo() { + return showPartnerLogo; + } + + public void setShowPartnerLogo(String showPartnerLogo) { + this.showPartnerLogo = showPartnerLogo; + } + + public String getNote() { + return note; + } + + public void setNote(String note) { + this.note = note; + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java index 30c5db99..4fb93863 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2Presenter.java @@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter; import com.gmeremit.online.gmeremittance_native.base.BasePresenter; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.gateway.SendMoneyTransactionCompleteV2Gateway; +import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteModel; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTransactionCompleteV2ResponseBody; import com.gmeremit.online.gmeremittance_native.utils.Constants; import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse; @@ -49,9 +50,19 @@ public class SendMoneyTransactionCompleteV2Presenter extends BasePresenter imple @Override protected void onSuccess(SendMoneyTransactionCompleteV2ResponseBody sendMoneyTransactionCompleteV2ResponseBody) { + SendMoneyTransactionCompleteModel data = sendMoneyTransactionCompleteV2ResponseBody.getData(); if(sendMoneyTransactionCompleteV2ResponseBody.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) { - view.showReceiptData(sendMoneyTransactionCompleteV2ResponseBody.getData()); + view.showReceiptData(data); + if("Y".equalsIgnoreCase(data.getShowPartnerLogo())) + { + view.showPartnerInfo(true,data.getLogoText(),data.getLogoUrl()); + } + else + { + view.showPartnerInfo(false,"",""); + + } } else { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java index aef18e0d..4f68184d 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyTransactionCompleteV2PresenterInterface.java @@ -15,5 +15,7 @@ public interface SendMoneyTransactionCompleteV2PresenterInterface extends BasePr void showReceiptData(SendMoneyTransactionCompleteModel recieptData); + void showPartnerInfo(boolean action,String partnerText,String partnerLogoUrl); + } } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java index 0fd8a058..09dc6ae2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java @@ -261,6 +261,11 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr return Utils.removeSpecialCharacterAndDecimalFromCurrency(selectedSendingAmount); } + @Override + public WebRequestModel getWebRequestDataForFraudWarning() { + return new WebRequestModel("", "https://online.gmeremit.com/Terms#Fraud", null); + } + private void performSendMoneyTransaction(String password, boolean isBiometricUsed) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java index d625c5aa..9352ce22 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2PresenterInterface.java @@ -56,6 +56,8 @@ public interface SendMoneyV2PresenterInterface extends BasePresenterInterface { String getTransactionAmount(); + WebRequestModel getWebRequestDataForFraudWarning(); + interface SendMoneyV2ContractInterface extends BaseContractInterface { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java index 8f4861e9..26496b9e 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java @@ -1,12 +1,22 @@ package com.gmeremit.online.gmeremittance_native.sendmoneyV2.view; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.Nullable; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.DataSource; +import com.bumptech.glide.load.engine.GlideException; +import com.bumptech.glide.request.RequestListener; +import com.bumptech.glide.request.target.Target; import com.gmeremit.online.gmeremittance_native.R; import com.gmeremit.online.gmeremittance_native.base.BaseActivity; import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView; @@ -16,6 +26,8 @@ import com.gmeremit.online.gmeremittance_native.sendmoneyV2.model.SendMoneyTrans import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyTransactionCompleteV2Presenter; import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyTransactionCompleteV2PresenterInterface; import com.gmeremit.online.gmeremittance_native.supportV2.view.SupportActivityV2; +import com.zoyi.com.bumptech.glide.request.animation.GlideAnimation; +import com.zoyi.com.bumptech.glide.request.target.SimpleTarget; import butterknife.BindView; import butterknife.ButterKnife; @@ -91,6 +103,17 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme @BindView(R.id.tv_coupon) TextView tv_coupon; + @BindView(R.id.container_partner_info) + ViewGroup container_partner_info; + @BindView(R.id.txt_partner_info) + TextView txt_partner_info; + + @BindView(R.id.img_partner_info) + ImageView img_partner_info; + + @BindView(R.id.progressbar_partner_info) + View progressbar_partner_info; + public static String SEND_MONEY_TID_BUNDLE_KEY = "sendMoneyTransactionId"; public static final String SEND_MONEY_CONTROL_NO_BUNDLE_KEY = "bundleControlId"; @@ -211,6 +234,40 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme } + @Override + public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl) { + if(true) + { + img_partner_info.setImageResource(0); + txt_partner_info.setText(partnerText); + progressbar_partner_info.setVisibility(View.VISIBLE); + container_partner_info.setVisibility(View.VISIBLE); + Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl) .listener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + + progressbar_partner_info.setVisibility(View.GONE); + img_partner_info.setVisibility(View.GONE); + return false; + } + + @Override + public boolean onResourceReady(Bitmap resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) { + progressbar_partner_info.setVisibility(View.GONE); + img_partner_info.setVisibility(View.VISIBLE); + return false; + } + }).into(img_partner_info); + } + else + { + container_partner_info.setVisibility(View.GONE); + progressbar_partner_info.setVisibility(View.GONE); + img_partner_info.setImageResource(0); + txt_partner_info.setText(""); + } + } + @Override public void onClick(View v) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java index 727ae8f0..8d5e2801 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java @@ -57,6 +57,8 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View @BindView(R.id.txt_user_aggreement) TextView txt_user_aggreement; + @BindView(R.id.txt_fraud_warning) + TextView txt_fraud_warning; @BindView(R.id.exRateCalculateButton) Button sendTransactionButton; @@ -109,6 +111,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View super.onStart(); sendTransactionButton.setOnClickListener(this); txt_user_aggreement.setOnClickListener(this); + txt_fraud_warning.setOnClickListener(this); } @Override @@ -116,6 +119,7 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View super.onStop(); sendTransactionButton.setOnClickListener(null); txt_user_aggreement.setOnClickListener(null); + txt_fraud_warning.setOnClickListener(null); } @@ -178,14 +182,19 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View case R.id.txt_user_aggreement: openUserAgreement(); break; + case R.id.txt_fraud_warning: + openFraudWarning(); } } + private void openFraudWarning() { + WebRequestModel requestModel=((SendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForFraudWarning(); + Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class); + intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); + startActivity(intent); + } + private void openUserAgreement() { -// String url = "https://online.gmeremit.com/Terms"; -// Intent i = new Intent(Intent.ACTION_VIEW); -// i.setData(Uri.parse(url)); -// launchActivity(i); WebRequestModel requestModel=((SendMoneyActionListener)getActivity()).getPresenter().getWebRequestDataForTermsAndCondition(); Intent intent= new Intent(getActivity(),TermsAndConditionV2BrowserActivity.class); intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,requestModel); diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml index 0fb37192..1e664c3e 100644 --- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml +++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml @@ -550,6 +550,47 @@ + + + + + + + + + Service Charge Payout Agent/Bank I have read and agreed to - Gme Remittance User Agreement + 1. GME Remittance User Agreement Agree and Send Enter Your Login Password Enter 4 Digit OTP Code @@ -788,7 +788,7 @@ Will proceed to check OTP New OTP number has re-sent Verification is all completed - + 2. GME Remittance Fraud Warning