diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8a..b589d56e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7202c515..418e80de 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,16 +5,16 @@
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e23ad213..59c5529d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -275,7 +275,7 @@
-
+
diff --git a/.idea/modules/app/Gestor_Almacén.app.iml b/.idea/modules/app/Gestor_Almacén.app.iml
index 027b5be9..e7837857 100644
--- a/.idea/modules/app/Gestor_Almacén.app.iml
+++ b/.idea/modules/app/Gestor_Almacén.app.iml
@@ -30,9 +30,6 @@
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..35eb1ddf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/vn-warehouseManager.iml b/.idea/vn-warehouseManager.iml
deleted file mode 100644
index d6ebd480..00000000
--- a/.idea/vn-warehouseManager.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c83ae371..2657c081 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -34,13 +34,58 @@
-
-
-
- fr
- android-28
+ es
+ false
+ android-27
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
@@ -82,16 +127,40 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
@@ -99,10 +168,13 @@
+
+
+
-
+
@@ -120,17 +192,7 @@
-
-
-
@@ -871,9 +943,6 @@
-
-
-
@@ -896,19 +965,22 @@
-
+
+
+
+
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
- 475
+ 473
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt
- 530
+ 531
@@ -922,9 +994,39 @@
- file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
- 260
-
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 2153
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 964
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 1813
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 1809
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 1749
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 577
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+ 583
+
jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/76f3c69879d3e01c082f49d8661c5590838148e1/retrofit-2.3.0-sources.jar!/retrofit2/Response.java
diff --git a/app/beta/release/output-metadata.json b/app/beta/release/output-metadata.json
index e581ba78..f9768ef9 100644
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 228,
- "versionName": "23.38Beta",
+ "versionCode": 229,
+ "versionName": "23.40Beta",
"outputFile": "app-beta-release.apk"
}
],
diff --git a/app/build.gradle b/app/build.gradle
index a1f558d2..09a1a4b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,15 +6,15 @@ apply plugin: 'com.google.firebase.crashlytics'
android {
- compileSdkVersion 33
- // buildToolsVersion "29.0.3"
+ compileSdk 33
+// buildToolsVersion "29.0.3"
defaultConfig {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
- versionCode 228
- versionName = "23.38Beta"
+ versionCode 229
+ versionName = "23.40"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
index 26f6463f..f419aef5 100644
--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@@ -47,9 +47,6 @@ interface VerdnaturaService {
):
Call
- @POST("almacennew/worker_getId")//REVISADA
- fun worker_getId(@Body vararg params: Any):
- Call
@POST("almacennew/deviceLog_add")//REVISADA
fun deviceLog_add(
@@ -66,9 +63,6 @@ interface VerdnaturaService {
Call
//AJUSTES ========================================================================>
- @POST("almacennew/sector_get")//SALIX
- fun getSectors():
- Call>
@POST("almacennew/printer_get")//NO SALIX
fun printer_get():
@@ -83,18 +77,6 @@ interface VerdnaturaService {
fun worker_getPrinter(
):
Call>
-/*
- @POST("almacennew/worker_updatePrinter")//NO SALIX
- fun worker_updatePrinter(
- @Body vararg params: Any
- ):
- Call*/
-/*
- @POST("almacennew/worker_updateSector")//NO SALIX
- fun worker_updateSector(
- @Body vararg params: Any
- ):
- Call*/
@POST("almacennew/operator_updateItemPackingType")//NO SALIX
fun operator_updateItemPackingType(
@@ -171,7 +153,8 @@ interface VerdnaturaService {
@POST("almacennew/collection_assign")//NO SALIX
fun collection_assign(
):
- Call
+ Call
+
@POST("almacennew/operator_getItemPackingType")//NO SALIX
fun operator_getItemPackingType(
@@ -536,11 +519,6 @@ interface VerdnaturaService {
):
Call>
- @POST("almacennew/shelvingPriorityUpdate")//A BORRAR
- fun shelvingPriorityUpdate(
- @Body vararg params: Any
- ):
- Call
@POST("almacennew/itemShelvingMake")//REVISADA
fun itemShelvingMake(
@@ -598,13 +576,6 @@ interface VerdnaturaService {
):
Call
- @POST("almacennew/itemShelving_merge")//REVISADA
- fun itemShelving_merge(
- @Body vararg params: Any
- ):
- Call
-
-
@POST("almacennew/shelvingLog_add")//REVISADA
fun shelvingLog_add(
@Body vararg params: Any
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
index 66cbedf5..64d4dab9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
@@ -156,6 +156,28 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
})
}
+ fun setVisibleDiscard(
+ itemFk: Int,
+ warehouseFk: Int,
+ newValue: Int,
+ isTrash: Boolean
+ ) {
+ silex.itemTrash(itemFk, warehouseFk, newValue, isTrash)
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
+ _response.value = ResponseItemVO(
+ isError = true,
+ errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+ )
+ }
+
+ override fun onSuccess(response: Response) {
+ _response.value =
+ ResponseItemVO(isError = false, response = response.message())
+ }
+ })
+ }
+
fun updateGrouping(
itemFk: Int,
value: Int,
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 93a79f98..366cfcf0 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
@@ -748,7 +748,7 @@ class UbicadorFragment(
packingUpdate = true
}
saveNewItem(
- customDialogUbicador.getItemValue().toInt(),
+ customDialogUbicador.getItemValue().toLong(),
if (customDialogUbicador.getEtiquetaValue().isNullOrEmpty()) {
1
} else {
@@ -869,7 +869,7 @@ class UbicadorFragment(
}
private fun saveNewItem(
- itemFk: Int?,
+ itemFk: Number?,
etiquetas: Int,
packing: Int?,
visible: Int?,
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
index 04120137..09587383 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
@@ -108,7 +108,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
) {
//Tarea 5134 ok
salix.updateShelvingPriority("""{"code": "$shelving"}""", hashMapOf("priority" to priority))
- .enqueue(object : SilexCallback(context) {
+ .enqueue(object : SalixCallback(context) {
override fun onError(t: Throwable) {
_responsepriority.value = ResponseItemVO(
isError = true,
@@ -154,7 +154,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
fun itemShelvingMake(
shelving: String,
- item: Int,
+ item: Number,
quantity: Int,
packing: Int?,
warehouse: Int,
@@ -271,9 +271,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
vShelvingFk: String
) {
- /*salix.itemShelvingUpdate()
- .enqueue(object : SilexCallback(context) {*/
- silex.itemShelving_merge(vShelf, vShelvingFk)
+ salix.itemShelvingsUpdate(id= """{"id":$vShelf}""", params= hashMapOf("shelvingFk" to vShelvingFk))
.enqueue(object : SilexCallback(context) {
override fun onError(t: Throwable) {
_response.value = ResponseItemVO(
diff --git a/build.gradle b/build.gradle
index b112d51e..310b69c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'