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 3486fdd..cc7f391 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 @@ -28,6 +28,7 @@ import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; public class PrintReceiptFragment extends DataBindingFragment implements DataBindingFragment.BackPressCallback { private SharedViewModel sharedViewModel; private static final String TAG = PrintReceiptFragment.class.getSimpleName(); + private boolean printerDisabled = SystemParamsOperation.getInstance().getPrinterDisabled(); @Override protected int currentId() { @@ -48,7 +49,6 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin @Override protected void initViewModel() { sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class); - } @Override @@ -76,6 +76,7 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin setToolBarTitleWithoutBackIcon(getResourceString(R.string.title_print_receipt)); sharedViewModel.printReceiptButtons.setValue(0); + sharedViewModel.printerDisabled.setValue(printerDisabled); PayDetail payDetail = sharedViewModel.payDetail.getValue(); @@ -122,7 +123,12 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin super.onViewCreated(view, savedInstanceState); sharedViewModel.setPrintStatus(PrintStatus.NOT_PRINT); - sharedViewModel.postPrintReceiptMsg("Print Receipt for Merchant?"); + + if(printerDisabled){ + sharedViewModel.postPrintReceiptMsg("Receipt is saved as E-receipt!"); + }else{ + sharedViewModel.postPrintReceiptMsg("Print Receipt for Merchant?"); + } observePrintProcess(); @@ -278,6 +284,10 @@ public class PrintReceiptFragment extends DataBindingFragment implements DataBin } } + + public void onContinue(){ + isCardInside(); + } } private void alertPaperRoll(String title, String message) { diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java index 03b9b70..4756136 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java +++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java @@ -115,6 +115,7 @@ public class SharedViewModel extends ViewModel { public SingleLiveEvent hostType = new SingleLiveEvent<>(); public MutableLiveData printReceiptButtons = new MutableLiveData<>(0); + public SingleLiveEvent printerDisabled = new SingleLiveEvent<>(); public SingleLiveEvent printReceiptMsg = new SingleLiveEvent<>(); diff --git a/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java index 30a48c1..39db774 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java @@ -15,6 +15,7 @@ import com.utsmm.kbz.databinding.FragmentHostConfigBinding; import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel; import com.utsmyanmar.baselib.fragment.DataBindingFragment; import com.utsmyanmar.baselib.util.DataBindingConfig; +import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation; public class HostConfigFragment extends DataBindingFragment { @@ -22,6 +23,7 @@ public class HostConfigFragment extends DataBindingFragment { private HostConfigViewModel viewModel; private SharedViewModel sharedViewModel; + private boolean printerDisabled = SystemParamsOperation.getInstance().getPrinterDisabled(); protected Printer printer; int FONT_NORMAL = 20; int FONT_HEADER = 24; @@ -44,6 +46,7 @@ public class HostConfigFragment extends DataBindingFragment { FragmentHostConfigBinding binding = (FragmentHostConfigBinding) this.binding; viewModel.loadConfig(); + sharedViewModel.printerDisabled.setValue(printerDisabled); } @Override @@ -51,6 +54,7 @@ public class HostConfigFragment extends DataBindingFragment { super.onResume(); setToolBarTitleWithBackIcon("Host Configs"); + sharedViewModel.printerDisabled.setValue(printerDisabled); } @Override diff --git a/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java b/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java index 928b722..a925ddd 100644 --- a/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java +++ b/app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java @@ -647,6 +647,9 @@ public class TMSSetupsImpl implements TMSSetups{ else if(TextUtils.equals(name,"bin_list")) { SystemParamsOperation.getInstance().setBinValue(data); } + else if(TextUtils.equals(name, "printer_disable")){ + SystemParamsOperation.getInstance().setPrinterDisabled(parseBoolean(data)); + } } SystemParamsOperation.getInstance().setCarouselUrls(convertToString(imgUrls)); diff --git a/app/src/main/res/layout/fragment_host_config.xml b/app/src/main/res/layout/fragment_host_config.xml index fe45629..f3ea8a7 100644 --- a/app/src/main/res/layout/fragment_host_config.xml +++ b/app/src/main/res/layout/fragment_host_config.xml @@ -10,6 +10,9 @@ + @@ -362,6 +365,7 @@ android:layout_weight="1" android:layout_marginStart="8dp" android:text="Print" + android:visibility="@{sharedViewModel.printerDisabled ? View.VISIBLE : View.GONE}" android:onClick="@{()-> click.onPrint()}" android:background="@drawable/bg_rounded_btn_cv" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_print_receipt_screen.xml b/app/src/main/res/layout/fragment_print_receipt_screen.xml index b751701..4de290f 100644 --- a/app/src/main/res/layout/fragment_print_receipt_screen.xml +++ b/app/src/main/res/layout/fragment_print_receipt_screen.xml @@ -5,6 +5,7 @@ + @@ -296,92 +297,136 @@ + - - - + + android:layout_weight="1" + android:layout_marginEnd="6dp" + app:cardCornerRadius="12dp" + app:cardElevation="2dp" + android:foreground="?android:attr/selectableItemBackground" + android:clickable="true" + android:focusable="true"> - - + android:orientation="horizontal" + android:gravity="center" + android:background="@color/white" + android:padding="14dp" + android:onClick="@{()->click.onCancel()}"> - + android:text="@string/layout_cancel" + android:textColor="@color/colorPrimary" + android:textSize="15sp" + android:textStyle="bold" + android:fontFamily="@font/rubik_medium" /> + + + + - - - - - - - + android:orientation="horizontal" + android:gravity="center" + android:background="@color/colorPrimary" + android:padding="14dp" + android:onClick="@{()->click.onConfirm()}"> - + android:text="@string/layout_print" + android:textColor="@color/white" + android:textSize="15sp" + android:textStyle="bold" + android:fontFamily="@font/rubik_medium" /> + + + + + + + - + + - + - - + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b885f3..681172a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -616,5 +616,6 @@ No QR transactions to settle Confirm Search By Trace No + Continue \ No newline at end of file diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java index ae27eda..979bfb3 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java @@ -1750,4 +1750,15 @@ public class SystemParamsOperation { paramsSettings.setCertificateClientUrl(url); saveSystemParamsSettings(paramsSettings); } + + public void setPrinterDisabled(boolean printerDisabled) { + SystemParamsSettings paramsSettings = getSystemParamsSettings(); + paramsSettings.setPrinterDisabled(printerDisabled); + saveSystemParamsSettings(paramsSettings); + } + + public boolean getPrinterDisabled() { + SystemParamsSettings paramsSettings = getSystemParamsSettings(); + return paramsSettings.getPrinterDisabled(); + } } \ No newline at end of file diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java index 7060eee..c9dd4c1 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java @@ -260,6 +260,7 @@ public class SystemParamsSettings implements Serializable { private String terminalIdForEreceipt = ""; private String certificateUrl = ""; private String certificateClientUrl = ""; + private boolean printerDisabled = false; public boolean isQrPartialRefundEnable(){ return qrPartialRefundEnable; @@ -1067,6 +1068,18 @@ public class SystemParamsSettings implements Serializable { this.certificateClientUrl = url; } + public boolean isPrinterDisabled() { + return printerDisabled; + } + + public void setPrinterDisabled(boolean printerDisabled) { + this.printerDisabled = printerDisabled; + } + + public boolean getPrinterDisabled() { + return printerDisabled; + } + /* // 流水号起始 private String serialNum = Configs.getInstance().SERIAL_NUM(); // 批次号起始