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

Minor reward fixes

master
Preyea Regmi 5 years ago
parent
2657ac29fd
commit
14ffbe2995
14 changed files with 71 additions and 29 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. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/resendV2/view/amountdetail/ResendMoneyAmountDetailFragment.java
  2. 22
      app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/model/rewardlisting/RewardOrderedProductItemModel.java
  3. 1
      app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/OrderHistoryFragment.java
  4. 21
      app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardorderdetail/RewardOrderDetailActivity.java
  5. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java
  6. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  7. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
  8. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/amountdetail/AmountDetailSendMoneyFragment.java
  9. 4
      app/src/main/res/drawable-xxhdpi/radiobutton_listview_selector.xml
  10. 2
      app/src/main/res/drawable/control_switch_background_border.xml
  11. 4
      app/src/main/res/drawable/radiobutton_gridview_selector.xml
  12. 18
      app/src/main/res/layout/fragment_reward_list.xml
  13. 4
      app/src/main/res/layout/order_list_item.xml
  14. 1
      app/src/main/res/values/strings.xml

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

@ -295,11 +295,11 @@ public class ResendMoneyAmountDetailFragment extends BaseFragment implements Vie
//
if (discountType!=null&&discountType.equalsIgnoreCase("1")) {
couponString = couponName +" "+ discountPercent+"% (" + discountValue + "KRW)";
couponString = couponName +" "+ discountPercent+"% (-" + Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + "KRW)";
}
//Value type discount
else {
couponString = couponName + " (" + discountValue + " KRW)";
couponString = couponName + " (-" +Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + " KRW)";
}
}
gmeCouponTxt.setText(couponString);

22
app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/model/rewardlisting/RewardOrderedProductItemModel.java
View File

@ -244,4 +244,26 @@ public class RewardOrderedProductItemModel implements Parcelable {
return new RewardOrderedProductItemModel[size];
}
};
@Override
public String toString() {
return "RewardOrderedProductItemModel{" +
"orderId='" + orderId + '\'' +
", productCode='" + productCode + '\'' +
", productName='" + productName + '\'' +
", usePoint='" + usePoint + '\'' +
", orderType='" + orderType + '\'' +
", recvType='" + recvType + '\'' +
", branchCode='" + branchCode + '\'' +
", branchName='" + branchName + '\'' +
", recvAddress='" + recvAddress + '\'' +
", recvZipCode='" + recvZipCode + '\'' +
", recvPhoneNumber='" + recvPhoneNumber + '\'' +
", recvName='" + recvName + '\'' +
", orderStatus='" + orderStatus + '\'' +
", createdDate='" + createdDate + '\'' +
", modifiedDate='" + modifiedDate + '\'' +
", recvDate='" + recvDate + '\'' +
'}';
}
}

1
app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/OrderHistoryFragment.java
View File

@ -285,6 +285,7 @@ public class OrderHistoryFragment extends BaseFragment implements OrderListingRv
data = rewardOrderedProductItemModels;
orderListAdapter.setData(rewardOrderedProductItemModels);
} else {
data=null;
showDataNotFoundView(true);
}

21
app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardorderdetail/RewardOrderDetailActivity.java
View File

@ -3,6 +3,7 @@ package com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardorderdetail
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@ -83,7 +84,16 @@ public class RewardOrderDetailActivity extends AppCompatActivity {
private void showOrderDetail(RewardOrderedProductItemModel data) {
transfer_label.setText(data.getOrderStatus().equalsIgnoreCase("9")?getString(R.string.your_order_canceled_text):getString(R.string.your_order_completed_text));
String transferLabelString="";
if(data.getOrderStatus().equalsIgnoreCase("9"))
transferLabelString=getString(R.string.your_order_canceled_text);
else if(data.getOrderStatus().equalsIgnoreCase("1"))
transferLabelString=getString(R.string.your_order_completed_text);
else if(data.getOrderStatus().equalsIgnoreCase("3"))
transferLabelString=getString(R.string.you_received_reward_text);
transfer_label.setText(transferLabelString);
tv_receiver.setText(data.getRecvName());
tv_address.setText(data.getBranchName());
tv_mobile_no.setText(data.getRecvPhoneNumber());
@ -103,10 +113,15 @@ public class RewardOrderDetailActivity extends AppCompatActivity {
tv_order_receive_date_text.setText(data.getModifiedDate());
}
else
else if(data.getOrderStatus().equalsIgnoreCase("1"))
{
order_receive_lbl.setText(getString(R.string.order_receive_date_text));
tv_order_receive_date_text.setText("");
}
else if(data.getOrderStatus().equalsIgnoreCase("3"))
{
order_receive_lbl.setText(getString(R.string.order_receive_date_text));
tv_order_receive_date_text.setText(data.getCreatedDate());
tv_order_receive_date_text.setText(data.getRecvDate());
}
}

5
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyTransactionCompleteModel.java
View File

@ -1,5 +1,6 @@
package com.gmeremit.online.gmeremittance_native.sendmoneyV2.model;
import com.gmeremit.online.gmeremittance_native.utils.Utils;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
@ -288,11 +289,11 @@ public class SendMoneyTransactionCompleteModel {
if (discountType!=null&&discountType.equalsIgnoreCase("1")) {
couponString = couponName +" "+ discountPercent+" (" + discountValue + "KRW)";
couponString = couponName +" "+ discountPercent+"% (-" + Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + "KRW)";
}
//Value type discount
else {
couponString = couponName + " (" + discountValue + " KRW)";
couponString = couponName + " (-" +Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + " KRW)";
}
return couponString;

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

@ -436,7 +436,7 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
userInfoModelV2.setAvailableBalance(sendMoneyResponse.getExtra());
userInfoModelV2.setYearlyLimit(sendMoneyResponse.getExtra2());
gateway.updateUserInfoInBatch(userInfoModelV2);
view.showPopUpMessage(sendMoneyResponse.getMsg()+"\n"+sendMoneyResponse.getExtra2(), CustomAlertDialog.AlertType.SUCCESS, alertType -> {
view.showPopUpMessage(sendMoneyResponse.getMsg()+"\n("+getStringfromStringId(R.string.estimated_earning_points_text)+": "+sendMoneyResponse.getExtra2()+")", CustomAlertDialog.AlertType.SUCCESS, alertType -> {
view.updateFinalTransitionToValid(true);
view.showReceiptOnTransactionComplete(sendMoneyResponse.getId());
});

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/SendMoneyV2TransactionCompleteActivity.java
View File

@ -187,10 +187,10 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
exrate_fee.setText(recieptData.getExRate());
String couponName = recieptData.getCouponName();
if (couponName == null || couponName.length() < 1) {
coupon_fee_divider.setVisibility(View.INVISIBLE);
coupon_fee_layout.setVisibility(View.INVISIBLE);
} else
tv_coupon.setText(getString(R.string.na_text));
} else {
tv_coupon.setText(recieptData.getCouponName());
}
}

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

@ -492,11 +492,11 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
//
if (discountType!=null&&discountType.equalsIgnoreCase("1")) {
couponString = couponName +" "+ discountPercent+"% (" + discountValue + "KRW)";
couponString = couponName +" "+ discountPercent+"% (-" + Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + "KRW)";
}
//Value type discount
else {
couponString = couponName + " (" + discountValue + " KRW)";
couponString = couponName + " (-" +Utils.formatCurrencyWithoutTruncatingDecimal(discountValue) + " KRW)";
}
}
gmeCouponTxt.setText(couponString);

4
app/src/main/res/drawable-xxhdpi/radiobutton_listview_selector.xml
View File

@ -10,7 +10,7 @@
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />-->
<!--<stroke android:width="1dp" android:color="#5c3708" />-->
<solid android:color="@color/colorPrimary"/>
<corners android:radius="5dp" />
<corners android:topRightRadius="5dp" android:bottomRightRadius="5dp" />
<padding android:left="10dp" android:right="10dp" />
</shape>
@ -31,7 +31,7 @@
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />-->
<!--<stroke android:width="1dp" android:color="#5c3708" />-->
<!--<solid android:color="@color/colorPrimary"/>-->
<corners android:radius="5dp" />
<corners android:topRightRadius="5dp" android:bottomRightRadius="5dp" />
<padding android:left="10dp" android:right="10dp" />
</shape>
</item>

2
app/src/main/res/drawable/control_switch_background_border.xml
View File

@ -4,6 +4,6 @@
<corners android:radius="5dp" />
<solid android:color="@android:color/transparent" />
<stroke
android:width="3dp"
android:width="1dp"
android:color="@color/colorPrimary" />
</shape>

4
app/src/main/res/drawable/radiobutton_gridview_selector.xml
View File

@ -10,7 +10,7 @@
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />-->
<!--<stroke android:width="1dp" android:color="#5c3708" />-->
<solid android:color="@color/colorPrimary"/>
<corners android:radius="5dp" />
<corners android:topLeftRadius="5dp" android:bottomLeftRadius="5dp" />
<padding android:left="10dp" android:right="10dp" />
</shape>
@ -31,7 +31,7 @@
<!--<gradient android:angle="270" android:endColor="#a0a67637" android:startColor="#a0e0b071" />-->
<!--<stroke android:width="1dp" android:color="#5c3708" />-->
<!--<solid android:color="@color/colorPrimary"/>-->
<corners android:radius="5dp" />
<corners android:topLeftRadius="5dp" android:bottomLeftRadius="5dp" />
<padding android:left="10dp" android:right="10dp" />
</shape>
</item>

18
app/src/main/res/layout/fragment_reward_list.xml
View File

@ -86,7 +86,8 @@
</android.support.constraint.ConstraintLayout>
<RadioGroup
android:layout_marginEnd="10dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="5dp"
android:layout_gravity="right"
android:id="@+id/view_selector"
android:layout_width="wrap_content"
@ -97,10 +98,10 @@
<RadioButton
android:id="@+id/grid_view_rdbtn"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="20dp"
android:background="@drawable/radiobutton_gridview_selector"
android:button="@null"
android:fontFamily="sans-serif-medium"
@ -109,10 +110,9 @@
<RadioButton
android:id="@+id/list_view_rdbtn"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="20dp"
android:background="@drawable/radiobutton_listview_selector"
android:button="@null"
android:fontFamily="sans-serif-medium"

4
app/src/main/res/layout/order_list_item.xml
View File

@ -49,6 +49,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="left"
android:layout_gravity="center_vertical"
android:text=""
android:textColor="@color/darkgray"
android:textSize="17sp" />
@ -56,7 +57,8 @@
android:id="@+id/tv_branch_name"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:singleLine="false"
android:layout_height="wrap_content"
android:gravity="right"
app:txtfontName="@string/semibold"
android:textColor="@color/darkgray"

1
app/src/main/res/values/strings.xml
View File

@ -493,6 +493,7 @@
<string name="your_order_canceled_text">Your order has been canceled</string>
<string name="your_order_completed_text">Your order is complete</string>
<string name="pickup_banch_text">Pickup Branch</string>
<string name="you_received_reward_text">You have received the reward</string>
</resources>
Write Preview
Loading…
Cancel
Save