diff --git a/app/build.gradle b/app/build.gradle index f50adca1..e5db4c8a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "es.verdnatura" minSdkVersion 24 //21 targetSdkVersion 33 - versionCode 171 - versionName = "23.8" + versionCode 172 + versionName = "23.10Beta" //versionName = "23.8Beta" versionCode 170 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt index 93649bc4..f17d0240 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt @@ -130,11 +130,11 @@ class CollectionFragment( mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok) if (type.equals(CONTROLADOR)) { //sergio: comprueba si viene de la pantalla de controlador - //Tarea #4280 cambiar a ticket_isOutClosureZone - /* viewModel.ticket_isOutClosureZone( + //Tarea #4280 + viewModel.ticket_isOutClosureZone( collection.collectionFk - )*/ + ) workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk } @@ -1398,10 +1398,10 @@ class CollectionFragment( if (type.equals(CONTROLADOR)) { //Tarea #4280 cambiar a ticket_isOutClosureZone - /* viewModel.ticket_isOutClosureZone( + viewModel.ticket_isOutClosureZone( txtscan.toInt() - )*/ + ) } }