Re-imp for auto print after transaction
This commit is contained in:
parent
cb5177fa38
commit
8482e4145d
@ -122,13 +122,14 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin
|
|||||||
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
|
|
||||||
sharedViewModel.setPrintStatus(PrintStatus.NOT_PRINT);
|
sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT);
|
||||||
|
|
||||||
if(printerDisabled){
|
if(printerDisabled){
|
||||||
sharedViewModel.postPrintReceiptMsg("Receipt is saved as E-receipt!");
|
sharedViewModel.postPrintReceiptMsg("Receipt is saved as E-receipt!");
|
||||||
}else{
|
|
||||||
sharedViewModel.postPrintReceiptMsg("Print Receipt for Merchant?");
|
|
||||||
}
|
}
|
||||||
|
// else{
|
||||||
|
// sharedViewModel.postPrintReceiptMsg("Print Receipt for Merchant?");
|
||||||
|
// }
|
||||||
|
|
||||||
observePrintProcess();
|
observePrintProcess();
|
||||||
|
|
||||||
@ -145,20 +146,20 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin
|
|||||||
case FIRST_PRINT:
|
case FIRST_PRINT:
|
||||||
sharedViewModel.postPrintReceiptMsg("Printing Receipt for Merchant");
|
sharedViewModel.postPrintReceiptMsg("Printing Receipt for Merchant");
|
||||||
startPrintProcess(true);
|
startPrintProcess(true);
|
||||||
sharedViewModel.postPrintReceiptMsg("Print Receipt for Customer?");
|
// sharedViewModel.postPrintReceiptMsg("Print Receipt for Customer?");
|
||||||
sharedViewModel.setVisibilityPrintReceiptButtons(0);
|
// sharedViewModel.setVisibilityPrintReceiptButtons(0);
|
||||||
break;
|
break;
|
||||||
case FIRST_PRINT_DONE:
|
case FIRST_PRINT_DONE:
|
||||||
sharedViewModel.postPrintReceiptMsg("Print Receipt for Customer?");
|
// sharedViewModel.postPrintReceiptMsg("Print Receipt for Customer?");
|
||||||
// sharedViewModel.postPrintReceiptMsg("Confirm Print Receipt for Customer");
|
sharedViewModel.postPrintReceiptMsg("Confirm Print Receipt for Customer");
|
||||||
// if(sharedViewModel.isEcr.getValue() != null &&
|
if(sharedViewModel.isEcr.getValue() != null &&
|
||||||
// sharedViewModel.isEcr.getValue() &&
|
sharedViewModel.isEcr.getValue() &&
|
||||||
// SystemParamsOperation.getInstance().isAutoPrintCustomerCopy()) {
|
SystemParamsOperation.getInstance().isAutoPrintCustomerCopy()) {
|
||||||
// sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
||||||
// sharedViewModel.setPrintStatus(PrintStatus.SECOND_PRINT);
|
sharedViewModel.setPrintStatus(PrintStatus.SECOND_PRINT);
|
||||||
// } else {
|
} else {
|
||||||
// sharedViewModel.setVisibilityPrintReceiptButtons(0);
|
sharedViewModel.setVisibilityPrintReceiptButtons(0);
|
||||||
// }
|
}
|
||||||
break;
|
break;
|
||||||
case SECOND_PRINT:
|
case SECOND_PRINT:
|
||||||
sharedViewModel.postPrintReceiptMsg("Printing Receipt for Customer");
|
sharedViewModel.postPrintReceiptMsg("Printing Receipt for Customer");
|
||||||
@ -224,7 +225,6 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin
|
|||||||
@Override
|
@Override
|
||||||
public void onClickCancel() {
|
public void onClickCancel() {
|
||||||
dismissPrinterAlertDialog();
|
dismissPrinterAlertDialog();
|
||||||
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void onClickRetry() {
|
public void onClickRetry() {
|
||||||
@ -257,31 +257,34 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin
|
|||||||
public class ClickEvent {
|
public class ClickEvent {
|
||||||
|
|
||||||
public void onConfirm() {
|
public void onConfirm() {
|
||||||
PrintStatus printStatus = sharedViewModel.getPrintStatus().getValue();
|
// PrintStatus printStatus = sharedViewModel.getPrintStatus().getValue();
|
||||||
|
|
||||||
if(printStatus == PrintStatus.NOT_PRINT){
|
|
||||||
sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
|
||||||
sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT);
|
|
||||||
}else if(printStatus == PrintStatus.FIRST_PRINT || printStatus == PrintStatus.FIRST_PRINT_DONE){
|
|
||||||
sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
|
||||||
sharedViewModel.setPrintStatus(PrintStatus.SECOND_PRINT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
|
||||||
//
|
//
|
||||||
// sharedViewModel.setPrintStatus(PrintStatus.SECOND_PRINT);
|
// if(printStatus == PrintStatus.NOT_PRINT){
|
||||||
|
// sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
||||||
|
// sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT);
|
||||||
|
// }else if(printStatus == PrintStatus.FIRST_PRINT || printStatus == PrintStatus.FIRST_PRINT_DONE){
|
||||||
|
// sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
||||||
|
// sharedViewModel.setPrintStatus(PrintStatus.SECOND_PRINT);
|
||||||
|
// }
|
||||||
|
|
||||||
|
sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
||||||
|
//
|
||||||
|
sharedViewModel.setPrintStatus(PrintStatus.SECOND_PRINT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onCancel() {
|
public void onCancel() {
|
||||||
PrintStatus printStatus = sharedViewModel.getPrintStatus().getValue();
|
|
||||||
|
|
||||||
if(printStatus == PrintStatus.NOT_PRINT){
|
sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
||||||
sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT_DONE);
|
isCardInside();
|
||||||
}else{
|
// PrintStatus printStatus = sharedViewModel.getPrintStatus().getValue();
|
||||||
sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
//
|
||||||
isCardInside();
|
// if(printStatus == PrintStatus.NOT_PRINT){
|
||||||
}
|
// sharedViewModel.setPrintStatus(PrintStatus.FIRST_PRINT_DONE);
|
||||||
|
// }else{
|
||||||
|
// sharedViewModel.setVisibilityPrintReceiptButtons(8);
|
||||||
|
// isCardInside();
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user