From 2333209b3d8c3b9a9aebb2f3475f46e7c857ccf2 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Wed, 5 Jun 2019 12:26:25 +0545 Subject: [PATCH] Reward and coupon disabled --- .idea/caches/build_file_checksums.ser | Bin 662 -> 662 bytes app/build.gradle | 2 +- .../base/BaseActivity.java | 2 - .../view/CustomerSupportFragment.java | 26 ++++++------- .../homeV2/view/HomeFragmentV2.java | 1 - .../resend/ReSendMoneyV2Presenter.java | 3 +- .../ResendMoneyAmountDetailFragment.java | 35 ++++++++--------- .../presenter/SendMoneyV2Presenter.java | 2 +- .../AmountDetailSendMoneyFragment.java | 36 ++++++++---------- ...fragment_amount_detail_resend_money_v2.xml | 1 + .../fragment_amount_detail_send_money_v2.xml | 1 + app/src/main/res/layout/fragment_home_v2.xml | 5 ++- 12 files changed, 51 insertions(+), 63 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index b5ef5bb62a65eb83e89c400876e29b3a0ecf33e5..7bfccf7bd2dc88a2fd4a45891f8e844a4aea2daa 100644 GIT binary patch delta 44 zcmV+{0Mq}L1(pSnm;@#qhsu$h-jl!qM3Z^}Mw0{rfe|Vezu*5HB1lC getCustomerSupportContact() { List contactList = new ArrayList<>(); - contactList.add(new CustomerSupportContact("EN", "")); - contactList.add(new CustomerSupportContact("KH", "")); - contactList.add(new CustomerSupportContact("KR", "")); - contactList.add(new CustomerSupportContact("TH", "")); - contactList.add(new CustomerSupportContact("LK", "")); - contactList.add(new CustomerSupportContact("MN", "")); - contactList.add(new CustomerSupportContact("MM", "")); - contactList.add(new CustomerSupportContact("NP", "")); - contactList.add(new CustomerSupportContact("ID", "")); - contactList.add(new CustomerSupportContact("BD", "")); - contactList.add(new CustomerSupportContact("RU", "")); - contactList.add(new CustomerSupportContact("UZ", "")); - contactList.add(new CustomerSupportContact("VN", "")); + contactList.add(new CustomerSupportContact("EN", "1811-2934")); + contactList.add(new CustomerSupportContact("KH", "1811-2941")); + contactList.add(new CustomerSupportContact("KR", "1811-2934")); + contactList.add(new CustomerSupportContact("TH", "010-9928-6864")); + contactList.add(new CustomerSupportContact("LK", "1811-2935")); + contactList.add(new CustomerSupportContact("MN", "010-2973-6864")); + contactList.add(new CustomerSupportContact("MM", "1811-2938")); + contactList.add(new CustomerSupportContact("NP", "1811-2934")); + contactList.add(new CustomerSupportContact("ID", "1811-2945")); + contactList.add(new CustomerSupportContact("BD", "1811-2943")); + contactList.add(new CustomerSupportContact("RU", "010-3015-6864")); + contactList.add(new CustomerSupportContact("UZ", "010-3015-6864")); + contactList.add(new CustomerSupportContact("VN", "1811-2937")); return contactList; } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java index a54f8032..34123010 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java @@ -245,7 +245,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2. private void showRewardScreen() { Intent intent=new Intent(getActivity(),RewardListingV2Activity.class); -// Intent intent=new Intent(getActivity(), FingerprintEnablePromptActivity.class); startActivity(intent); } 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 16fcacbd..c40da206 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 @@ -111,7 +111,7 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney resendRelatedData.getRemitDetail().setCalBy(shouldCalcByRecipient ? Constants.CALC_BY_RECIPEINT : Constants.CALC_BY_SENDER); resendRelatedData.getRemitDetail().setForeXSESSIONID(forexId); resendRelatedData.getRemitDetail().setTransferAmt(transferAmount); - resendRelatedData.getRemitDetail().setSchemeId(schemeId); +// resendRelatedData.getRemitDetail().setSchemeId(schemeId); } @@ -266,7 +266,6 @@ public class ReSendMoneyV2Presenter extends BasePresenter implements ReSendMoney resendRelatedData.getExRate().setPaymentType(previousTransactionRelatedData.getSelectedAutoDebitAccount().getType()); resendRelatedData.getExRate().setUserId(gateway.getUserID()); - Log.d("RESENDREQUESTMODEL", resendRelatedData.getRemitDetail().toString()); getExRateFromNetwork(); } else view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView()); 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 fdc8a5d6..6cc8414a 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 @@ -246,19 +246,19 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie if (this.transferFeeTxtView.getVisibility() == View.VISIBLE) this.transferFeeTxtView.setVisibility(View.INVISIBLE); - Spannable transString = new SpannableString(transferDisplay + discountValue); - transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), R.color.darkgray)), 0, transferDisplay.length() , Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), R.color.colorPrimary)), transferDisplay.length(), transferDisplay.length() + discountValue.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - transferFeeTxtView.setText(transString); +// Spannable transString = new SpannableString(transferDisplay + discountValue); +// transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), R.color.darkgray)), 0, transferDisplay.length() , Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +// transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), R.color.colorPrimary)), transferDisplay.length(), transferDisplay.length() + discountValue.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + transferFeeTxtView.setText(transferDisplay); this.transferFeeTxtView.setTranslationY(this.transferFeeTxtView.getHeight()); this.transferFeeTxtView.setVisibility(View.VISIBLE); ViewCompat.animate(this.transferFeeTxtView).translationY(0).setDuration(550).setInterpolator(this.interpolator).start(); - if (couponViewContainer.getVisibility() != View.VISIBLE) { - couponViewContainer.setVisibility(View.VISIBLE); - couponBottomView.setVisibility(View.VISIBLE); - } +// if (couponViewContainer.getVisibility() != View.VISIBLE) { +// couponViewContainer.setVisibility(View.VISIBLE); +// couponBottomView.setVisibility(View.VISIBLE); +// } } else { if (exchangeRateTxtView.getVisibility() == View.VISIBLE) @@ -268,10 +268,10 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie this.transferFeeTxtView.setVisibility(View.INVISIBLE); - if (couponViewContainer.getVisibility() == View.VISIBLE) { - couponViewContainer.setVisibility(View.INVISIBLE); - couponBottomView.setVisibility(View.INVISIBLE); - } +// if (couponViewContainer.getVisibility() == View.VISIBLE) { +// couponViewContainer.setVisibility(View.INVISIBLE); +// couponBottomView.setVisibility(View.INVISIBLE); +// } } } @@ -351,12 +351,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie selectedTransferAmount = data.getsAmt(); selectedSchemeId = data.getSchemeId(); - //TODO Dummy data - data.setSchemeId("666"); - data.setDiscountType("1"); - data.setDiscountValue("5000.7324423429"); - data.setDiscountPercent("10"); - data.setCouponName("Gold"); + String transferDisplay = " - " + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (" + getString(R.string.transfer_fee_included_text) + ")"; String exRateDisplay = " " + selectedExRate + " (" + getString(R.string.current_exchange_rate_text) + ")"; @@ -364,7 +359,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie showTransferfeeAndExRate(true, transferDisplay, exRateDisplay,""); showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); - showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); +// showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); updateButtonToCalculate(false); @@ -396,7 +391,7 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie showTransferfeeAndExRate(true, transferDisplay, exRateDisplay,""); showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); - showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); +// showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); updateButtonToCalculate(false); } else { 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 753aca38..10a2a79a 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 @@ -311,7 +311,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr sendMoneyAPIRequestBody.setTxnPassword(password); sendMoneyAPIRequestBody.setUseBiometric(isBiometricUsed); - sendMoneyAPIRequestBody.setSchemeId(selectedSchemeId); +// sendMoneyAPIRequestBody.setSchemeId(selectedSchemeId); compositeObservable.add( gateway.performSendMoneyTransaction(gateway.getAuth(), sendMoneyAPIRequestBody) 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 70700aff..9d1717a6 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 @@ -298,19 +298,19 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. if (this.transferFeeTxtView.getVisibility() == View.VISIBLE) this.transferFeeTxtView.setVisibility(View.INVISIBLE); - Spannable transString = new SpannableString(transferDisplay + discountValue); - transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), R.color.darkgray)), 0, transferDisplay.length() , Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getActivity(), R.color.colorPrimary)), transferDisplay.length(), transferDisplay.length() + discountValue.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - transferFeeTxtView.setText(transString); +// Spannable transString = new SpannableString(transferDisplay + discountValue); +// transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(transferFeeTxtView.getContext(), R.color.darkgray)), 0, transferDisplay.length() , Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +// transString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(transferFeeTxtView.getContext(), R.color.colorPrimary)), transferDisplay.length(), transferDisplay.length() + discountValue.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + transferFeeTxtView.setText(transferDisplay); this.transferFeeTxtView.setTranslationY(this.transferFeeTxtView.getHeight()); this.transferFeeTxtView.setVisibility(View.VISIBLE); ViewCompat.animate(this.transferFeeTxtView).translationY(0).setDuration(550).setInterpolator(this.interpolator).start(); - if (couponViewContainer.getVisibility() != View.VISIBLE) { - couponViewContainer.setVisibility(View.VISIBLE); - couponBottomView.setVisibility(View.VISIBLE); - } +// if (couponViewContainer.getVisibility() != View.VISIBLE) { +// couponViewContainer.setVisibility(View.VISIBLE); +// couponBottomView.setVisibility(View.VISIBLE); +// } } else { if (exchangeRateTxtView.getVisibility() == View.VISIBLE) @@ -319,11 +319,11 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. if (transferFeeTxtView.getVisibility() == View.VISIBLE) this.transferFeeTxtView.setVisibility(View.INVISIBLE); - - if (couponViewContainer.getVisibility() == View.VISIBLE) { - couponViewContainer.setVisibility(View.INVISIBLE); - couponBottomView.setVisibility(View.INVISIBLE); - } +// +// if (couponViewContainer.getVisibility() == View.VISIBLE) { +// couponViewContainer.setVisibility(View.INVISIBLE); +// couponBottomView.setVisibility(View.INVISIBLE); +// } } } @@ -401,12 +401,6 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. selectedTransferAmount = data.getsAmt(); selectedSchemeId = data.getSchemeId(); - //TODO Dummy data - data.setSchemeId("666"); - data.setDiscountType("1"); - data.setDiscountValue("5000.7324423429"); - data.setDiscountPercent("10"); - data.setCouponName("Gold"); String transferDisplay = " -" + Utils.formatCurrency(selectedTransferFeeAmount) + " " + selectedsendingCurrency + " (" + getString(R.string.transfer_fee_included_text) + ")"; @@ -416,7 +410,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); - showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); +// showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); updateButtonToCalculate(false); @@ -443,7 +437,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View. showTransferfeeAndExRate(true, transferDisplay, exRateDisplay, data.getDiscountValue()); showSendAndRecieveAmount(selectedSendAmount, selectedRecipientAmount); - showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); +// showCoupon(Utils.formatCurrencyWithoutTruncatingDecimal(data.getDiscountValue()), data.getDiscountType(), data.getSchemeId(), data.getDiscountPercent(), data.getCouponName()); updateButtonToCalculate(false); diff --git a/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml b/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml index 00518cf3..362b33f4 100644 --- a/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml +++ b/app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml @@ -233,6 +233,7 @@ android:layout_marginTop="20dp" android:layout_width="match_parent" android:layout_height="1dp" + android:visibility="gone" android:background="@color/gray"/> + android:visibility="gone" + />