diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java index 5121270..9628894 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/PrintReceiptFragment.java @@ -75,8 +75,8 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin setToolBarTitleWithoutBackIcon(getResourceString(R.string.title_print_receipt)); - sharedViewModel.printReceiptButtons.setValue(0); - sharedViewModel.printerDisabled.setValue(printerEnabled); + sharedViewModel.printReceiptButtons.setValue(printerEnabled ? 0 : 8); + sharedViewModel.printerDisabled.setValue(!printerEnabled); PayDetail payDetail = sharedViewModel.payDetail.getValue(); @@ -122,16 +122,14 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT); - - if(!printerEnabled){ + if (!printerEnabled) { + sharedViewModel.setPrintStatus(PrintStatus.NOT_PRINT); + sharedViewModel.setVisibilityPrintReceiptButtons(8); sharedViewModel.postPrintReceiptMsg("Receipt is saved as E-receipt!"); + } else { + sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT); + observePrintProcess(); } -// else{ -// sharedViewModel.postPrintReceiptMsg("Print Receipt for Merchant?"); -// } - - observePrintProcess(); setBackPressCallback(this); }