From e5f5c60e87313c613bb491489878050e145778cb Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 19 Apr 2024 09:50:03 +0200
Subject: [PATCH] refs #6921 feat:dropOffNote
---
.../view/feature/delivery/model/ClientTicket.kt | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt
index f60c510b..a3a4cc84 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt
@@ -3,6 +3,7 @@ package es.verdnatura.presentation.view.feature.delivery.model
import androidx.room.Entity
import androidx.room.PrimaryKey
import androidx.room.TypeConverters
+import com.google.gson.annotations.SerializedName
import es.verdnatura.db.MapTypeConverter
import java.io.Serializable
@@ -23,7 +24,9 @@ data class ClientTicketSalix(
var city: String,
var warehouseName: String?,
var salePersonPhone: String?,
- var ticketObservation: String?,
+ @SerializedName(value = "ticketObservation", alternate = ["observationDelivery"])
+ var observationDelivery: String?,
+ var observationDropOff: String?,
var clientPhone: String?,
var clientMobile: String?,
var addressPhone: String?,
@@ -51,9 +54,17 @@ data class Ticket(
var cmrFk: Int? = null
) : Serializable
+data class TicketObservation
+ (
+ var ticketFk: Long,
+ var description: String,
+ var observationTypeFk: Int
+)
+
@Entity(tableName = "signedPending")
data class SignedTickets(
@TypeConverters(MapTypeConverter::class) val queryMapList: MutableMap<String?, String?>,
@PrimaryKey
val fileName: String
)
+