From a068ed3f6cea45de584698fcedaf8d805a7c3359 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Tue, 18 Jul 2023 07:10:13 +0200 Subject: [PATCH] refs #4676 delivery->picking --- .idea/deploymentTargetDropDown.xml | 17 -- app/src/main/AndroidManifest.xml | 6 +- .../java/es/verdnatura/MobileApplication.kt | 1 + .../java/es/verdnatura/domain/Extensions.kt | 8 + .../es/verdnatura/domain/VerdnaturaService.kt | 5 + .../presentation/base/BaseFragment.kt | 4 +- .../common/ItemDescorationCustomized.kt | 13 + .../presentation/common/NetworkUtils.kt | 42 +++ .../presentation/common/UICallbacks.kt | 9 +- .../feature/delivery/adapters/RouteAdapter.kt | 97 +++++++ .../delivery/fragments/RoutesFragment.kt | 261 ++++++++++++++++++ .../feature/delivery/model/InfoCompany.kt | 25 ++ .../feature/delivery/model/RutaAppDelivery.kt | 51 ++++ .../delivery/viewmodels/DeliveryViewModel.kt | 66 ++++- .../feature/main/activity/MainActivity.kt | 37 ++- .../pasillero/fragment/PasilleroViewModel.kt | 24 +- app/src/main/res/drawable/expedition_find.xml | 2 +- .../main/res/drawable/ic_info_delivery.xml | 10 + app/src/main/res/drawable/ic_info_refresh.xml | 10 + .../main/res/drawable/ic_ticket_action.xml | 8 + app/src/main/res/layout/fragment_route.xml | 124 +++++++++ app/src/main/res/layout/item_route_row.xml | 249 +++++++++++++++++ app/src/main/res/values-es/strings.xml | 11 + app/src/main/res/values-fr/strings.xml | 11 + app/src/main/res/values-pt/strings.xml | 11 + app/src/main/res/values/dimens.xml | 3 + app/src/main/res/values/strings.xml | 11 + 27 files changed, 1072 insertions(+), 44 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 app/src/main/java/es/verdnatura/presentation/common/ItemDescorationCustomized.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/common/NetworkUtils.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/RutaAppDelivery.kt create mode 100644 app/src/main/res/drawable/ic_info_delivery.xml create mode 100644 app/src/main/res/drawable/ic_info_refresh.xml create mode 100644 app/src/main/res/drawable/ic_ticket_action.xml create mode 100644 app/src/main/res/layout/fragment_route.xml create mode 100644 app/src/main/res/layout/item_route_row.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 2aa7c99d..00000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ea80f0b0..fe535620 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,12 +3,16 @@ xmlns:tools="http://schemas.android.com/tools" package="es.verdnatura"> + + - + + 2dp + 2dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5f79fc2d..c1ec1c6c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,8 @@ Departure Balance Pallet + Pallet number + Número de pallet CMR Route Boxes @@ -13,6 +15,7 @@ of Ticket Tickets: + Tickets Concept NoServing Parked @@ -162,6 +165,7 @@ Control ticket Permit check ubications Scan expedition + Filtrar rutas Day of sale Wagoon Reference @@ -388,6 +392,7 @@ Suppliers Delivery Delivery summary + Rutas Packaging Observations Summary @@ -593,6 +598,8 @@ Scan item upload Tienes que escanear el artículo para poder subirlo Sube la imagen al servidor + View log expedition + Update routes Seleccionar imagen Avanzar ticket encajado Permite avanzar un ticket para que sea encajado @@ -611,4 +618,8 @@ Escanea artículo a verificar Artículo no encontrado. Escanea de nuevo el carro Escanea matrícula de nuevo + Hour + Scan + NO INTERNET + Make sure you have the delivery app installed