From 83bc9d9de450915404c7802b4fb0f7a8bad6b34b Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 13 Nov 2024 08:08:20 +0100
Subject: [PATCH] feat: refs #8082 ticketPickup

---
 .../java/es/verdnatura/domain/SalixService.kt |  6 +++++
 .../presentation/common/SalixBackItems.kt     | 22 +++++++++++++++++++
 app/src/main/res/values-es/strings.xml        |  4 +++-
 app/src/main/res/values-fr/strings.xml        |  4 +++-
 app/src/main/res/values-pt/strings.xml        |  4 +++-
 app/src/main/res/values/strings.xml           |  4 +++-
 6 files changed, 40 insertions(+), 4 deletions(-)

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<List<TicketState>>
 
+    @GET("Tickets")
+    fun ticketIsPickup(
+        @Query("filter") filter: Any, @Query("schema") schema: String = "vn"
+    ): Call<List<PickupResponse>>
+
     @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 @@
     <string name="m3">m3</string>
     <string name="options">Opciones</string>
     <string name="hourMinute">%1$d:%2$d</string>
-    <string name="dateDay">%02d-%02d-%04d</string>
+    <string name="dateDay">%1$02d-%2$02d-%3$04d</string>
     <string name="level">Nivel:</string>
     <string name="ticketAbb">-T:</string>
     <string name="signPackaging">Firma:</string>
@@ -902,6 +902,8 @@
     <string name="selectRoute">Selecciona ruta destino</string>
     <string name="moveToRoute">Mover a nueva ruta</string>
     <string name="scanExpeditionForMove">Escanea la/s caja/s que cambia/n de ruta</string>
+    <string name="ticketPickup">Ticket de recogida</string>
+    <string name="ticketPickupDescr">El ticket %1$s van a pasar a recogerlo</string>
 
 
 </resources>
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 @@
     <string name="m3">m3</string>
     <string name="options">Opciones</string>
     <string name="hourMinute">%1$d:%2$d</string>
-    <string name="dateDay">%02d-%02d-%04d</string>
+    <string name="dateDay">%1$02d-%2$02d-%3$04d</string>
     <string name="level">Nivel:</string>
     <string name="ticketAbb">-T:</string>
     <string name="signPackaging">Firma:</string>
@@ -902,5 +902,7 @@
     <string name="selectRoute">Selecciona ruta destino</string>
     <string name="moveToRoute">Mover a nueva ruta</string>
     <string name="scanExpeditionForMove">Escanea la/s caja/s que cambia/n de ruta</string>
+    <string name="ticketPickup">Ticket de recogida</string>
+    <string name="ticketPickupDescr">El ticket %1$s van a pasar a recogerlo</string>
 
 </resources>
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 @@
     <string name="m3">m3</string>
     <string name="options">Opciones</string>
     <string name="hourMinute">%1$d:%2$d</string>
-    <string name="dateDay">%02d-%02d-%04d</string>
+    <string name="dateDay">%1$02d-%2$02d-%3$04d</string>
     <string name="level">Nivel:</string>
     <string name="ticketAbb">-T:</string>
     <string name="signPackaging">Firma:</string>
@@ -902,5 +902,7 @@
     <string name="selectRoute">Selecciona ruta destino</string>
     <string name="moveToRoute">Mover a nueva ruta</string>
     <string name="scanExpeditionForMove">Escanea la/s caja/s que cambia/n de ruta</string>
+    <string name="ticketPickup">Ticket de recogida</string>
+    <string name="ticketPickupDescr">El ticket %1$s van a pasar a recogerlo</string>
 
 </resources>
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 @@
     <string name="m3">m3</string>
     <string name="options">Opciones</string>
     <string name="hourMinute">%1$d:%2$d</string>
-    <string name="dateDay">%02d-%02d-%04d</string>
+    <string name="dateDay">%1$02d-%2$02d-%3$04d</string>
     <string name="level">Nivel:</string>
     <string name="ticketAbb">-T:</string>
     <string name="signPackaging">Firma:</string>
@@ -905,5 +905,7 @@
     <string name="selectRoute">Selecciona ruta destino</string>
     <string name="moveToRoute">Mover a nueva ruta</string>
     <string name="scanExpeditionForMove">Escanea la/s caja/s que cambia/n de ruta</string>
+    <string name="ticketPickup">Ticket de recogida</string>
+    <string name="ticketPickupDescr">El ticket %1$s van a pasar a recogerlo</string>
 
 </resources>