verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #5890 feat:itemShelvingSale

This commit is contained in:
Sergio De la torre 2024-03-06 13:33:59 +01:00
parent f163ac5b11
commit 754d4c41c3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
View File

@ -265,7 +265,7 @@ class CollectionFragmentPickerNew(
private fun setEvents() { private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener { binding.mainToolbar.backButton.setOnClickListener {
ma.onBackPressed() ma.onMyBackPressed()
} }
//ESCANER ========= //ESCANER =========
@ -351,7 +351,7 @@ class CollectionFragmentPickerNew(
customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
.setOkButton(getString(R.string.accept)) { .setOkButton(getString(R.string.accept)) {
customDialog.dismiss() customDialog.dismiss()
if (activity != null) ma.onBackPressed() if (activity != null) ma.onMyBackPressed()
}.show() }.show()
} }
@ -378,7 +378,7 @@ class CollectionFragmentPickerNew(
.setDescription(it.errorMessage) .setDescription(it.errorMessage)
.setOkButton(getString(R.string.accept)) { .setOkButton(getString(R.string.accept)) {
customDialog.dismiss() customDialog.dismiss()
if (activity != null) ma.onBackPressed() if (activity != null) ma.onMyBackPressed()
}.show() }.show()
} }
@ -405,7 +405,7 @@ class CollectionFragmentPickerNew(
customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
.setOkButton(getString(R.string.accept)) { .setOkButton(getString(R.string.accept)) {
customDialog.dismiss() customDialog.dismiss()
if (activity != null) ma.onBackPressed() if (activity != null) ma.onMyBackPressed()
}.show() }.show()
} }
@ -941,6 +941,7 @@ class CollectionFragmentPickerNew(
private fun customDialogTakeAction( private fun customDialogTakeAction(
position: Int, itemShelvingFk: Int, totalReserved: Int, isItemScanned: Boolean? position: Int, itemShelvingFk: Int, totalReserved: Int, isItemScanned: Boolean?
) { ) {
goBack = false
isScanned = isItemScanned isScanned = isItemScanned
if (customDialogList.getValueTwo().isNotEmpty()) { if (customDialogList.getValueTwo().isNotEmpty()) {
@ -1037,7 +1038,9 @@ class CollectionFragmentPickerNew(
}.setOkButtonTwo("NO") { }.setOkButtonTwo("NO") {
scanRequest() scanRequest()
customDialogThreeButtonsQuantity.dismiss() 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) //markLine(position, quantity, true)
}.setKoButton("CANCELAR") { }.setKoButton("CANCELAR") {
scanRequest() scanRequest()