diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index cb454d7b..442a341f 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -5,6 +5,7 @@ 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.PickupResponse import es.verdnatura.presentation.common.SaleTrackingSalix import es.verdnatura.presentation.common.TicketState import es.verdnatura.presentation.view.feature.ajustes.model.Printers @@ -611,6 +612,11 @@ interface SalixService { @Query("filter") filter: Any, @Query("schema") schema: String = "vn" ): Call> + @GET("Tickets") + fun ticketIsPickup( + @Query("filter") filter: Any, @Query("schema") schema: String = "vn" + ): Call> + @POST("Applications/workerMachinery_isRegistered/execute-func") fun workerMachineryIsRegistered( @Query("params") params: Any, @Query("schema") schema: String = "vn" diff --git a/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt b/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt index 6c9d4049..92ee45f4 100644 --- a/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt +++ b/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt @@ -96,4 +96,26 @@ data class ExpeditionPrintOut( val expeditionFk: Long, val itemFk: Int, val isChecked: Boolean +) + +data class PickupResponse( + val routeFk: Int, + val route: Route? +) + +data class Route( + val id: Int, + val agencyModeFk: Int, + val agencyMode: AgencyMode? +) + +data class AgencyMode( + val id: Int, + val deliveryMethodFk: Int, + val deliveryMethod: DeliveryMethod? +) + +data class DeliveryMethod( + val id: Int, + val code: String? ) \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d6b398cb..26b8a610 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -728,7 +728,7 @@ m3 Opciones %1$d:%2$d - %02d-%02d-%04d + %1$02d-%2$02d-%3$04d Nivel: -T: Firma: @@ -902,6 +902,8 @@ Selecciona ruta destino Mover a nueva ruta Escanea la/s caja/s que cambia/n de ruta + Ticket de recogida + El ticket %1$s van a pasar a recogerlo diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d5b7b5b7..66eff229 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -728,7 +728,7 @@ m3 Opciones %1$d:%2$d - %02d-%02d-%04d + %1$02d-%2$02d-%3$04d Nivel: -T: Firma: @@ -902,5 +902,7 @@ Selecciona ruta destino Mover a nueva ruta Escanea la/s caja/s que cambia/n de ruta + Ticket de recogida + El ticket %1$s van a pasar a recogerlo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2d6b58fe..cfb7dbd4 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -728,7 +728,7 @@ m3 Opciones %1$d:%2$d - %02d-%02d-%04d + %1$02d-%2$02d-%3$04d Nivel: -T: Firma: @@ -902,5 +902,7 @@ Selecciona ruta destino Mover a nueva ruta Escanea la/s caja/s que cambia/n de ruta + Ticket de recogida + El ticket %1$s van a pasar a recogerlo diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 263b6121..791b0b4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -729,7 +729,7 @@ m3 Opciones %1$d:%2$d - %02d-%02d-%04d + %1$02d-%2$02d-%3$04d Nivel: -T: Firma: @@ -905,5 +905,7 @@ Selecciona ruta destino Mover a nueva ruta Escanea la/s caja/s que cambia/n de ruta + Ticket de recogida + El ticket %1$s van a pasar a recogerlo