Browse Source

Reward and keypad fixes

master
Preyea Regmi 5 years ago
parent
commit
2657ac29fd
  1. 11
      app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
  2. 12
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
  3. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/security/securitykeypad/SecurityKeypadRequestParamBuilder.java

11
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) { private void showCoupon(String discountValue, String discountType, String schemeId, String discountPercent, String couponName) {
String couponString = ""; String couponString = "";
// if (schemeId == null || schemeId.length() < 1) {
// couponString = "0";
// } else {
if (schemeId == null || schemeId.length() < 1) {
couponString = "0";
} else {
//Percent type discount //Percent type discount
//
if (discountType!=null&&discountType.equalsIgnoreCase("1")) { if (discountType!=null&&discountType.equalsIgnoreCase("1")) {
couponString = couponName +" "+ discountPercent+" (" + discountValue + "KRW)";
couponString = couponName +" "+ discountPercent+"% (" + discountValue + "KRW)";
} }
//Value type discount //Value type discount
else { else {
couponString = couponName + " (" + discountValue + " KRW)"; couponString = couponName + " (" + discountValue + " KRW)";
} }
}
gmeCouponTxt.setText(couponString); gmeCouponTxt.setText(couponString);

12
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) { private void showCoupon(String discountValue, String discountType, String schemeId, String discountPercent, String couponName) {
String couponString = ""; 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")) { if (discountType!=null&&discountType.equalsIgnoreCase("1")) {
couponString = couponName +" "+ discountPercent+" (" + discountValue + "KRW)";
couponString = couponName +" "+ discountPercent+"% (" + discountValue + "KRW)";
} }
//Value type discount //Value type discount
else { else {
couponString = couponName + " (" + discountValue + " KRW)"; couponString = couponName + " (" + discountValue + " KRW)";
} }
// }
}
gmeCouponTxt.setText(couponString); gmeCouponTxt.setText(couponString);

4
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_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_AUTO_FOCUSING, isUseAutoFocusing);
newIntent.putExtra(TransKeyActivity.mTK_PARAM_USE_SHIFT_OPTION, true); newIntent.putExtra(TransKeyActivity.mTK_PARAM_USE_SHIFT_OPTION, true);

Loading…
Cancel
Save