diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java index dd073b8..e52a9b7 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/management/ReprintAnyTransactionFragment.java @@ -145,6 +145,18 @@ public class ReprintAnyTransactionFragment extends DataBindingFragment { cardViewAdapter.updateList(searchedLists); } + private void searchByTraceAndRRN(String input) { + for (PayDetail s : lists) { + boolean matchTrace = s.getVoucherNo() != null && s.getVoucherNo().contains(input); + boolean matchRRN = s.getReferNo() != null && s.getReferNo().contains(input); + + if (matchTrace || matchRRN) { + searchedLists.add(s); + } + } + cardViewAdapter.updateList(searchedLists); + } + public class ClickEvent { public void onClickSearch() { @@ -152,7 +164,7 @@ public class ReprintAnyTransactionFragment extends DataBindingFragment { String input = managementViewModel.txtRRNTrace.getValue(); if(input != null && !input.isEmpty()) { - searchByTrace(input); + searchByTraceAndRRN(input); } else { searchedLists.addAll(lists); } diff --git a/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml b/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml index 8074153..4904c52 100644 --- a/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml +++ b/app/src/main/res/layout/fragment_transaction_reprint_any_screen.xml @@ -118,7 +118,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:background="@null" - android:hint="@string/txt_search_by_trace" + android:hint="Search By Invoice/RRN" android:textColorHint="@color/colorPrimary" android:alpha="0.6" android:text="@={manageViewModel.txtRRNTrace}"