verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: refs#8082 TicketPickupResponse

This commit is contained in:
Sergio De la torre 2025-02-04 11:57:45 +01:00
parent 103df4e31e
commit b6115837ae
3 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/es/verdnatura/domain/SalixService.kt
View File

@ -5,8 +5,8 @@ import es.verdnatura.presentation.common.ExpeditionPrintOut
import es.verdnatura.presentation.common.ItemBarCodeSalix import es.verdnatura.presentation.common.ItemBarCodeSalix
import es.verdnatura.presentation.common.ItemShelving import es.verdnatura.presentation.common.ItemShelving
import es.verdnatura.presentation.common.PackingSiteSalix import es.verdnatura.presentation.common.PackingSiteSalix
import es.verdnatura.presentation.common.PickupResponse
import es.verdnatura.presentation.common.SaleTrackingSalix import es.verdnatura.presentation.common.SaleTrackingSalix
import es.verdnatura.presentation.common.TicketPickupResponse
import es.verdnatura.presentation.common.TicketState import es.verdnatura.presentation.common.TicketState
import es.verdnatura.presentation.view.feature.ajustes.model.Printers import es.verdnatura.presentation.view.feature.ajustes.model.Printers
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
@ -638,7 +638,7 @@ interface SalixService {
@GET("Tickets") @GET("Tickets")
fun ticketIsPickup( fun ticketIsPickup(
@Query("filter") filter: Any, @Query("schema") schema: String = "vn" @Query("filter") filter: Any, @Query("schema") schema: String = "vn"
): Call<List<PickupResponse>> ): Call<List<TicketPickupResponse>>
@POST("Applications/workerMachinery_isRegistered/execute-func") @POST("Applications/workerMachinery_isRegistered/execute-func")
fun workerMachineryIsRegistered( fun workerMachineryIsRegistered(

8
app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt
View File

@ -101,14 +101,8 @@ data class ExpeditionPrintOut(
val isChecked: Boolean val isChecked: Boolean
) )
data class PickupResponse( data class TicketPickupResponse(
val routeFk: Int,
val route: Route?
)
data class Route(
val id: Int, val id: Int,
val agencyModeFk: Int,
val agencyMode: AgencyMode? val agencyMode: AgencyMode?
) )

24
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionCheckerViewModel.kt
View File

@ -14,8 +14,8 @@ import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.Event import es.verdnatura.presentation.common.Event
import es.verdnatura.presentation.common.PickupResponse
import es.verdnatura.presentation.common.SaleTrackingReplaceSalix import es.verdnatura.presentation.common.SaleTrackingReplaceSalix
import es.verdnatura.presentation.common.TicketPickupResponse
import es.verdnatura.presentation.common.TicketState import es.verdnatura.presentation.common.TicketState
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
import es.verdnatura.presentation.view.feature.collection.mapper.map import es.verdnatura.presentation.view.feature.collection.mapper.map
@ -304,22 +304,21 @@ class CollectionCheckerViewModel(val context: Context) : BaseViewModel(context)
fun ticketIsPickup( fun ticketIsPickup(
ticketFk: Number ticketFk: Number
) { ) {
salix.ticketIsPickup( salix.ticketIsPickup(
"""{ """{
"where": { "where": {
"id": $ticketFk "id": $ticketFk
}, },
"fields": ["id", "routeFk"], "fields": ["id", "agencyModeFk"],
"include": [ "include": [
{ {
"relation": "route",
"scope": {
"fields": ["id", "agencyModeFk"],
"include": {
"relation": "agencyMode", "relation": "agencyMode",
"scope": { "scope": {
"fields": ["id", "deliveryMethodFk","code"], "fields": ["id", "deliveryMethodFk", "code"],
"where": {"code": "REC_ALG"}, "where": {
"code": { "inq": ["REC_ALG", "PICKUP"] }
},
"include": { "include": {
"relation": "deliveryMethod", "relation": "deliveryMethod",
"scope": { "scope": {
@ -328,17 +327,14 @@ class CollectionCheckerViewModel(val context: Context) : BaseViewModel(context)
} }
} }
} }
}
}
] ]
}""".trim() }""".trim()
).enqueue(object : SalixCallback<List<TicketPickupResponse>>(context) {
).enqueue(object : SalixCallback<List<PickupResponse>>(context) { override fun onSuccess(response: Response<List<TicketPickupResponse>>) {
override fun onSuccess(response: Response<List<PickupResponse>>) {
_responseTicketIsPickup.value = _responseTicketIsPickup.value =
response.body() response.body()
?.firstOrNull()?.route?.agencyMode?.deliveryMethod?.code == "PICKUP" ?.firstOrNull()?.agencyMode?.deliveryMethod?.code == "PICKUP"
} }