From 02604def33de8571571c33ae43e4490c247e27ce Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 3 Mar 2023 10:31:56 +0100
Subject: [PATCH] Version 23.4Beta refs #4679

---
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           |  83 +++++---
 app/src/main/AndroidManifest.xml              |   3 +-
 .../java/es/verdnatura/di/viewModelModule.kt  |   4 +-
 .../es/verdnatura/domain/SilexCallback.kt     |   2 +-
 .../es/verdnatura/domain/VerdnaturaService.kt |  30 ++-
 .../presentation/base/BaseFragment.kt         |   1 +
 .../view/feature/delivery/InfoFragment.kt     |  65 ------
 .../view/feature/delivery/InfoViewModel.kt    |  44 ----
 .../delivery/adapters/ExpeditionLogAdapter.kt |  41 ++++
 .../delivery/fragments/InfoFragment.kt        |  57 ++++++
 .../fragments/LogExpeditionFragment.kt        | 191 ++++++++++++++++++
 .../feature/delivery/model/InfoCompany.kt     |  35 +++-
 .../delivery/viewmodels/DeliveryViewModel.kt  | 146 +++++++++++++
 .../feature/main/activity/MainActivity.kt     | 133 +++++++++---
 .../pasillero/fragment/PasilleroViewModel.kt  |   2 +-
 app/src/main/res/drawable/camion.png          | Bin 0 -> 6527 bytes
 app/src/main/res/drawable/camion_descarga.png | Bin 0 -> 5014 bytes
 .../main/res/drawable/ic_delivery_truck.xml   |  16 ++
 .../fragment_expedition_log_delivery.xml      | 181 +++++++++++++++++
 ...nt_info.xml => fragment_info_delivery.xml} | 167 +++++++++++----
 .../res/layout/item_expeditionlog_row.xml     |  64 ++++++
 app/src/main/res/layout/toolbar_fragment.xml  |   1 -
 app/src/main/res/values-es/strings.xml        |   5 +-
 app/src/main/res/values/strings.xml           |   3 +
 25 files changed, 1061 insertions(+), 215 deletions(-)
 delete mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
 delete mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
 create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.kt
 create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
 create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
 create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt
 create mode 100644 app/src/main/res/drawable/camion.png
 create mode 100644 app/src/main/res/drawable/camion_descarga.png
 create mode 100644 app/src/main/res/drawable/ic_delivery_truck.xml
 create mode 100644 app/src/main/res/layout/fragment_expedition_log_delivery.xml
 rename app/src/main/res/layout/{fragment_info.xml => fragment_info_delivery.xml} (53%)
 create mode 100644 app/src/main/res/layout/item_expeditionlog_row.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 63d3027a..97b3f254 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -276,7 +276,7 @@
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6d9ceddb..9157c1f8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,12 +83,28 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Añadido QR a pantalla Ubicador-&gt;Añadir ítem (rayo y símbolo +)">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.6Beta">
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/camion.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/camion_descarga.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_delivery_truck.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_log_delivery.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionlog_row.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info_delivery.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
     </list>
@@ -187,7 +203,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="testBeta" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -233,28 +249,30 @@
     <option name="showLibraryContents" value="true" />
     <option name="showMembers" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
-    &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ApkExportedModule": "Gestor_Almacén.app",
+    "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "ScreenRecorder.SavePath": "C:\\Users\\sergiodt\\redmine_4679_reparto_picking.mp4",
+    "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.3.0/45a346a05e7ff27a01c59452379c5939cbb53c03/appcompat-1.3.0-sources.jar!/androidx/appcompat/widget/AppCompatEditText.java_SELECTED": "AppCompatEditText",
+    "cidr.known.project.marker": "true",
+    "com.google.services.firebase.aqiPopupShown": "true",
+    "last_opened_file_path": "C:/Users/sergiodt",
+    "project.structure.last.edited": "Modules",
+    "project.structure.proportion": "0.17",
+    "project.structure.side.proportion": "0.2",
+    "run.code.analysis.last.selected.profile": "pProject Default",
+    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;ExportApk.BuildVariants&quot;: [
-      &quot;generalRelease&quot;
+  "keyToStringList": {
+    "ExportApk.BuildVariants": [
+      "generalRelease"
     ]
   }
-}</component>
+}]]></component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Default Config" />
     <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@@ -262,9 +280,9 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
       <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\layout" />
       <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature\delivery" />
-      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
       <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
       <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
     </key>
@@ -276,18 +294,18 @@
       <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\font" />
     </key>
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="es.verdnatura.presentation.view.feature.delivery.fragments" />
+      <recent name="es.verdnatura.presentation.view.feature.delivery.viewmodels" />
+      <recent name="es.verdnatura.presentation.view.feature.delivery.fragment.info" />
+      <recent name="es.verdnatura.presentation.view.feature.delivery.fragment" />
       <recent name="es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewModel" />
-      <recent name="es.verdnatura.presentation.view.feature.workermistake.fragment" />
-      <recent name="es.verdnatura.presentation.view.feature.historicoshelving.fragment" />
-      <recent name="es.verdnatura.presentation.view.feature.buffer.fragment" />
-      <recent name="es.verdnatura.presentation.view.feature.smarttag.register" />
     </key>
     <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="es.verdnatura.presentation.view.feature.delivery.adapters" />
       <recent name="es.verdnatura.presentation.view.feature.delivery" />
       <recent name="es.verdnatura.domain" />
       <recent name="es.verdnatura.presentation.view.feature.packaging.fragment" />
       <recent name="es.verdnatura.presentation.view.component" />
-      <recent name="es.verdnatura.presentation.view.feature.inventario.adapter" />
     </key>
   </component>
   <component name="RunManager" selected="Android App.app">
@@ -881,6 +899,11 @@
           <line>123</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt</url>
+          <line>163</line>
+          <option name="timeStamp" value="18" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <pin-to-top-manager>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1dc30ef7..4ab1c322 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,8 @@
            android:name=".presentation.view.feature.main.activity.MainActivity"
            android:windowSoftInputMode="stateHidden|adjustResize"
            android:configChanges="orientation"
-           android:screenOrientation="portrait"/>
+           android:screenOrientation="portrait"
+           android:exported="true"/>
        <activity
            android:name=".presentation.view.feature.login.activity.LoginActivity"
            android:configChanges="orientation"
diff --git a/app/src/main/java/es/verdnatura/di/viewModelModule.kt b/app/src/main/java/es/verdnatura/di/viewModelModule.kt
index 038f5c8e..06a91e4e 100644
--- a/app/src/main/java/es/verdnatura/di/viewModelModule.kt
+++ b/app/src/main/java/es/verdnatura/di/viewModelModule.kt
@@ -10,7 +10,7 @@ import es.verdnatura.presentation.view.feature.claim.fragment.ClaimViewModel
 import es.verdnatura.presentation.view.feature.collection.fragment.CollectionViewModel
 import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorViewModel
 import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoViewModel
-import es.verdnatura.presentation.view.feature.delivery.InfoViewModel
+import es.verdnatura.presentation.view.feature.delivery.viewmodels.DeliveryViewModel
 import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleViewModel
 import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasViewModel
 import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloViewModel
@@ -202,6 +202,6 @@ val viewModelModule = module {
         PackagingViewModel(androidContext())
     }
     viewModel {
-        InfoViewModel(androidContext())
+        DeliveryViewModel(androidContext())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/SilexCallback.kt b/app/src/main/java/es/verdnatura/domain/SilexCallback.kt
index 2d0f287b..1b06b583 100644
--- a/app/src/main/java/es/verdnatura/domain/SilexCallback.kt
+++ b/app/src/main/java/es/verdnatura/domain/SilexCallback.kt
@@ -54,7 +54,7 @@ abstract class SilexCallback<T>(val context: Context) : Callback<T> {
     }
 
     open fun onSuccess(response: Response<T>) {
-        (nameofFunction((this)) + context.getString(R.string.operationSuccessful)).toast(context)
+        // (nameofFunction((this)) + context.getString(R.string.operationSuccessful)).toast(context)
         //(context as MobileApplication).playSoundIsOK(true)
     }
 
diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
index 8e22f660..3825da42 100644
--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@@ -13,6 +13,8 @@ import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
 import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
 import es.verdnatura.presentation.view.feature.collection.SalesModified
 import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
+import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoLog
+import es.verdnatura.presentation.view.feature.delivery.model.RouteDelivery
 import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDate
 import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
 import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO
@@ -881,5 +883,31 @@ interface VerdnaturaService {
     fun getInfoCompany(
         @Body vararg params: Any
     ):
-            Call<DeliveryInfo>
+            Call<List<DeliveryInfo>>
+
+    @POST("delivery/expedition_getLog")//NO SALIX
+    fun expedition_getLog(
+        @Body vararg params: Any
+    ):
+            Call<List<ExpeditionInfoLog>>
+
+    @POST("delivery/get_routesFromExpedition")//NO SALIX
+    fun get_routesFromExpedition(
+        @Body vararg params: Any
+    ):
+            Call<List<RouteDelivery>>
+
+    @POST("delivery/expeditionState_add")//NO SALIX
+    fun expeditionState_add(
+        @Body vararg params: Any
+    ):
+            Call<Void>
+
+    @POST("delivery/getInfoFreelance")//NO SALIX
+    fun getInfoFreelance(
+        @Body vararg params: Any
+    ):
+            Call<List<DeliveryInfo>>
+
+
 }
\ No newline at end of file
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 e4531375..b717fea4 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
@@ -227,6 +227,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(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 ->"Abre la app de Reparto para escanear carga"
             else -> {
                 ""
             }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
deleted file mode 100644
index 2295ce68..00000000
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package es.verdnatura.presentation.view.feature.delivery
-
-import android.content.SharedPreferences
-import android.util.Log.d
-import android.view.View
-import es.verdnatura.R
-import es.verdnatura.databinding.FragmentInfoBinding
-import es.verdnatura.presentation.base.BaseFragment
-import es.verdnatura.presentation.view.component.CustomDialog
-import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter
-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.Train
-import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
-import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
-
-class InfoFragment(var title: String) :
-    BaseFragment<FragmentInfoBinding, InfoViewModel>(InfoViewModel::class) {
-
-    private lateinit var customDialog: CustomDialog
-    private var sectorListVO: List<SectorItemVO> = listOf()
-    private var printersList: List<Printers> = listOf()
-    private var trainsList: List<Train> = listOf()
-    private var prefs: SharedPreferences? = null
-    private var ajustesAdapter: AjustesAdapter? = null
-    private var isWorkerAllowed: Boolean = false
-    private var itemPackingList: List<ItemPackingType> = listOf()
-    private var messagePrinter: String? = null
-
-    companion object {
-        fun newInstance(title: String) = InfoFragment(title)
-
-    }
-
-    override fun getLayoutId(): Int = R.layout.fragment_info
-
-    override fun init() {
-
-        super.init()
-
-        binding.mainToolbar.toolbarTitle.text = title
-        binding.splashProgress.visibility = View.VISIBLE
-        viewModel.getInfoCompany(getDataInt(USER))
-
-
-    }
-
-
-    override fun observeViewModel() {
-        with(viewModel) {
-
-            companyInfo.observe(viewLifecycleOwner) {
-                binding.splashProgress.visibility = View.GONE
-
-                d("VERDNATURA::", "" + it.name)
-
-                //saveDataInt(NUMBEROFWAGONS, it.response!!)
-
-            }
-
-
-        }
-
-    }
-}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
deleted file mode 100644
index ae8b41b9..00000000
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package es.verdnatura.presentation.view.feature.delivery
-
-
-import android.content.Context
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import es.verdnatura.domain.SilexCallback
-import es.verdnatura.presentation.base.BaseViewModel
-import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
-import retrofit2.Response
-
-
-class InfoViewModel(val context: Context) : BaseViewModel(context) {
-
-
-    private val _companyInfo by lazy { MutableLiveData<DeliveryInfo>() }
-    val companyInfo: LiveData<DeliveryInfo>
-    get() = _companyInfo
-
-    fun getInfoCompany(
-         userId:Int
-    ) {
-
-        silex.getInfoCompany(userId)
-            .enqueue(object : SilexCallback<DeliveryInfo?>(context) {
-
-                override fun onSuccess(response: Response<DeliveryInfo?>) {
-
-                    _companyInfo.value =
-                       response.body()!!
-
-                }
-
-                override fun onError(t: Throwable) {
-                    _companyInfo.value =
-                        DeliveryInfo()
-                    super.onError(t)
-                }
-            })
-    }
-
-
-}
-
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.kt
new file mode 100644
index 00000000..e14bfd46
--- /dev/null
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.kt
@@ -0,0 +1,41 @@
+package es.verdnatura.presentation.view.feature.delivery.adapters
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import es.verdnatura.databinding.ItemExpeditionlogRowBinding
+import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoLog
+
+
+class ExpeditionLogAdapter(
+    private val items: List<ExpeditionInfoLog>
+) : RecyclerView.Adapter<ExpeditionLogAdapter.ItemHolder>() {
+
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
+        return ItemHolder(
+            ItemExpeditionlogRowBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun onBindViewHolder(holder: ItemHolder, position: Int) {
+        holder.bind(items[position])
+    }
+
+    inner class ItemHolder(
+        val binding: ItemExpeditionlogRowBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+        private val res = binding.root.context.resources
+        fun bind(item: ExpeditionInfoLog) {
+            binding.apply {
+                this.item = item
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
new file mode 100644
index 00000000..092b1cd9
--- /dev/null
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
@@ -0,0 +1,57 @@
+package es.verdnatura.presentation.view.feature.delivery.fragments
+
+import android.view.View
+import es.verdnatura.R
+import es.verdnatura.databinding.FragmentInfoDeliveryBinding
+import es.verdnatura.presentation.base.BaseFragment
+import es.verdnatura.presentation.view.feature.delivery.viewmodels.DeliveryViewModel
+
+class InfoFragment(var title: String) :
+    BaseFragment<FragmentInfoDeliveryBinding, DeliveryViewModel>(DeliveryViewModel::class) {
+    companion object {
+        fun newInstance(title: String) = InfoFragment(title)
+    }
+
+    override fun getLayoutId(): Int = R.layout.fragment_info_delivery
+
+    override fun init() {
+        super.init()
+        binding.mainToolbar.toolbarTitle.text = title
+        ma.hideBottomNavigation(View.GONE)
+        binding.splashProgress.visibility = View.VISIBLE
+        viewModel.getInfoCompany(getDataInt(USERFK))
+        viewModel.getInfoFreelance(getDataInt(USERFK))
+        setEvents()
+    }
+
+    private fun setEvents() {
+        binding.mainToolbar.backButton.setOnClickListener {
+            requireActivity().onBackPressed()
+        }
+    }
+
+    override fun observeViewModel() {
+        with(viewModel) {
+
+            companyInfoList.observe(viewLifecycleOwner) {
+                binding.splashProgress.visibility = View.GONE
+                if (it.list.isNotEmpty()) {
+                    binding.itemName.text = it.list[0].name
+                    binding.itemNif.text = it.list[0].nif
+                    binding.itemAdress.text = it.list[0].street + "-" + it.list[0].city
+                }
+
+            }
+            freelanceInfoList.observe(viewLifecycleOwner) {
+                binding.splashProgress.visibility = View.GONE
+                if (it.list.isNotEmpty()) {
+                    binding.linearInfoFreelance.visibility=View.VISIBLE
+                    binding.freelanceName.text = it.list[0].name
+                    binding.freelanceNif.text = it.list[0].nif
+                    binding.freelanceAddress.text = it.list[0].street + "-" + it.list[0].city
+                }
+            }
+        }
+
+    }
+}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
new file mode 100644
index 00000000..5ee6f0c3
--- /dev/null
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
@@ -0,0 +1,191 @@
+package es.verdnatura.presentation.view.feature.delivery.fragments
+
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.recyclerview.widget.LinearLayoutManager
+import es.verdnatura.R
+import es.verdnatura.databinding.FragmentExpeditionLogDeliveryBinding
+import es.verdnatura.domain.toInt
+import es.verdnatura.domain.toast
+import es.verdnatura.presentation.base.BaseFragment
+import es.verdnatura.presentation.common.OnOptionsSelectedListener
+import es.verdnatura.presentation.common.ToolBarAdapterTooltip
+import es.verdnatura.presentation.view.feature.delivery.adapters.ExpeditionLogAdapter
+import es.verdnatura.presentation.view.feature.delivery.model.Expedition
+import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoLog
+import es.verdnatura.presentation.view.feature.delivery.model.RouteDelivery
+import es.verdnatura.presentation.view.feature.delivery.viewmodels.DeliveryViewModel
+
+
+class LogExpeditionFragment(
+    var title: String = ""
+) : BaseFragment<FragmentExpeditionLogDeliveryBinding, DeliveryViewModel>(
+    DeliveryViewModel::class
+) {
+
+    private var adapter: ExpeditionLogAdapter? = null
+    private var originalItem: Int = 0
+
+    companion object {
+        fun newInstance(title: String) = LogExpeditionFragment(title)
+    }
+
+    override fun getLayoutId(): Int = R.layout.fragment_expedition_log_delivery
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun init() {
+
+        ma.hideBottomNavigation(View.GONE)
+        binding.mainToolbar.toolbarTitle.text = title
+        binding.scanInput.requestFocus()
+        setEvents()
+        setToolBar()
+        super.init()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setToolBar() {
+
+        binding.mainToolbar.switchButton.tooltipText =
+            getString(R.string.expeditionMarkFound)
+
+        val listIcons: ArrayList<ImageView> = ArrayList()
+        val iconDelivery = ImageView(context)
+        iconDelivery.setImageResource(R.drawable.ic_delivery)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            iconDelivery.tooltipText = getTooltip(R.drawable.ic_delivery)
+        }
+        listIcons.add(iconDelivery)
+
+        binding.mainToolbar.toolbarIcons.adapter =
+            ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
+
+                override fun onOptionsItemSelected(item: Drawable) {
+
+                    when (item) {
+                        iconDelivery.drawable -> {
+                            openAppDelivery()
+                            requireActivity().finish()
+                        }
+                    }
+                }
+            })
+
+        binding.mainToolbar.toolbarIcons.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+        binding.mainToolbar.toolbarIcons.visibility = View.GONE
+    }
+
+    private fun openAppDelivery() {
+        val i = Intent()
+        i.setClassName(
+            "verdnatura.es.repartoverdnatura",
+            "verdnatura.es.repartoverdnatura.ExpeditionSummaryActivity"
+        )
+        /* i.putExtra("token", getData(TOKEN))
+         i.putExtra("user", getData(USER))
+         i.putExtra("userId", getDataInt(USER))
+         i.putExtra("password", getData(PASSWORD))*/
+        i.putExtra("routeId", binding.route.text)
+        i.putExtra("app", "picking")
+        startActivity(i)
+    }
+
+    private fun setEvents() {
+        binding.mainToolbar.backButton.setOnClickListener {
+            requireActivity().onBackPressed()
+        }
+
+        binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+                if (!binding.scanInput.text.isNullOrEmpty()) {
+
+                    binding.splashProgress.visibility = View.VISIBLE
+                    try {
+                        viewModel.expedition_getLog(binding.scanInput.toInt())
+                        originalItem = binding.scanInput.toInt()
+                        binding.mainToolbar.toolbarTitle.text =
+                            getString(R.string.expedition) + binding.scanInput.text
+                    } catch (ex: Exception) {
+                        "Error al escanear expedición".toast(context, Toast.LENGTH_SHORT)
+                    }
+                }
+
+                return@setOnEditorActionListener true
+            }
+            false
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun observeViewModel() {
+        with(viewModel) {
+            expeditionInfoList.observe(viewLifecycleOwner) {
+                binding.splashProgress.visibility = View.GONE
+                createList(it.list)
+                setSwitchButon()
+                viewModel.get_routesFromExpedition(originalItem)
+            }
+            routeInfoList.observe(viewLifecycleOwner) {
+                binding.splashProgress.visibility = View.GONE
+                if (it.list.isNotEmpty()) {
+                    binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
+                    binding.mainToolbar.switchButton.visibility = View.VISIBLE
+                    setInfoText(it.list[0])
+                } else {
+                    binding.scanInput.setText("")
+                    binding.routeLayout.visibility = View.GONE
+                    binding.mainToolbar.toolbarIcons.visibility = View.GONE
+                    binding.mainToolbar.switchButton.visibility = View.GONE
+                }
+            }
+            responseStateAdd.observe(viewLifecycleOwner) {
+                binding.splashProgress.visibility = View.GONE
+                viewModel.expedition_getLog(originalItem)
+            }
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setSwitchButon() {
+
+        binding.mainToolbar.switchButton.setOnCheckedChangeListener { buttonView, isChecked ->
+            binding.mainToolbar.switchButton.tooltipText = if (isChecked)
+                getString(R.string.expeditionMarkLost) else
+                getString(R.string.expeditionMarkFound)
+
+            binding.splashProgress.visibility = View.VISIBLE
+
+            if (isChecked) {
+                viewModel.expeditionState_add(arrayListOf(Expedition(originalItem)), "FOUND")
+            } else {
+                viewModel.expeditionState_add(arrayListOf(Expedition(originalItem)), "LOST")
+            }
+        }
+
+    }
+
+    private fun setInfoText(routeDelivery: RouteDelivery) {
+        binding.routeLayout.visibility = View.VISIBLE
+        binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
+        binding.route.text = routeDelivery.id.toString()
+        binding.date.text = routeDelivery.created
+        binding.agency.text = routeDelivery.name
+        binding.scanInput.setText("")
+    }
+
+    private fun createList(list: List<ExpeditionInfoLog>) {
+        adapter = ExpeditionLogAdapter(list)
+        binding.itemexpeditionlogRecyclerview.adapter = adapter
+        binding.itemexpeditionlogRecyclerview.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
index 76000e1d..ff629a17 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
@@ -1,10 +1,41 @@
 package es.verdnatura.presentation.view.feature.delivery.model
 
+class FreeLanceDeliveryInfoList(
+    var list: List<DeliveryInfo> = listOf()
+)
 
+class CompanyInfoList(
+    var list: List<DeliveryInfo> = listOf()
+)
 class DeliveryInfo(
     var name: String = "",
     var street: String = "",
     var city: String = "",
     var nif: String = "",
-    var postCode: String = ""
-)
\ No newline at end of file
+    var postCode: Int = 0
+)
+
+class ExpeditionInfoList(
+    var list: List<ExpeditionInfoLog> = listOf()
+)
+
+class ExpeditionInfoLog(
+    var description: String = "",
+    var name: String = "",
+    var created: String = "",
+    var isError: Boolean = false,
+    var errorMessage: String = ""
+)
+class RouteDeliveryList(
+    var list: List<RouteDelivery> = listOf()
+)
+class RouteDelivery(
+    var id: Int,
+    var created: String,
+    var name: String
+
+)
+
+class Expedition(
+    var id: Int
+)
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
new file mode 100644
index 00000000..b72a735d
--- /dev/null
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt
@@ -0,0 +1,146 @@
+package es.verdnatura.presentation.view.feature.delivery.viewmodels
+
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import es.verdnatura.domain.SilexCallback
+import es.verdnatura.presentation.base.BaseViewModel
+import es.verdnatura.presentation.common.ResponseItemVO
+import es.verdnatura.presentation.view.feature.delivery.model.*
+import retrofit2.Response
+import retrofit2.http.POST
+
+class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
+
+    private val _expeditionInfoList by lazy { MutableLiveData<ExpeditionInfoList>() }
+    val expeditionInfoList: LiveData<ExpeditionInfoList> = _expeditionInfoList
+
+    private val _routeInfoList by lazy { MutableLiveData<RouteDeliveryList>() }
+    val routeInfoList: LiveData<RouteDeliveryList> = _routeInfoList
+
+    private val _freelanceInfoList by lazy { MutableLiveData<FreeLanceDeliveryInfoList>() }
+    val freelanceInfoList: LiveData<FreeLanceDeliveryInfoList> = _freelanceInfoList
+
+    private val _companyInfoList by lazy { MutableLiveData<FreeLanceDeliveryInfoList>() }
+    val companyInfoList: LiveData<FreeLanceDeliveryInfoList> = _companyInfoList
+
+    private val _responseStateAdd by lazy { MutableLiveData<ResponseItemVO>() }
+    val responseStateAdd: LiveData<ResponseItemVO>
+        get() = _responseStateAdd
+
+
+    fun getInfoCompany(
+        userId: Int
+    ) {
+
+        silex.getInfoCompany(userId)
+            .enqueue(object : SilexCallback<List<DeliveryInfo>>(context) {
+                override fun onSuccess(response: Response<List<DeliveryInfo>>) {
+
+                    if (response.body() != null) {
+                        _companyInfoList.value =
+                            response.body()?.let { FreeLanceDeliveryInfoList(it) }
+                    } else {
+                        _companyInfoList.value = FreeLanceDeliveryInfoList()
+                    }
+                }
+
+                override fun onError(t: Throwable) {
+                    _companyInfoList.value = FreeLanceDeliveryInfoList()
+                    super.onError(t)
+
+                }
+            })
+    }
+
+    fun expedition_getLog(
+        expedition: Int
+    ) {
+
+        silex.expedition_getLog(expedition)
+            .enqueue(object : SilexCallback<List<ExpeditionInfoLog>>(context) {
+
+                override fun onSuccess(response: Response<List<ExpeditionInfoLog>>) {
+
+                    if (response.body() != null) {
+                        _expeditionInfoList.value =
+                            response.body()?.let { ExpeditionInfoList(it) }
+                    } else {
+                        _expeditionInfoList.value = ExpeditionInfoList()
+                    }
+                }
+
+                override fun onError(t: Throwable) {
+                    _expeditionInfoList.value = ExpeditionInfoList()
+                    super.onError(t)
+
+                }
+            })
+    }
+
+    fun get_routesFromExpedition(
+        expedition: Int
+    ) {
+
+        silex.get_routesFromExpedition(expedition)
+            .enqueue(object : SilexCallback<List<RouteDelivery>>(context) {
+
+                override fun onSuccess(response: Response<List<RouteDelivery>>) {
+                    if (response.body() != null) {
+                        _routeInfoList.value =
+                            response.body()?.let { RouteDeliveryList(it) }
+
+                    }
+                }
+
+                override fun onError(t: Throwable) {
+                    _routeInfoList.value = RouteDeliveryList()
+                    super.onError(t)
+                }
+            })
+
+    }
+
+    fun expeditionState_add(expeditions: List<Expedition>, state: String) {
+
+        silex.expeditionState_add(expeditions, state)
+            .enqueue(object : SilexCallback<Void>(context) {
+                override fun onSuccess(response: Response<Void>) {
+                    _responseStateAdd.value = ResponseItemVO()
+                }
+
+                override fun onError(t: Throwable) {
+                    super.onError(t)
+                    _responseStateAdd.value = ResponseItemVO()
+                }
+            })
+    }
+
+    @POST("/delivery/getInfoFreelance")
+    fun getInfoFreelance(
+        userId: Int
+    ) {
+        silex.getInfoFreelance(userId)
+            .enqueue(object : SilexCallback<List<DeliveryInfo>>(context) {
+
+                override fun onSuccess(response: Response<List<DeliveryInfo>>) {
+
+                    if (response.body() != null) {
+                        _freelanceInfoList.value =
+                            response.body()?.let { FreeLanceDeliveryInfoList(it) }
+                    } else {
+                        _freelanceInfoList.value = FreeLanceDeliveryInfoList()
+                    }
+                }
+
+                override fun onError(t: Throwable) {
+                    _freelanceInfoList.value = FreeLanceDeliveryInfoList()
+                    super.onError(t)
+
+                }
+            })
+    }
+}
+
+
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
index d8689414..cdab1505 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
@@ -3,6 +3,7 @@ package es.verdnatura.presentation.view.feature.main.activity
 
 import android.content.SharedPreferences
 import android.media.MediaPlayer
+import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import androidx.core.content.ContextCompat
@@ -10,6 +11,7 @@ import androidx.databinding.ktx.BuildConfig
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.bottomnavigation.LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED
+import es.verdnatura.MobileApplication
 import es.verdnatura.R
 import es.verdnatura.databinding.ActivityMainBinding
 import es.verdnatura.domain.ConstAndValues.MAINACTIVITY
@@ -34,7 +36,8 @@ import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorF
 import es.verdnatura.presentation.view.feature.controlador.fragment.WebFragment
 import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoFragment
 import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoUsuarioFragment
-import es.verdnatura.presentation.view.feature.delivery.InfoFragment
+import es.verdnatura.presentation.view.feature.delivery.fragments.InfoFragment
+import es.verdnatura.presentation.view.feature.delivery.fragments.LogExpeditionFragment
 import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment
 import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasFragment
 import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment
@@ -86,35 +89,73 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
     var fm = supportFragmentManager
     var mperror: MediaPlayer? = null
     var mpok: MediaPlayer? = null
+    private var comeFromDelivery: Boolean? = null
     override fun getLayoutId(): Int = R.layout.activity_main
     override fun init() {
 
         mperror = MediaPlayer.create((this), R.raw.error)
         mpok = MediaPlayer.create((this), R.raw.ok)
         customDialog = CustomDialogMainActivity(this)
-
+        setFragments()
 
         setBottomMenuFragment()
+    }
 
-        if (haveSector() && havePrinter()) addFragment(
-            PasilleroFragment.newInstance(getString(R.string.main), true),
-            R.id.main_frame_layout,
-            PasilleroFragment.TAG,
-            false
-        )
-        else addFragment(
-            AjustesFragment.newInstance(),
-            R.id.main_frame_layout,
-            AjustesFragment.TAG,
-            false
-        )
+    private fun setFragments() {
+        try {
+            val extras = intent.extras
+            if (extras != null && extras.containsKey("menu")) {
+                comeFromDelivery = true
+                val option = extras.getString("menu")
+                val prefs = (applicationContext as MobileApplication).getPrefs()
+                prefs.putString("USER", extras.getString("user"))
+                prefs.putString("PASSWORD", extras.getString("password"))
+                when (option) {
+                    "log" -> onPasillerosItemClickListener(
+                        PasillerosItemVO(
+                            30,
+                            R.drawable.expedition_find,
+                            getString(R.string.titleLog),
+                            R.string.titleLog,
+                            getString(
+                                R.string.titleLogDescrip
+                            )
 
-        // sergio: de esta manera se eliminan los logs de lanzamiento
-        if (BuildConfig.DEBUG) {
-            Timber.plant(Timber.DebugTree())
+                        ), getString(R.string.titleLog)
+                    )
+                    "info" -> onPasillerosItemClickListener(
+                        PasillerosItemVO(
+                            30,
+                            R.drawable.expedition_find,
+                            getString(R.string.titleInfo),
+                            R.string.titleInfo,
+                            getString(
+                                R.string.titleInfoDescription
+                            )
+
+                        ), getString(R.string.titleInfo)
+                    )
+
+                }
+
+
+            } else {
+                if (haveSector() && havePrinter()) addFragment(
+                    PasilleroFragment.newInstance(getString(R.string.main), true),
+                    R.id.main_frame_layout,
+                    PasilleroFragment.TAG,
+                    false
+                )
+                else addFragment(
+                    AjustesFragment.newInstance(),
+                    R.id.main_frame_layout,
+                    AjustesFragment.TAG,
+                    false
+                )
+            }
+        } catch (exception: Exception) {
+            getString(R.string.error).toast(this)
         }
-
-
     }
 
     fun haveSector(): Boolean {
@@ -411,11 +452,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
 
             getString(R.string.titleItemSearch) -> {
 
-                addFragmentOnTop(BuscarItemFragment.newInstance(if (entryPoint == "") {
-                    null
-                } else {
-                        entryPoint.toInt()
-                    }))
+                addFragmentOnTop(
+                    BuscarItemFragment.newInstance(
+                        if (entryPoint == "") {
+                            null
+                        } else {
+                            entryPoint.toInt()
+                        }
+                    )
+                )
             }
 
             getString(R.string.titleHistorical) -> {
@@ -543,24 +588,43 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             }
             getString(R.string.titleInfo) -> {
                 addFragmentOnTop(
-                    InfoFragment.newInstance(item.title))
+                    InfoFragment.newInstance(item.title),
+                    if (comeFromDelivery == true) {
+                        getString(R.string.titleInfo)
+                    } else {
+                        null
+                    }
+                )
+
+            }
+
+            getString(R.string.titleLog) -> {
+
+                addFragmentOnTop(
+                    LogExpeditionFragment.newInstance(item.title),
+                    if (comeFromDelivery == true) {
+                        getString(R.string.titleLog)
+                    } else {
+                        null
+                    }
+                )
 
             }
 
 
-                getString(R.string.testing) -> {
+            getString(R.string.testing) -> {
                 addFragmentOnTop(testPrint.newInstance(item.title))
             }
         }
 
     }
 
-    fun addFragmentOnTop(fragment: Fragment?) {
+    fun addFragmentOnTop(fragment: Fragment?, name: String? = null) {
 
         supportFragmentManager
             .beginTransaction()
             .replace(R.id.main_frame_layout, fragment!!)
-            .addToBackStack(null)
+            .addToBackStack(name)
             .commitAllowingStateLoss()
     }
 
@@ -570,11 +634,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
         var backEntry = ""
         if (index >= 0) {
             backEntry = supportFragmentManager.getBackStackEntryAt(index).name.toString()
-            //Log.d("VERDNATURA::", "El fragment es " + backEntry)
         }
 
 
-
         try {
             fm.executePendingTransactions()
         } catch (e: Exception) {
@@ -585,9 +647,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             fm.popBackStackImmediate()
 
             if (!backEntry.isNullOrBlank())
+
                 if (backEntry!!.contains("fragment.ExpeditionPalletDetailFragment.Companion")) {
                     addFragmentOnTop(ExpeditionTruckListFragment.newInstance())
                 }
+            if (backEntry!!.contains(getString(R.string.titleLog)) || backEntry!!.contains(
+                    getString(
+                        R.string.titleInfo
+                    )
+                )
+            ) {
+                finish()
+            }
         } else {
             customDialog.setTitle(getString(R.string.closeSession))
                 .setDescription(getString(R.string.sureCloseSession))
@@ -750,4 +821,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
 
 
     }
+
+
 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
index 6c4dabb0..d814ca2a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
@@ -514,7 +514,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
         _pasillerositem.add(
                   PasillerosItemVO(
                       6,
-                      R.drawable.ic_delivery,
+                      R.drawable.ic_delivery_truck,
                       contextApp.getString(R.string.titleDelivery),
                       R.string.titleDelivery,
                       contextApp.getString(R.string.titleDeliveryDescrip)
diff --git a/app/src/main/res/drawable/camion.png b/app/src/main/res/drawable/camion.png
new file mode 100644
index 0000000000000000000000000000000000000000..517e628c9e72da896c53f88967719c79d26c3e63
GIT binary patch
literal 6527
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/camion_descarga.png b/app/src/main/res/drawable/camion_descarga.png
new file mode 100644
index 0000000000000000000000000000000000000000..14a913848778781dcd06dcc99267c204b15b5a7c
GIT binary patch
literal 5014
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_delivery_truck.xml b/app/src/main/res/drawable/ic_delivery_truck.xml
new file mode 100644
index 00000000..c76ebf0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delivery_truck.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32"
+   >
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M24.667,21.733c-1.733,0 -3.2,1.467 -3.2,3.2s1.467,3.2 3.2,3.2 3.2,-1.467 3.2,-3.2c0,-1.867 -1.467,-3.2 -3.2,-3.2zM24.667,26.533c-0.933,0 -1.6,-0.667 -1.6,-1.6s0.667,-1.6 1.6,-1.6 1.6,0.667 1.6,1.6c0,0.8 -0.8,1.6 -1.6,1.6z"/>
+  <path
+      android:fillColor="#FFf"
+      android:pathData="M7.867,21.733c-1.733,0 -3.2,1.467 -3.2,3.2s1.467,3.2 3.2,3.2c1.733,0 3.2,-1.467 3.2,-3.2 0,-1.867 -1.467,-3.2 -3.2,-3.2zM7.867,26.533c-0.933,0 -1.6,-0.667 -1.6,-1.6s0.667,-1.6 1.6,-1.6c0.933,0 1.6,0.667 1.6,1.6 0,0.8 -0.8,1.6 -1.6,1.6z"/>
+  <path
+      android:fillColor="#FFf"
+      android:pathData="M31.467,13.2l-6.133,-6c-0.4,-0.4 -0.933,-0.533 -1.467,-0.533h-3.067v-1.2c0,-0.8 -0.667,-1.6 -1.6,-1.6h-17.6c-0.933,0 -1.6,0.667 -1.6,1.6v17.333c0,0.933 0.8,1.6 1.6,1.6h2.133c0.267,-2 2,-3.6 4.133,-3.6 2,0 3.867,1.6 4.133,3.6h8.4c0.267,-2 2,-3.6 4.133,-3.6s4,1.6 4.267,3.6h1.6c0.933,0 1.6,-0.8 1.6,-1.6v-8.133c0,-0.533 -0.267,-1.067 -0.533,-1.467zM22.667,8.667c0,-0.133 0.133,-0.267 0.267,-0.267h1.067c0,0 0.133,0 0.133,0.133l4.8,4.533c0.133,0 0,0.4 -0.133,0.4h-5.867c-0.267,0 -0.267,-0.133 -0.267,-0.267v-4.533zM9.733,11.333c0,-1.467 0.933,-2.667 1.867,-2.933 0.133,0 0.133,0 0.267,0l3.067,-0.4v1.6c0,1.467 -0.933,2.667 -1.867,2.933 -0.133,0 -0.133,0 -0.267,0l-3.067,0.533v-1.733zM9.733,13.867l1.467,-0.267c0.533,-0.133 0.933,0.533 0.933,1.2l0.133,0.933 -1.6,0.133c-0.533,0.133 -0.933,-0.4 -0.933,-1.2v-0.8zM4.667,11.333v-1.6l2.667,-0.4c1.067,-0.133 1.733,0.8 1.733,2.267v1.6l-2.667,0.4c-1.067,0 -1.867,-0.933 -1.733,-2.267zM8.933,14v1.2c0,1.067 -0.667,2 -1.333,2.133h-0.133l-2.267,0.267v-1.2c0,-1.067 0.667,-2 1.333,-2.133h0.133l2.267,-0.267z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_expedition_log_delivery.xml b/app/src/main/res/layout/fragment_expedition_log_delivery.xml
new file mode 100644
index 00000000..6e45676c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_expedition_log_delivery.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" >
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/scan_input"
+                        style="@style/ScanLineTextSearch"
+                        android:layout_width="match_parent"
+                        android:hint="@string/titleExpeditionScan"
+                        android:inputType="text"
+                        android:lines="1"
+                        android:maxLines="1"
+                     />
+                <LinearLayout
+                    android:id="@+id/route_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/layout_margin_min"
+                    android:layout_marginBottom="@dimen/layout_margin_1"
+                    android:paddingLeft="@dimen/layout_margin_1"
+                    android:visibility ="gone"
+                    android:paddingRight="@dimen/layout_margin_1"
+                    android:background="@color/verdnatura_pumpkin_orange"
+                    tools:visibility="visible">
+                    <TextView
+                        android:id="@+id/route"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Ruta"
+                        android:textSize="@dimen/body1"
+                        android:textColor="@color/verdnatura_white"
+                        android:paddingLeft="@dimen/layout_margin_min"
+                        android:layout_weight="1.25"
+                        android:gravity="left" />
+
+                    <TextView
+                        android:id="@+id/agency"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Zona"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:layout_weight="1.25"
+                        android:gravity="left"/>
+
+
+                    <TextView
+                        android:id="@+id/date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="fecha"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:layout_weight="1.25"
+                        android:gravity="right"
+                        />
+
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="@dimen/layout_margin_min"
+                    android:layout_marginBottom="@dimen/layout_margin_1"
+                    android:paddingLeft="@dimen/layout_margin_1"
+                    android:paddingRight="@dimen/layout_margin_1">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Fecha"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:paddingLeft="@dimen/layout_margin_min"
+                        android:layout_weight="1"
+                        android:gravity="left" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Trabajador"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:layout_weight="1.25"
+                        android:gravity="left"/>
+
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Estado"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:layout_weight="1.25"
+                        android:gravity="right"/>
+
+
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/itemcard_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"
+                    android:orientation="vertical"
+                    tools:ignore="ExtraText">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:descendantFocusability="blocksDescendants">
+
+                            <!--android:id="@+id/itemexpeditionstate_recyclerview"-->
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/itemexpeditionlog_recyclerview"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:clipToPadding="false"
+                            android:visibility="visible"
+                            tools:listitem="@layout/item_expeditionlog_row" />
+                    </RelativeLayout>>
+                </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
+
+      ' <include
+            android:id="@+id/main_toolbar"
+            layout="@layout/toolbar_fragment"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+
+        <LinearLayout
+            android:id="@+id/splash_progress"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:background="@color/verdnatura_black_8_alpha_6"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:gravity="center">
+
+            <com.airbnb.lottie.LottieAnimationView
+
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/verdnatura_logo_large_height"
+                app:lottie_autoPlay="true"
+                app:lottie_loop="true"
+                app:lottie_rawRes="@raw/orange_loading"
+                app:lottie_speed="2" />
+        </LinearLayout>
+
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info_delivery.xml
similarity index 53%
rename from app/src/main/res/layout/fragment_info.xml
rename to app/src/main/res/layout/fragment_info_delivery.xml
index 0b696317..82a4256c 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info_delivery.xml
@@ -3,11 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
    >
-    <data>
-        <variable
-            name="item"
-            type="es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo" />
-    </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -32,6 +27,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/divider"
             android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
+            android:layout_marginRight="@dimen/pasilleros_margin_main_menu"
             android:padding="@dimen/navigation_row_limit_padding"
             >
 
@@ -41,12 +37,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
+
                 >
 
                 <TextView
-                    android:layout_width="100dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="@dimen/default_layout_margin"
+                    android:layout_weight="1"
                     android:text="@string/company"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
@@ -54,12 +51,13 @@
 
                 <TextView
                     android:id="@+id/item_name"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{item.name}"
-                    android:layout_marginLeft="@dimen/layout_margin_6"
-                    android:textColor="@color/verdnatura_white"
+                    android:layout_weight="1"
+                    android:text="@string/company"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
                     android:textSize="@dimen/body1"
+                    android:gravity="center"
                     tools:text="@string/company"
                     />
 
@@ -71,21 +69,23 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="100dp"
-                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
                     android:text="@string/nif"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
                     android:textStyle="bold"
-                    android:layout_marginRight="@dimen/default_layout_margin"/>
+                    />
 
                 <TextView
                     android:id="@+id/item_nif"
-                    android:layout_width="match_parent"
+                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{item.nif}"
-                    android:layout_marginLeft="@dimen/layout_margin_6"
-                    android:textColor="@color/verdnatura_white"
+                    android:text="@string/nif"
+                    android:gravity="center"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
                     android:textSize="@dimen/body1"
                     tools:text="@string/nif"/>
 
@@ -94,23 +94,130 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:layout_width="100dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:text="@string/adress"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
                     android:textStyle="bold"
-                    android:layout_marginRight="@dimen/default_layout_margin"/>
+                  />
 
                 <TextView
                     android:id="@+id/item_adress"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@{item.street}"
-                    android:layout_marginLeft="@dimen/layout_margin_6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/adress"
                     android:tooltipText="@string/copied"
+                    android:gravity="center"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
+                    android:textSize="@dimen/body1"
+                    tools:text="@string/adress"/>
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/dividertwo"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/verdnatura_white"
+            android:layout_marginBottom="@dimen/item_list_separation"
+            android:layout_marginTop="@dimen/item_list_separation"
+            app:layout_constraintBottom_toBottomOf="@+id/linearLayout"/>
+
+        <LinearLayout
+            android:id="@+id/linearInfoFreelance"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintTop_toBottomOf="@id/dividertwo"
+            android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
+            android:layout_marginRight="@dimen/pasilleros_margin_main_menu"
+            android:padding="@dimen/navigation_row_limit_padding"
+            android:visibility="gone"
+            >
+
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/freelance"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/freelance_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
+                    android:textSize="@dimen/body1"
+                    android:gravity="center"
+                    tools:text="@string/freelance"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/nif"
+                    android:textColor="@color/verdnatura_white"
+                    android:textSize="@dimen/body1"
+                    android:textStyle="bold"
+                    />
+
+                <TextView
+                    android:id="@+id/freelance_nif"
+                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
+                    android:textSize="@dimen/body1"
+                    tools:text="@string/nif"/>
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/adress"
+                    android:textColor="@color/verdnatura_white"
+                    android:textSize="@dimen/body1"
+                    android:textStyle="bold"
+                    />
+
+                <TextView
+                    android:id="@+id/freelance_address"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
+                    android:textSize="@dimen/body1"
                     tools:text="@string/adress"/>
             </LinearLayout>
             <LinearLayout
@@ -132,16 +239,7 @@
                     android:textStyle="bold"
                     android:layout_marginRight="@dimen/default_layout_margin"/>
 
-                <EditText
-                    android:id="@+id/txtserver"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@color/verdnatura_white"
-                    android:padding="5dp"
-                    android:ems="10"
-                    android:inputType="text"
-                    android:layout_marginTop="4dp"/>
+
 
 
             </LinearLayout>
@@ -149,7 +247,6 @@
 
 
         </LinearLayout>
-
         <include
             android:id="@+id/main_toolbar"
             layout="@layout/toolbar_fragment"
diff --git a/app/src/main/res/layout/item_expeditionlog_row.xml b/app/src/main/res/layout/item_expeditionlog_row.xml
new file mode 100644
index 00000000..cc8570fa
--- /dev/null
+++ b/app/src/main/res/layout/item_expeditionlog_row.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+   >
+    <data>
+
+        <variable
+            name="item"
+            type="es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoLog" />
+
+    </data>
+    <LinearLayout
+        android:id="@+id/item_row_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <LinearLayout
+
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/verdnatura_black_5"
+            android:padding="@dimen/layout_margin_1"
+            android:layout_gravity="center_horizontal"
+           >
+
+                    <TextView
+                        android:id="@+id/itemFk"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@{item.created}"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:layout_weight="1"
+                        android:gravity="left"
+
+                        />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{item.name}"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:singleLine="true"
+                        android:layout_weight="1.25"
+                        android:gravity="left"/>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@{item.description}"
+                        android:textSize="@dimen/body2"
+                        android:textColor="@color/verdnatura_white"
+                        android:layout_weight="1.25"
+                        android:gravity="right"/>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/verdnatura_black_9"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_fragment.xml b/app/src/main/res/layout/toolbar_fragment.xml
index 8d2f0533..a957b390 100644
--- a/app/src/main/res/layout/toolbar_fragment.xml
+++ b/app/src/main/res/layout/toolbar_fragment.xml
@@ -103,7 +103,6 @@
                     android:layout_height="match_parent"
                     android:text="Switch"
                     android:visibility="gone"
-                    android:tooltipText="@string/allowCheckingMode"
                     tool:visibility="visible"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f1ca27f8..8c8f0752 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -513,7 +513,7 @@
     <string name="entryNextObsers">Siguiente paso: observaciones e imágenes</string>
     <string name="nextEntrySummary">Siguiente paso: resumen entrada</string>
     <string name="activateModoChecking">Activado modo revisión</string>
-    <string name="allowCheckingMode">Permite activar modo revisión. Escane primero una matrícula</string>
+    <string name="allowCheckingMode">Permite activar modo revisión. Escanee primero una matrícula</string>
     <string name="codeNotExist">Código no existe. Avise para que reetiqueten producto</string>
     <string name="ticketWarning">Urge el ticket que está revisando, la hora de la zona web del ticket ya se ha cerrado</string>
     <string name="urgentWarning">Aviso urgente</string>
@@ -538,5 +538,8 @@
     <string name="nif">NIF</string>
     <string name="adress">Dirección</string>
     <string name="company">Empresa</string>
+    <string name="expeditionMarkLost">Si activa este botón marca la expedición como Perdida</string>
+    <string name="expeditionMarkFound">Si activa este botón marca la expedición como Encontrada</string>
+    <string name="freelance">Porteador</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c37c2e01..cbcf343f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -510,6 +510,7 @@
     <string name="silexServer">Server Silex</string>
     <string name="salixServer">Server Salix</string>
     <string name="company">Company</string>
+    <string name="freelance">Freelance</string>
     <string name="deleteWorkForm">Delete work form</string>
     <string name="deleteWorkFormConfirmation">¿Do you remove definitely?</string>
     <string name="noAssigned">Not assigned</string>
@@ -521,6 +522,8 @@
     <string name="entryNextObsers">Next step: observations and images</string>
     <string name="nextEntrySummary">Next step: entry summary</string>
     <string name="activateModoChecking">Activated checking mode</string>
+    <string name="expeditionMarkLost">If you activate this button, mark the expedition as Found</string>
+    <string name="expeditionMarkFound">Este botón marca la expedición como Encontrada</string>
     <string name="allowCheckingMode">Allow checking mode. Scan firstly the plate and after activate the mode</string>
     <string name="codeNotExist">Item code not exists..Please send the label to Computing department</string>
     <string name="ticketWarning">Ticket that you are checking is urgent , closure ticket zone web is closed</string>