From 49e787a56c8dc9335cd4835c70348a33fa4be663 Mon Sep 17 00:00:00 2001 From: moon <56061215+MgKyawLay@users.noreply.github.com> Date: Fri, 20 Mar 2026 12:07:13 +0630 Subject: [PATCH] printer disable in reprint settlement --- .../ui/management/ManagementFunctionFragment.java | 1 + .../settlement/QRSettlementTransactionFragment.java | 12 ++++++++++-- .../ui/settlement/SettlementTransactionFragment.java | 4 ++++ .../main/res/layout/fragment_management_screen.xml | 2 ++ .../utsmyanmar/paylibs/print/printx/BaseXPrint.java | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java index d6e4eaf..f9c91e6 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/management/ManagementFunctionFragment.java @@ -53,6 +53,7 @@ public class ManagementFunctionFragment extends DataBindingFragment { public void onResume() { super.onResume(); + sharedViewModel.printerDisabled.setValue(!SystemParamsOperation.getInstance().getPrinterEnabled()); setToolBarTitleWithBackIcon(getString(R.string.title_select_function)); } diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/QRSettlementTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/QRSettlementTransactionFragment.java index a54223d..55593b8 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/QRSettlementTransactionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/QRSettlementTransactionFragment.java @@ -86,6 +86,7 @@ public class QRSettlementTransactionFragment extends DataBindingFragment impleme @Override public void onResume() { super.onResume(); + sharedViewModel.printerDisabled.setValue(!SystemParamsOperation.getInstance().getPrinterEnabled()); setToolBarTitleWithBackIcon(getString(R.string.title_qr_settlement)); String merchantName = SystemParamsOperation.getInstance().getMerchantName(); @@ -134,7 +135,7 @@ public class QRSettlementTransactionFragment extends DataBindingFragment impleme managementViewModel.detailReportLayoutLoadingVisibility.setValue(8); managementViewModel.detailReportLayoutVisibility.setValue(8); managementViewModel.detailReportLayoutViewVisibility.setValue(0); - managementViewModel.detailReportBottomLayoutVisibility.setValue(0); + managementViewModel.detailReportBottomLayoutVisibility.setValue(isLastSettlementPrinterDisabled() ? 8 : 0); } private void showEmptyDataView() { @@ -149,6 +150,13 @@ public class QRSettlementTransactionFragment extends DataBindingFragment impleme managementViewModel.cardTypeDR.setValue("QR PAY"); } + private boolean isLastSettlementPrinterDisabled() { + Boolean printerDisabled = sharedViewModel.printerDisabled.getValue(); + return sharedViewModel.getTransMenu().getValue() == TransMenu.LAST_SETTLEMENT + && printerDisabled != null + && printerDisabled; + } + private void observeQRTransactions() { managementViewModel.getTransactionHistory().observe(getViewLifecycleOwner(), payDetailList -> { if (payDetailList != null) { @@ -385,4 +393,4 @@ public class QRSettlementTransactionFragment extends DataBindingFragment impleme } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java index 902694c..7c8db08 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settlement/SettlementTransactionFragment.java @@ -88,6 +88,8 @@ public class SettlementTransactionFragment extends DataBindingFragment implement public void onResume() { super.onResume(); + boolean printerDisabled = !SystemParamsOperation.getInstance().getPrinterEnabled(); + sharedViewModel.printerDisabled.setValue(printerDisabled); if(sharedViewModel.getTransMenu().getValue() == TransMenu.LAST_SETTLEMENT) { setToolBarTitleWithBackIcon(getString(R.string.txt_subtitle_reprint_last_settle_report)); @@ -103,6 +105,8 @@ public class SettlementTransactionFragment extends DataBindingFragment implement if(sharedViewModel.getTransMenu().getValue() == TransMenu.REVIEW_BATCH){ settlementViewModel.btmLayout.setValue(8); + } else if(sharedViewModel.getTransMenu().getValue() == TransMenu.LAST_SETTLEMENT && printerDisabled) { + settlementViewModel.btmLayout.setValue(8); } else { settlementViewModel.btmLayout.setValue(0); } diff --git a/app/src/main/res/layout/fragment_management_screen.xml b/app/src/main/res/layout/fragment_management_screen.xml index e375f75..c9d39e8 100644 --- a/app/src/main/res/layout/fragment_management_screen.xml +++ b/app/src/main/res/layout/fragment_management_screen.xml @@ -3,6 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> + @@ -93,6 +94,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="12dp" + android:visibility="@{sharedViewModel.printerDisabled ? View.GONE : View.VISIBLE}" app:cardCornerRadius="12dp" app:cardElevation="0dp" app:cardBackgroundColor="@color/white" diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java index 108bcf8..a37416d 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java @@ -224,7 +224,7 @@ public abstract class BaseXPrint { if (settleData.getCashAdvanceCount() != 0) print3ColumnsString("CASH ADVANCE ", countStringFormat(settleData.getCashAdvanceCount()), PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount())); print3ColumnsString("REFUND ", countStringFormat(settleData.getRefundCount()), "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getRefundAmount())); - print3ColumnsString("TOTAL(MMK) ", countStringFormat(totalCount), PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount)); + print3ColumnsString("TOTAL"+ "(" + "MMK" +")" + " ", countStringFormat(totalCount), PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount)); emptyLine(2);