From 2657ac29fd58b0163e7fdefe4ecfa1154230527e Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 11 Jun 2019 15:04:37 +0545 Subject: [PATCH] Reward and keypad fixes --- .../ResendMoneyAmountDetailFragment.java | 11 ++++++----- .../amountdetail/AmountDetailSendMoneyFragment.java | 12 ++++++------ .../SecurityKeypadRequestParamBuilder.java | 4 ---- 3 files changed, 12 insertions(+), 15 deletions(-) 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 4596e1c4..04a21fa0 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 @@ -288,19 +288,20 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie private void showCoupon(String discountValue, String discountType, String schemeId, String discountPercent, String couponName) { String couponString = ""; -// if (schemeId == null || schemeId.length() < 1) { -// couponString = "0"; -// } else { + if (schemeId == null || schemeId.length() < 1) { + couponString = "0"; + } else { //Percent type discount - +// if (discountType!=null&&discountType.equalsIgnoreCase("1")) { - couponString = couponName +" "+ discountPercent+" (" + discountValue + "KRW)"; + couponString = couponName +" "+ discountPercent+"% (" + discountValue + "KRW)"; } //Value type discount else { couponString = couponName + " (" + discountValue + " KRW)"; } + } gmeCouponTxt.setText(couponString); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java index 384201e1..5e431f55 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java @@ -485,20 +485,20 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. private void showCoupon(String discountValue, String discountType, String schemeId, String discountPercent, String couponName) { String couponString = ""; -// if (schemeId == null || schemeId.length() < 1) { -// couponString = "0"; -// } else { -// //Percent type discount + if (schemeId == null || schemeId.length() < 1) { + couponString = "0"; + } else { + //Percent type discount // if (discountType!=null&&discountType.equalsIgnoreCase("1")) { - couponString = couponName +" "+ discountPercent+" (" + discountValue + "KRW)"; + couponString = couponName +" "+ discountPercent+"% (" + discountValue + "KRW)"; } //Value type discount else { couponString = couponName + " (" + discountValue + " KRW)"; } -// } + } gmeCouponTxt.setText(couponString); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java index 80e716b9..41b538a2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java @@ -164,10 +164,6 @@ public class SecurityKeypadRequestParamBuilder newIntent.putExtra(TransKeyActivity.mTK_PARAM_NUMBER_BUTTON_MARGIN, 0.44f); - - newIntent.putExtra(TransKeyActivity.mTK_PARAM_CUSTOM_DUMMY_STRING, "%$<>&()\"'"); - - newIntent.putExtra(TransKeyActivity.mTK_PARAM_USE_AUTO_FOCUSING, isUseAutoFocusing); newIntent.putExtra(TransKeyActivity.mTK_PARAM_USE_SHIFT_OPTION, true);