Browse Source

Transaction Report Fixes

master
preyearegmi 6 years ago
parent
commit
8cf2ac5edf
  1. 10
      app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Constants.java

10
app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/presenter/TransactionHistoryV2Presenter.java

@ -50,18 +50,20 @@ public class TransactionHistoryV2Presenter extends BasePresenter implements Tran
{
List<TransactionHistoryItemModel> paidDataList=new ArrayList<>();
List<TransactionHistoryItemModel> unpaidDataList=new ArrayList<>();
// Collections.reverse(response.getTransactionHistoryItemModels());
List<TransactionHistoryItemModel> allDataList=new ArrayList<>();
for(TransactionHistoryItemModel item:response.getTransactionHistoryItemModels() )
{
if(item.getPayStatus().equalsIgnoreCase("Paid"))
paidDataList.add(item);
else if(item.getPayStatus().equalsIgnoreCase("Unpaid"))
else if(!item.getPayStatus().equalsIgnoreCase("Cancel")) {
item.setPayStatus("UNPAID");
unpaidDataList.add(item);
}
allDataList.add(item);
}
return io.reactivex.Observable.just(new TransactionHistory(response.getTransactionHistoryItemModels(),paidDataList,unpaidDataList));
return io.reactivex.Observable.just(new TransactionHistory(allDataList,paidDataList,unpaidDataList));
}
else

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/Constants.java

@ -127,7 +127,7 @@ public class Constants {
public static final String RECIPIENT_UPDATE = "RECIPIENT_UPDATE";
// User Request
public static final String USER_REQUEST_PAGE = "USER_REQUEST_PAGE";
public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "1000000";
public static final String DEFAULT_EXCHANGE_SEND_AMOUNT = "100000";
public static final String CALC_BY_RECIPEINT = "p";
public static final String CALC_BY_SENDER = "c";
public static final String SUCCESS_CODE_V2 = "0";

Loading…
Cancel
Save