diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt index 1e82e45c..2a315b62 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt @@ -4,11 +4,14 @@ import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import es.verdnatura.domain.SalixCallback +import es.verdnatura.domain.userCases.UserCases import es.verdnatura.presentation.base.BaseViewModel import retrofit2.Response class BoxPickingViewModel(val context: Context) : BaseViewModel(context) { + private val userCase = UserCases(context) + private val _isBoxPickingInPrintOut by lazy { MutableLiveData() } val isBoxPickingInPrintOut: LiveData = _isBoxPickingInPrintOut @@ -35,21 +38,22 @@ class BoxPickingViewModel(val context: Context) : BaseViewModel(context) { } fun isBoxPickingInPrintOut(expeditionFk: Long, barcode: String) { - salix.barcodesToItem(barcode).enqueue(object : SalixCallback(context) { + userCase.itemToBarCode(barcode, salix) + .enqueue(object : SalixCallback(context) { - override fun onSuccess(response: Response) { + override fun onSuccess(response: Response) { + + if (response.body() != null) { + isBoxPickingOk( + itemFk = response.body().toString().toLong(), + expeditionFk = expeditionFk + ) + } else { + _isBoxPickingInPrintOut.value = false + } - if (response.body() != null) { - isBoxPickingOk( - itemFk = response.body().toString().toLong(), - expeditionFk = expeditionFk - ) - } else { - _isBoxPickingInPrintOut.value = false } - - } - }) + }) } } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt index 20bb2dc6..68c0e136 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt @@ -187,7 +187,7 @@ class PhotosFragment( } responseCode.observe(viewLifecycleOwner) { - if (it.isNotBlank()) { + if (it!=null) { viewModel.getItemCard( it.toLong(), mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK)