diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt index 598a58e5..72ebf54f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt @@ -151,8 +151,8 @@ class UbicadorFragment : BaseFragment item.itemCreated!!.contains("old", ignoreCase = true) }.map { item -> @@ -675,47 +686,42 @@ class UbicadorFragment : BaseFragment viewModel.setParking( - it.originalShelvingFk, it.originalParking + customDialogOlder.setTitle(getString(R.string.info)).setDescription( + finalOutput + ).setOkButton( + getString(R.string.ok) + ) { + when (it.originalAction) { + Action.PARKINEAR -> viewModel.setParking( + it.originalShelvingFk, it.originalParking + ) + + Action.TRANSFERIR -> { + viewModel.itemShelvingTransfer( + it.itemShelvingFk!!, it.originalShelvingFk ) - - Action.TRANSFERIR -> { - println("transfer item ${it.itemShelvingFk}") - println("transfer carro ${it.originalShelvingFk}") - viewModel.itemShelvingTransfer( - it.itemShelvingFk!!, - it.originalShelvingFk - ) - } - - null -> d("", "no action") } + null -> d("", "no action") + } - customDialogOlder.dismiss() + customDialogOlder.dismiss() - }.setKoButton(getString(R.string.cancel)) { - customDialogOlder.dismiss() - }.setCancelable(true) + }.setKoButton(getString(R.string.cancel)) { + customDialogOlder.dismiss() + }.setCancelable(true) customDialogOlder.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + + Handler(Looper.getMainLooper()).postDelayed({ + if (finalOutput != "") customDialogOlder.show() + }, 1000) } - Handler(Looper.getMainLooper()).postDelayed({ - customDialogOlder.show() - }, 1000) } } @@ -1098,12 +1104,12 @@ class UbicadorFragment : BaseFragment if (item.buyFk == null) { @@ -1169,10 +1174,9 @@ class UbicadorFragment : BaseFragment( ConstAndValues.PRINTERFK @@ -1276,14 +1280,7 @@ class UbicadorFragment : BaseFragment get() = _responseUbicator + private val _responseItemShelvingSaleReserve by lazy { MutableLiveData() } + val responseItemShelvingSaleReserve: LiveData + get() = _responseItemShelvingSaleReserve + private val _responseHasOlder by lazy { MutableLiveData() } val responseHasOlder: LiveData get() = _responseHasOlder @@ -360,8 +368,10 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { override fun onSuccess(response: Response) { val itemShelving = response.body() if (itemShelving?.parking == null) { + println("No hay parking sin problema") itemShelvingTransfer(itemShelvingFk, shelvingFkTo) } else { + println("Tiene parking ${itemShelving}") getItemsByReviewOrder( shelving = shelvingFkTo, itemFk = itemFk, @@ -572,13 +582,33 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { } fun itemShelvingDelete(itemShelvingFk: Int) { - salix.itemShelvingsDelete(itemShelvingFk).enqueue(object : SalixCallback(context) { - override fun onSuccess(response: Response) { - _responseUbicator.value = true + val calendar = Calendar.getInstance() + calendar.add(Calendar.DAY_OF_YEAR, 0) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + val today = dateFormat.format(calendar.time) + + salix.itemShelvingSaleTotalBySale( + filter = """ + {"where":{"itemShelvingFk":$itemShelvingFk,"created":{"gte":"$today"}},"limit":10} + """.trimIndent() + ).enqueue(object : SalixCallback>(context) { + override fun onSuccess(response: Response>) { + if (response.body()!!.isEmpty()) + salix.itemShelvingsDelete(itemShelvingFk) + .enqueue(object : SalixCallback(context) { + + override fun onSuccess(response: Response) { + _responseUbicator.value = true + + } + }) else { + _responseItemShelvingSaleReserve.value = false + } } }) + } fun itemShelvingSelfConsumption(shelvingFk: String, itemFk: Number, quantity: Int) {