From 754d4c41c332529429fcc90ec6a4f057d8820f70 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 6 Mar 2024 13:33:59 +0100
Subject: [PATCH] refs #5890 feat:itemShelvingSale

---
 .../fragment/CollectionFragmentPickerNew.kt         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
index d069b507..298fd097 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
@@ -265,7 +265,7 @@ class CollectionFragmentPickerNew(
     private fun setEvents() {
 
         binding.mainToolbar.backButton.setOnClickListener {
-            ma.onBackPressed()
+            ma.onMyBackPressed()
         }
         //ESCANER =========
 
@@ -351,7 +351,7 @@ class CollectionFragmentPickerNew(
                       customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
                           .setOkButton(getString(R.string.accept)) {
                               customDialog.dismiss()
-                              if (activity != null) ma.onBackPressed()
+                              if (activity != null) ma.onMyBackPressed()
                           }.show()
                   }
 
@@ -378,7 +378,7 @@ class CollectionFragmentPickerNew(
                             .setDescription(it.errorMessage)
                             .setOkButton(getString(R.string.accept)) {
                                 customDialog.dismiss()
-                                if (activity != null) ma.onBackPressed()
+                                if (activity != null) ma.onMyBackPressed()
                             }.show()
                     }
 
@@ -405,7 +405,7 @@ class CollectionFragmentPickerNew(
                      customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
                          .setOkButton(getString(R.string.accept)) {
                              customDialog.dismiss()
-                             if (activity != null) ma.onBackPressed()
+                             if (activity != null) ma.onMyBackPressed()
                          }.show()
                  }
 
@@ -941,6 +941,7 @@ class CollectionFragmentPickerNew(
     private fun customDialogTakeAction(
         position: Int, itemShelvingFk: Int, totalReserved: Int, isItemScanned: Boolean?
     ) {
+        goBack = false
         isScanned = isItemScanned
         if (customDialogList.getValueTwo().isNotEmpty()) {
 
@@ -1037,7 +1038,9 @@ class CollectionFragmentPickerNew(
         }.setOkButtonTwo("NO") {
             scanRequest()
             customDialogThreeButtonsQuantity.dismiss()
-            viewModel.itemShelvingSaleExists(myGroupList[position].itemShelvingSaleFk, position, quantity)
+            if (quantity == 0){
+                viewModel.itemShelvingSaleExists(myGroupList[position].itemShelvingSaleFk, position, quantity)
+            }else{markLine(position, quantity, true)}
             //markLine(position, quantity, true)
         }.setKoButton("CANCELAR") {
             scanRequest()