diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
index ec53bd97..8ac6cf53 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
@@ -55,7 +55,6 @@ class SacadorFragmentNew(
setToolBar()
setEvents()
callBack(type)
- println("El sacador new y type $type")
super.init()
}
@@ -149,32 +148,19 @@ class SacadorFragmentNew(
customDialogInput.setDescription(getString(R.string.printPreviousGroup))
.setValue("")
.setOkButton(getString(R.string.print)) {
- try {
- if (customDialogInput.getValue().isNotEmpty()
- ) {
- print()
- }
- } catch (ex: Exception) {
- getString(R.string.errorInput)
- }
- customDialogInput.setValue("")
+
+ print()
}.setKoButton(getString(R.string.cancel)) {
customDialogInput.dismiss()
}.show()
customDialogInput.setFocusText()
-
-
- customDialogInput.setFocusText()
ma.hideKeyboard(customDialogInput.getEditText())
customDialogInput.getEditText().setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
- if (customDialogInput.getValue().isNotEmpty()
- ) {
- print()
- }
+ print()
return@setOnEditorActionListener true
}
@@ -185,14 +171,27 @@ class SacadorFragmentNew(
}
private fun print() {
- if (ma.havePrinter()) {
- viewModel.ticket_printLabelPrevious(customDialogInput.getValue().toInt())
- (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(
- requireContext()
- )
- } else {
- getString(R.string.selectPrinter).toast(requireContext())
+
+ try {
+ if (customDialogInput.getValue().isNotEmpty()
+ ) {
+ if (ma.havePrinter()) {
+ viewModel.ticket_printLabelPrevious(customDialogInput.getValue().toInt())
+ (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(
+ requireContext()
+ )
+ } else {
+ getString(R.string.selectPrinter).toast(requireContext())
+ }
+ }
+
+ } catch (ex: Exception) {
+ getString(R.string.errorInput)
}
+ customDialogInput.setValue("")
+
+
+
}
private fun setEvents() {
diff --git a/app/src/main/res/layout/sale_row_fragment.xml b/app/src/main/res/layout/sale_row_fragment.xml
index d25536bd..c1ba9572 100644
--- a/app/src/main/res/layout/sale_row_fragment.xml
+++ b/app/src/main/res/layout/sale_row_fragment.xml
@@ -370,8 +370,7 @@
android:layout_marginStart="5dp"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/linearLayoutColor"
-
-
+ app:layout_constraintTop_toTopOf="parent"
>
+ android:textColor="@color/verdnatura_white"
+ app:layout_constraintTop_toTopOf="parent">
@@ -413,12 +413,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="100"
- android:layout_weight="0.5"
+ android:layout_weight="0.30"
android:textSize="22sp"
android:gravity="right"
android:textColor="@color/verdnatura_white"
android:layout_marginEnd="5dp"
- tool:text="20/30">
+ tool:text="2000/3000">
@@ -433,11 +433,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">