diff --git a/app/build.gradle b/app/build.gradle index 4163f6e4..5e1c6646 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,8 @@ android { applicationId "es.verdnatura" minSdkVersion 21 //21 targetSdkVersion 30 - versionCode 130 + versionCode 131 + //versionName = "8.9" versionCode 130 versionName = "9Beta" //versionName = "8.9Beta" versionCode 129 //versionName = "8.8Beta" versioncode 128 diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 73259592..f9a0b46e 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,7 +11,7 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 130, + "versionCode": 131, "versionName": "9Beta", "outputFile": "app-release.apk" } diff --git a/app/release/vn-pickingBeta.apk b/app/release/vn-picking.apk similarity index 65% rename from app/release/vn-pickingBeta.apk rename to app/release/vn-picking.apk index ac10086c..4a78f899 100644 Binary files a/app/release/vn-pickingBeta.apk and b/app/release/vn-picking.apk differ diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt index 08bfcc8f..abc4a469 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt @@ -825,18 +825,6 @@ class EndSacadorFragment( ) } - /* viewModel.saleTrackingReplace( - usuario = getData(USER), - password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, - vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0", - vOriginalQuantity = sales[position].picked.toString(), - vStateFk = PRESACADOR, - vBuyFk = originalItemScan, callFunction = "saleTrackingReplace" - - )*/ - - } private fun unMarkLine(position: Int) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt index 310f201d..b68215c6 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt @@ -329,9 +329,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { vIsChecked: String, vBuyFk: String ) { - //Lo ultimo que se envia - //sergio: se quita el 0 que habia por defecto para la previa se aƱada el buyFk que sera el item escaneado. - //getSacadorControladorUserCase.saleTrackingReplace(usuario,password,saleFk,vOriginalQuantity,vStateFk,vIsChecked,"0").enqueue(object : Callback{ + getSacadorControladorUserCase.saleTrackingReplace( usuario, password,