diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index a7326f06..18a480dd 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -77,6 +77,12 @@ interface SalixService { fun getCollectionSalixLocal( ): Call> + @POST("routes/{id}/driver-route-email") + fun driverRouteEmail( + @Path("id") id: Number, + @Body params: Any + ): Call + @POST("collections/{id}/getTickets") fun getCollectionTickets( @Path("id") id: Number, diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt index 5f5c6ce0..0b10c2d6 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -218,7 +218,7 @@ abstract class BaseFragment(viewModelCla R.drawable.ic_eye_ui -> getString(R.string.icViewCollection) R.drawable.ic_collection -> getString(R.string.icViewCollection) R.drawable.ic_ubicator_check -> getString(R.string.checkerUbication) - R.drawable.ic_delivery_truck -> "Abre la app de Reparto para escanear carga" + R.drawable.ic_delivery_truck -> getString(R.string.loadRoute) R.drawable.ic_confirm -> getString(R.string.confirmDescription) R.drawable.camion -> getString(R.string.openLoadingConsignee) @@ -233,6 +233,7 @@ abstract class BaseFragment(viewModelCla R.drawable.ic_eye_inventory -> getString(R.string.inventoryShowParking) R.drawable.ic_sort->getString(R.string.sortRouteSalix) R.drawable.ic_sign_ticket->getString(R.string.signed) + R.drawable.ic_send-> getString(R.string.sendDriverRoute) else -> { "" } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt index bc7e8d39..61ed7769 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt @@ -126,7 +126,8 @@ class TicketsFragment( } listIcons.add(iconSigned) - listIcons.add(iconSend) + //Tarea 5867 + //listIcons.add(iconSend) listIcons.add(iconSettings) // listIcons.add(iconSort) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt index 7db27b38..6ef896a5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt @@ -152,7 +152,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { } override fun onError(t: Throwable) { - _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) + _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) } }) @@ -187,7 +187,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { silex.expeditionState_add(expeditions, state) .enqueue(object : SilexCallback(context) { override fun onSuccess(response: Response) { - _responseStateAdd.value = ResponseItemVO(state,false,"",0) + _responseStateAdd.value = ResponseItemVO(state, false, "", 0) } override fun onError(t: Throwable) { @@ -196,7 +196,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { } override fun onFailure(call: Call, t: Throwable) { - _responseStateList.value = ResponseItemVO("", true, t.message.toString(), 0) + _responseStateList.value = ResponseItemVO("", true, t.message.toString(), 0) } @@ -270,7 +270,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { override fun onError(t: Throwable) { //_routeList.value = RouteList() - _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) + _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) //super.onError(t) } @@ -294,9 +294,29 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { } override fun onError(t: Throwable) { - // _clientTicketList.value = ClientTicketList() - _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) - // super.onError(t) + // _clientTicketList.value = ClientTicketList() + _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) + // super.onError(t) + + } + }) + } + + fun driverRouteEmail( + routeId: Long, + email:String + ) { + salix.driverRouteEmail(id = routeId,hashMapOf("recipient" to email)) + .enqueue(object : SilexCallback(context) { + + override fun onSuccess(response: Response) { + + _response.value = ResponseItemVO() + } + + override fun onError(t: Throwable) { + _response.value = ResponseItemVO() + super.onError(t) } }) @@ -399,13 +419,19 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { //Otro fallo override fun onError(t: Throwable) { - _responseSign.value = ResponseItemVO("", true, "Tickets:"+File(filePath).name + "→"+ t.message.toString(), 0) - // super.onError(t) + _responseSign.value = ResponseItemVO( + "", + true, + "Tickets:" + File(filePath).name + "→" + t.message.toString(), + 0 + ) + // super.onError(t) } //Fallo de red override fun onFailure(call: Call, t: Throwable) { - _responseSign.value = ResponseItemVO("NetWork Error", true, t.message.toString(),0) + _responseSign.value = + ResponseItemVO("NetWork Error", true, t.message.toString(), 0) } }) diff --git a/app/src/main/res/layout/item_expedition_summary_row.xml b/app/src/main/res/layout/item_expedition_summary_row.xml index 269490d4..5cedb17d 100644 --- a/app/src/main/res/layout/item_expedition_summary_row.xml +++ b/app/src/main/res/layout/item_expedition_summary_row.xml @@ -105,7 +105,7 @@ android:layout_height="36dp" android:layout_marginRight="2dp" android:contentDescription="" - android:tooltipText="Permite escanear expediciones del consigntario seleccionado" + android:tooltipText="@string/scanAddressSelected" app:srcCompat="@drawable/camion" />