feat: refs #8082 ticketPickup

This commit is contained in:
Sergio De la torre 2024-11-13 08:08:20 +01:00
parent afc8abe090
commit 83bc9d9de4
6 changed files with 40 additions and 4 deletions

View File

@ -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"

View File

@ -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?
)

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>