IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Reward and coupon disabled

master
Preyea Regmi 5 years ago
parent
1d01c754e7
commit
2333209b3d
12 changed files with 51 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. 2
      app/build.gradle
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
  4. 26
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java
  5. 1
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
  6. 3
      app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
  7. 35
      app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
  8. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  9. 36
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
  10. 1
      app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml
  11. 1
      app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
  12. 5
      app/src/main/res/layout/fragment_home_v2.xml

BIN
.idea/caches/build_file_checksums.ser
View File

2
app/build.gradle
View File

@ -66,7 +66,7 @@ android {
}
debug {
manifestPlaceholders.fileProvider = "com.gmeremit.online.gmeremittance_native.fileprovider"
buildConfigField 'String', 'BASE_URL', '"http://gmeuat.gmeremit.com:5012/api/"'
buildConfigField 'String', 'BASE_URL', '"https://mobileapi.gmeremit.com:8002/api/"'
buildConfigField 'String', 'API_VERSION', '"v1"'
buildConfigField 'String', 'BASE_URL_SOCIAL', '"http://10.1.1.171:8080/v1/"'
signingConfig signingConfigs.debug

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java
View File

@ -184,8 +184,6 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter
@Override
public void logout() {
Intent intent = new Intent(getApplicationContext(), SplashScreen.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);

26
app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java
View File

@ -96,19 +96,19 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
private List<CustomerSupportContact> getCustomerSupportContact() {
List<CustomerSupportContact> 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;
}

1
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
View File

@ -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);
}

3
app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/presenter/resend/ReSendMoneyV2Presenter.java
View File

@ -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());

35
app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
View File

@ -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 {

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
View File

@ -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)

36
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
View File

@ -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);

1
app/src/main/res/layout/fragment_amount_detail_resend_money_v2.xml
View File

@ -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.support.constraint.ConstraintLayout

1
app/src/main/res/layout/fragment_amount_detail_send_money_v2.xml
View File

@ -230,6 +230,7 @@
</LinearLayout>
<View
android:visibility="gone"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="1dp"

5
app/src/main/res/layout/fragment_home_v2.xml
View File

@ -289,7 +289,7 @@
android:paddingTop="6dp"
android:text="@string/reward_point_text"
android:id="@+id/lb_rewardpoint"
android:visibility="gone"
android:textSize="12sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
@ -305,7 +305,8 @@
android:paddingRight="10dp"
android:textColor="@color/white"
android:textSize="12sp"
/>
android:visibility="gone"
/>
</RelativeLayout>

Write Preview
Loading…
Cancel
Save