diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index a51162eb..c4315fa5 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -74,6 +74,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.TicketStateSalix import es.verdnatura.presentation.view.feature.ubicador.model.ItemBuy import es.verdnatura.presentation.view.feature.ubicador.model.ItemShelvingNewer import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador +import es.verdnatura.presentation.view.feature.ubicador.model.ShelvingItem import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake import es.verdnatura.presentation.view.feature.workermistake.model.ExpeditionMistakeSalix import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType @@ -706,10 +707,15 @@ interface SalixService { @Query("params") params: Any, ): Call> - @GET("Shelvings") + @GET("Shelvings/findOne") fun shelvingGet( @Query("filter") filter: Any, - ): Call> + ): Call + + @GET("ImageConfigs/findOne") + fun getImageConfig( + @Query("filter") filter: String = """{"fields":["url"]}""" + ): Call @GET("Shelvings/findOne") fun shelvingGetFromCode( @@ -1092,6 +1098,11 @@ interface SalixService { @Query("filter") filter: String ): Call + @GET("States/findOne") + fun getStateId( + @Query("filter") filter: String + ): Call + @POST("WorkerMistakes") fun workerMistakesAdd( @Body workerMistake: WorkerMistakeSalix 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 1b7b1b09..9efa6dd2 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 @@ -135,6 +135,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionTicket import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.ticket.fragment.TicketAdvanceFragment import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment +import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment6869 import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragmentNew import es.verdnatura.presentation.view.feature.workermistake.fragment.PackingMistakeFragment import es.verdnatura.presentation.view.feature.workermistake.fragment.WorkermistakeFragment @@ -676,6 +677,10 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL getString(R.string.titleUbicator) -> { addFragmentOnTop(UbicadorFragmentNew.newInstance(entryPoint)) } + //Tarea 6869 + getString(R.string.ubicatorNew) -> { + addFragmentOnTop(UbicadorFragment6869.newInstance(entryPoint)) + } //Tarea 7855 getString(R.string.scanPreparedExpedition) -> { @@ -755,7 +760,10 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL getString(R.string.titleShelvingHistorical) -> { addFragmentOnTop(ItemShelvingLogFragment.newInstance(itemTitle)) - + } + //Tarea 7920 + getString(R.string.titleShelvingHistNew) -> { + addFragmentOnTop(ShelvingLogFragment.newInstance(itemTitle, LogType.ITEMSHELVING)) } getString(R.string.titleLogShelving) -> {