From 0c198b410154d80f1a9077e5e486844bfa62d401 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 16 Oct 2024 11:34:52 +0200
Subject: [PATCH] feat: refs #8090 deleteEpxpedition

---
 .../java/es/verdnatura/domain/SalixService.kt | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 61bbf4dd..921f597e 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -3,6 +3,7 @@ package es.verdnatura.domain
 import com.google.gson.JsonObject
 import es.verdnatura.presentation.common.ExpeditionPrintOut
 import es.verdnatura.presentation.common.ItemBarCodeSalix
+import es.verdnatura.presentation.common.ItemShelving
 import es.verdnatura.presentation.common.PackingSiteSalix
 import es.verdnatura.presentation.common.SaleTrackingSalix
 import es.verdnatura.presentation.common.TicketState
@@ -36,8 +37,6 @@ import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
 import es.verdnatura.presentation.view.feature.inventario.model.ItemInventoryParking
 import es.verdnatura.presentation.view.feature.login.model.AccessConfigSalix
 import es.verdnatura.presentation.view.feature.login.model.DataUserSalix
-import es.verdnatura.presentation.view.feature.login.model.LoginApp
-import es.verdnatura.presentation.view.feature.login.model.LoginAppData
 import es.verdnatura.presentation.view.feature.login.model.LoginDevice
 import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO
 import es.verdnatura.presentation.view.feature.login.model.NameWorker
@@ -45,6 +44,7 @@ import es.verdnatura.presentation.view.feature.login.model.OperatorAdd
 import es.verdnatura.presentation.view.feature.login.model.OperatorSalix
 import es.verdnatura.presentation.view.feature.login.model.RenewToken
 import es.verdnatura.presentation.view.feature.login.model.VersionApp
+import es.verdnatura.presentation.view.feature.login.model.WorkerData
 import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
 import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
 import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue
@@ -105,8 +105,8 @@ interface SalixService {
 
     @POST("Devices/handleUser")
     fun handleUser(
-        @Body params: LoginApp
-    ): Call<LoginAppData>
+        @Body params: MutableMap<String, Any>
+    ): Call<WorkerData>
 
     @GET("VnUsers/getCurrentUserData")
     fun getCurrentUserData(
@@ -218,6 +218,12 @@ interface SalixService {
         @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
     ): Call<Any>
 
+    @POST("Applications/itemShelvingSale_deleteAdded/execute-proc")
+    fun itemShelvingSaleDeleteAdded(
+        @Query("schema") schema: String = "vn",
+        @Query("params") params: Any? = null
+    ): Call<Any>
+
     @POST("Applications/collection_get/execute-proc")
     fun collectionGet(
         @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@@ -854,8 +860,11 @@ interface SalixService {
 
     @GET("Suppliers")
     fun getSuppliers(
-        @Query("filter") filter: String = """{"fields":{"id":true,"name":true},"order":"name ASC","where":{"isActive":1,"name":{"neq":null}}, "include":[{"relation":"contacts","scope":{"fields":["email"],"where":{"email":{"neq":null}}}}]}"""
+        @Query("filter") filter: String
+    ): Call<List<Supplier>>
 
+    @GET("Suppliers/getWithPackaging")
+    fun getWithPackaging(
     ): Call<List<Supplier>>
 
     @GET("Entries")
@@ -966,6 +975,11 @@ interface SalixService {
         @Path("id") id: Number, @Body params: Any
     ): Call<Any>
 
+    @GET("ItemShelvings/{id}")
+    fun itemShelvingGet(
+        @Path("id") id: Number
+    ): Call<ItemShelving>
+
     @POST("ItemShelvingSales/itemShelvingSale_addByCollection")
     fun itemShelvingSaleAddByCollection(
         @Body params: Any,
@@ -997,6 +1011,11 @@ interface SalixService {
         @Body params: Any
     ): Call<Unit>
 
+    @POST("Expeditions/deleteExpeditions")
+    fun deleteExpedition(
+        @Body params: Any
+    ): Call<Any>
+
     @GET("ExpeditionStates/findOne")
     fun findExpedition(
         @Query("filter") filter: String