From bfbe446b8089f6ad2463b4af53e2c3eea3438d59 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Wed, 3 Oct 2018 19:01:20 +0900 Subject: [PATCH] Contact removed from nav_bar --- ...endMoneyV2TransactionCompleteActivity.java | 24 +++++++----- .../gateway/SupportActivityV2Gateway.java | 2 + ...ity_send_money_v2_transaction_complete.xml | 38 ++++++++++++++++++- .../res/layout/fragment_customer_support.xml | 2 + 4 files changed, 55 insertions(+), 11 deletions(-) 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 53d03b2a..fbac10b4 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 @@ -65,6 +65,8 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme TextView tvServiceFee; @BindView(R.id.tv_payout_mode) TextView tvPayoutMode; + @BindView(R.id.exrate_fee) + TextView exrate_fee; @BindView(R.id.btn_submit) @@ -107,7 +109,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme isRequestedBySendMoney = getIntent().getBooleanExtra(IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, false); prepareForm(); if (!isRequestedBySendMoney) { - controlId= getIntent().getStringExtra(SEND_MONEY_CONTROL_NO_BUNDLE_KEY); + controlId = getIntent().getStringExtra(SEND_MONEY_CONTROL_NO_BUNDLE_KEY); } @@ -175,7 +177,10 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme relationTextView.setText(recieptData.getRelWithSender()); addressTextView.setText(recieptData.getRAddress()); mobileNumberTextView.setText(recieptData.getRContactNo()); - emailTextView.setText(recieptData.getREmail()); + if (recieptData.getREmail() == null || recieptData.getREmail().length() < 1) + emailTextView.setText("N/A"); + else + emailTextView.setText(recieptData.getREmail()); agentTextView.setText(recieptData.getPAgentBank()); tvBranch.setText(recieptData.getPayoutBankBranch()); tvAccountNo.setText(recieptData.getAccountNo()); @@ -185,6 +190,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme deliveryAddressTextView.setText(recieptData.getRAddress()); tvServiceFee.setText(recieptData.getServiceCharge()); totalAmountTextView.setText(recieptData.getPayOutAmount()); + exrate_fee.setText(recieptData.getExRate()); } @@ -204,18 +210,18 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme case R.id.btn_cancel: Intent b = new Intent(this, SupportActivityV2.class); - b.putExtra(SupportActivityV2.REQUESTED_BUNDLE_KEY,SupportActivityV2.REQUESTED_FOR_CANCEL); - b.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY,controlId); - b.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY,transactionId); + b.putExtra(SupportActivityV2.REQUESTED_BUNDLE_KEY, SupportActivityV2.REQUESTED_FOR_CANCEL); + b.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY, controlId); + b.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY, transactionId); startActivity(b); finish(); break; case R.id.btn_change: - Intent c= new Intent(this, SupportActivityV2.class); - c.putExtra(SupportActivityV2.REQUESTED_BUNDLE_KEY,SupportActivityV2.REQUESTED_FOR_AMMENDMENT); - c.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY,controlId); - c.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY,transactionId); + Intent c = new Intent(this, SupportActivityV2.class); + c.putExtra(SupportActivityV2.REQUESTED_BUNDLE_KEY, SupportActivityV2.REQUESTED_FOR_AMMENDMENT); + c.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY, controlId); + c.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY, transactionId); startActivity(c); finish(); break; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/gateway/SupportActivityV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/gateway/SupportActivityV2Gateway.java index d0962ebf..db43da72 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/gateway/SupportActivityV2Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/gateway/SupportActivityV2Gateway.java @@ -44,6 +44,8 @@ public class SupportActivityV2Gateway extends PrivilegedGateway implements Suppo @Override public Observable performNormalRequest(String auth, String body, String subject) { JsonObject jsonObject=new JsonObject(); + jsonObject.addProperty("controlNo","dummy"); + jsonObject.addProperty("tranId","dummy"); jsonObject.addProperty("subject",subject); jsonObject.addProperty("body",body); 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 af1894fd..dd3c39d6 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 @@ -336,11 +336,13 @@ android:layout_alignParentRight="true" android:layout_below="@id/tv_mobile_no" android:padding="10dp" - android:text="-" + android:text="N/A" android:textColor="@color/darkgray" android:textSize="14sp" app:txtfontName="@string/semibold" /> + + + + + + + + +