version 23.42Beta

This commit is contained in:
Sergio De la torre 2023-11-06 16:50:27 +01:00
parent 9ee06e52b0
commit 1e734703b2
17 changed files with 730 additions and 371 deletions

View File

@ -127,36 +127,24 @@
</select> </select>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Refactor formato campos refs #5134"> <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5612">
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.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/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.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/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.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/ClientTicket.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt" 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/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/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.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/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_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-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-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
@ -176,7 +164,7 @@
<component name="CodeInsightWorkspaceSettings"> <component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" /> <option name="optimizeImportsOnTheFly" value="true" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" /> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_6_API_30.avd]" />
<component name="ExportToHTMLSettings"> <component name="ExportToHTMLSettings">
<option name="OPEN_IN_BROWSER" value="true" /> <option name="OPEN_IN_BROWSER" value="true" />
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" /> <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -320,31 +308,34 @@
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
<option name="showMembers" value="true" /> <option name="showMembers" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;, "ApkExportedModule": "Gestor_Almacén.app",
&quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;, "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
&quot;PROJECT_TRUSTED_KEY&quot;: &quot;true&quot;, "PROJECT_TRUSTED_KEY": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;, "RunOnceActivity.cidr.known.project.marker": "true",
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;, "SHARE_PROJECT_CONFIGURATION_FILES": "true",
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED&quot;: &quot;TextView&quot;, "ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
&quot;cidr.known.project.marker&quot;: &quot;true&quot;, "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
&quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
&quot;git-widget-placeholder&quot;: &quot;dev&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;, "cidr.known.project.marker": "true",
&quot;project.structure.last.edited&quot;: &quot;Dependencies&quot;, "com.google.services.firebase.aqiPopupShown": "true",
&quot;project.structure.proportion&quot;: &quot;0.17&quot;, "git-widget-placeholder": "dev",
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;, "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
&quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;, "project.structure.last.edited": "Suggestions",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.rainbow.brackets.disable.when&quot; "project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
"run.code.analysis.last.selected.profile": "pProject Default",
"settings.editor.selected.configurable": "preferences.rainbow.brackets.disable.when"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;ExportApk.BuildVariants&quot;: [ "ExportApk.BuildVariants": [
&quot;betaRelease&quot; "generalRelease"
] ]
} }
}</component> }]]></component>
<component name="PsdUISettings"> <component name="PsdUISettings">
<option name="MODULE_TAB" value="Properties" /> <option name="MODULE_TAB" value="Properties" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" /> <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@ -383,6 +374,11 @@
<recent name="es.verdnatura.presentation.view.feature.delivery.activity" /> <recent name="es.verdnatura.presentation.view.feature.delivery.activity" />
</key> </key>
</component> </component>
<component name="RunAnythingCache">
<option name="myCommands">
<command value="?" />
</option>
</component>
<component name="RunManager" selected="Android App.app"> <component name="RunManager" selected="Android App.app">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
<option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="class" />
@ -511,48 +507,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1618825571576</updated> <updated>1618825571576</updated>
</task> </task>
<task id="LOCAL-00159" summary="refs #5713">
<created>1686034337439</created>
<option name="number" value="00159" />
<option name="presentableId" value="LOCAL-00159" />
<option name="project" value="LOCAL" />
<updated>1686034337439</updated>
</task>
<task id="LOCAL-00160" summary="refs #5713">
<created>1686034352693</created>
<option name="number" value="00160" />
<option name="presentableId" value="LOCAL-00160" />
<option name="project" value="LOCAL" />
<updated>1686034352693</updated>
</task>
<task id="LOCAL-00161" summary="refs #4021 Cambiado quantity a printedStickers">
<created>1686551912840</created>
<option name="number" value="00161" />
<option name="presentableId" value="LOCAL-00161" />
<option name="project" value="LOCAL" />
<updated>1686551912841</updated>
</task>
<task id="LOCAL-00162" summary="Error codigo barras largo">
<created>1686926081595</created>
<option name="number" value="00162" />
<option name="presentableId" value="LOCAL-00162" />
<option name="project" value="LOCAL" />
<updated>1686926081596</updated>
</task>
<task id="LOCAL-00163" summary="Actualizaciones">
<created>1686926096721</created>
<option name="number" value="00163" />
<option name="presentableId" value="LOCAL-00163" />
<option name="project" value="LOCAL" />
<updated>1686926096721</updated>
</task>
<task id="LOCAL-00164" summary="refs #5339">
<created>1687175254984</created>
<option name="number" value="00164" />
<option name="presentableId" value="LOCAL-00164" />
<option name="project" value="LOCAL" />
<updated>1687175254984</updated>
</task>
<task id="LOCAL-00165" summary="refs #4678"> <task id="LOCAL-00165" summary="refs #4678">
<created>1687175742657</created> <created>1687175742657</created>
<option name="number" value="00165" /> <option name="number" value="00165" />
@ -854,7 +808,49 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1698305904442</updated> <updated>1698305904442</updated>
</task> </task>
<option name="localTasksCounter" value="208" /> <task id="LOCAL-00208" summary="Refactor formato campos refs #6061">
<created>1698648337355</created>
<option name="number" value="00208" />
<option name="presentableId" value="LOCAL-00208" />
<option name="project" value="LOCAL" />
<updated>1698648337355</updated>
</task>
<task id="LOCAL-00209" summary="refs #5313 fix errors">
<created>1698745297676</created>
<option name="number" value="00209" />
<option name="presentableId" value="LOCAL-00209" />
<option name="project" value="LOCAL" />
<updated>1698745297676</updated>
</task>
<task id="LOCAL-00210" summary="refs #6073 reordenar menus">
<created>1698746122761</created>
<option name="number" value="00210" />
<option name="presentableId" value="LOCAL-00210" />
<option name="project" value="LOCAL" />
<updated>1698746122761</updated>
</task>
<task id="LOCAL-00211" summary="refs #5675 fix parking">
<created>1698766652188</created>
<option name="number" value="00211" />
<option name="presentableId" value="LOCAL-00211" />
<option name="project" value="LOCAL" />
<updated>1698766652188</updated>
</task>
<task id="LOCAL-00212" summary="refs #5867 show icon">
<created>1698922161630</created>
<option name="number" value="00212" />
<option name="presentableId" value="LOCAL-00212" />
<option name="project" value="LOCAL" />
<updated>1698922161630</updated>
</task>
<task id="LOCAL-00213" summary="refs #6073 new menus">
<created>1698922200802</created>
<option name="number" value="00213" />
<option name="presentableId" value="LOCAL-00213" />
<option name="project" value="LOCAL" />
<updated>1698922200802</updated>
</task>
<option name="localTasksCounter" value="214" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.History.Properties"> <component name="Vcs.Log.History.Properties">
@ -904,8 +900,8 @@
</option> </option>
<option name="COLUMN_ID_WIDTH"> <option name="COLUMN_ID_WIDTH">
<map> <map>
<entry key="Table.Default.Author.ColumnIdWidth" value="18" /> <entry key="Table.Default.Author.ColumnIdWidth" value="115" />
<entry key="Table.Default.Date.ColumnIdWidth" value="18" /> <entry key="Table.Default.Date.ColumnIdWidth" value="114" />
</map> </map>
</option> </option>
</State> </State>
@ -955,14 +951,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="refs #5134 Refactor silex→salix" />
<MESSAGE value="refs #4677 Modificar pantalla delivery en picking" />
<MESSAGE value="refs #5652 Botones dinámicos" />
<MESSAGE value="refs #4815 interacción" />
<MESSAGE value="refs #5224 serialNumber" />
<MESSAGE value="refs #5134 silex→salix" />
<MESSAGE value="refs varios" />
<MESSAGE value="refs #4677 add scan manual" />
<MESSAGE value="refs #6183" /> <MESSAGE value="refs #6183" />
<MESSAGE value="refs #4815 serial" /> <MESSAGE value="refs #4815 serial" />
<MESSAGE value="refs #6061 silex→salix" /> <MESSAGE value="refs #6061 silex→salix" />
@ -980,7 +968,15 @@
<MESSAGE value="version 23.40.1-hotFix OrderPrevia" /> <MESSAGE value="version 23.40.1-hotFix OrderPrevia" />
<MESSAGE value="version 23.40.1-hotFix Ubicador" /> <MESSAGE value="version 23.40.1-hotFix Ubicador" />
<MESSAGE value="Refactor formato campos refs #5134" /> <MESSAGE value="Refactor formato campos refs #5134" />
<option name="LAST_COMMIT_MESSAGE" value="Refactor formato campos refs #5134" /> <MESSAGE value="Refactor formato campos refs #6061" />
<MESSAGE value="refs #5313 fix errors" />
<MESSAGE value="refs #6073 reordenar menus" />
<MESSAGE value="refs #5675 fix parking" />
<MESSAGE value="refs #5867 show icon" />
<MESSAGE value="refs #6073 new menus" />
<MESSAGE value="version 23.42Beta" />
<MESSAGE value="refs #5612" />
<option name="LAST_COMMIT_MESSAGE" value="refs #5612" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1005,6 +1001,10 @@
<line>29</line> <line>29</line>
<option name="timeStamp" value="29" /> <option name="timeStamp" value="29" />
</line-breakpoint> </line-breakpoint>
<breakpoint enabled="true" type="java-exception">
<properties class="java.lang.NoSuchMethodException" package="java.lang" />
<option name="timeStamp" value="31" />
</breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
<pin-to-top-manager> <pin-to-top-manager>

View File

@ -11,8 +11,8 @@
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 232, "versionCode": 236,
"versionName": "23.40.1Beta", "versionName": "23.42Beta",
"outputFile": "app-beta-release.apk" "outputFile": "app-beta-release.apk"
} }
], ],

View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura" applicationId "es.verdnatura"
minSdkVersion 24 //21 minSdkVersion 24 //21
targetSdkVersion 33 targetSdkVersion 33
versionCode 230 versionCode 236
versionName = "23.40Beta" versionName = "23.42"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -141,4 +141,7 @@ dependencies {
//pickerImage //pickerImage
implementation 'com.github.esafirm:android-image-picker:3.0.0-beta5' implementation 'com.github.esafirm:android-image-picker:3.0.0-beta5'
//linphone
// implementation 'org.linphone:linphone-sdk-android:5.1.0+'
//implementation 'androidx.media:media:1.6.0'
} }

View File

@ -320,7 +320,7 @@ interface SalixService {
@POST("ItemShelvings/update") @POST("ItemShelvings/update")
fun itemShelvingsUpdate( fun itemShelvingsUpdate(
@Query("where") id: Any, @Query("where") where: Any,
@Body params: Any @Body params: Any
): Call<Any> ): Call<Any>

View File

@ -567,7 +567,16 @@ class ItemCardFragment(
private fun editItemCardRow(item: ItemCardRowVO, value: Int) { private fun editItemCardRow(item: ItemCardRowVO, value: Int) {
when (item.action) { when (item.action) {
"itemStockUpdateAdd" -> prepareItemStockUpdate2(item, value) "itemStockUpdateAdd" -> {
showProgress()
viewModel.itemTrash(
itemFk = itemInfoG!!.id,
warehouseFk = warehouseFk!!,
newValue = (value * -1),
isTrash = false
)
}
"itemStockUpdateRemove" -> prepareItemStockUpdate2(item, value) "itemStockUpdateRemove" -> prepareItemStockUpdate2(item, value)
"updateGrouping" -> "updateGrouping" ->
viewModel.updateGrouping( viewModel.updateGrouping(
@ -599,6 +608,18 @@ class ItemCardFragment(
showProgress() showProgress()
} }
private fun prepareItemStockAdd(value: Int) {
showProgress()
viewModel.itemTrash(
itemFk = itemInfoG!!.id,
warehouseFk = warehouseFk!!,
newValue = (value * -1),
isTrash = false
)
}
//sergio: changeOffLineValue solo hace visible el progress //sergio: changeOffLineValue solo hace visible el progress
private fun showProgress() { private fun showProgress() {
@ -608,7 +629,7 @@ class ItemCardFragment(
private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: Int) { private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: Int) {
//Tarea 5652 , quitar código cuando está asignada tarea //Tarea 5652 , quitar código cuando está asignada tarea
var test = false var test = true
if (test) { if (test) {
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
viewModel.getAddress() viewModel.getAddress()
@ -776,7 +797,6 @@ class ItemCardFragment(
} }
override fun onClickDynamic(addressFK: Int) { override fun onClickDynamic(addressFK: Int) {
println("Acabas de pulsar" + addressFK)
customDynamic.dismiss() customDynamic.dismiss()
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
viewModel.setVisibleDiscard(itemInfoG!!.id, warehouseFk!!, quantityToDiscard, addressFK) viewModel.setVisibleDiscard(itemInfoG!!.id, warehouseFk!!, quantityToDiscard, addressFK)

View File

@ -407,23 +407,4 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
}) })
} }
fun getAddressLoses(
) {
val mermaRecords = listOf(
AddressLoses(77, "MERMA: CONTENEDOR", "BASURA"),
AddressLoses(317, "MERMA: FALTAS", "FALTAS"),
AddressLoses(1535, "MERMA: FALTAS (INVENTARIO)", "FALTAS"),
AddressLoses(2230, "MERMA: RECLAMACION BASURA", "BASURA"),
AddressLoses(7475, "MERMA: RECLAMACION TALLER", "BASURA"),
AddressLoses(43432, "MERMA: TRANSPORTE", "BASURA")
)
println("Vamos a a lista")
_addressLosesList.value = AddressLosesList(mermaRecords)
}
} }

View File

@ -1430,7 +1430,7 @@ class CollectionFragmentPicker(
} }
private fun findSale(txtscan: String, position: Int, checkParking: Boolean = true) { private fun findSale(txtscan: String, position: Int) {
var isOk = false var isOk = false
if (type == SACADOR) { if (type == SACADOR) {
@ -1457,20 +1457,17 @@ class CollectionFragmentPicker(
shelvingIndex += 1 shelvingIndex += 1
} }
} }
/*
if (!isOk){
//3- Por barcode
saleVO.Barcodes.forEach { barcode ->
if (txtscan == barcode){
if (mpok != null) mpok!!.start()
isOk = true
markLine(position,type)
}
}
}*/
} }
if (!isOk) { if (!isOk) {
if (txtscan.contains("-") && checkParking) { checkIsParking(txtscan)
}
}
}
private fun checkIsParking(txtscan: String) {
if (txtscan.contains("-")) {
tickets.forEach { tickets.forEach {
viewModel.parking( viewModel.parking(
ticketFk = it.toInt(), ticketFk = it.toInt(),
@ -1481,10 +1478,6 @@ class CollectionFragmentPicker(
} else { } else {
if (mperror != null) mperror!!.start() if (mperror != null) mperror!!.start()
} }
}
}
} }
//Tarea #4371 //Tarea #4371
@ -2676,7 +2669,7 @@ class CollectionFragmentPicker(
.isNullOrEmpty() .isNullOrEmpty()
) { ) {
//Tarea 5675 //Tarea 5675
findSale(customDialogInput.getValue(), index,false) findSale(customDialogInput.getValue(), index)
} else { } else {
ma.messageWithSound( ma.messageWithSound(
@ -2699,7 +2692,7 @@ class CollectionFragmentPicker(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty()) { if (!customDialogInput.getValue().isNullOrEmpty()) {
//Tarea 5675 //Tarea 5675
findSale(customDialogInput.getValue(), index, false) findSale(customDialogInput.getValue(), index)
} }
customDialogInput.setValue("") customDialogInput.setValue("")
scanRequest() scanRequest()

View File

@ -1793,13 +1793,6 @@ class CollectionFragmentPreChecker(
viewModel.getIdFromCodeSalix( viewModel.getIdFromCodeSalix(
code = customDialogList.getValueTwo(), code = customDialogList.getValueTwo(),
) )
/* } else {
viewModel.getIdFromCode(
usuario = getData(USER),
password = getData(PASSWORD),
code = customDialogList.getValueTwo(), "barcodeToItem"
)
}*/
customDialogList.dismiss() customDialogList.dismiss()
} }
@ -1886,14 +1879,6 @@ class CollectionFragmentPreChecker(
viewModel.getIdFromCodeSalix( viewModel.getIdFromCodeSalix(
code = customDialogList.getValueTwo() code = customDialogList.getValueTwo()
) )
/*
} else {
viewModel.getIdFromCode(
getData(USER),
getData(PASSWORD),
code = customDialogList.getValueTwo(), "barcodeToItem"
)
}*/
customDialogList.dismiss() customDialogList.dismiss()
scanRequest() scanRequest()
} }

View File

@ -0,0 +1,350 @@
package es.verdnatura.presentation.view.feature.collection.fragment
import android.app.AlertDialog
import android.content.Context
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.view.inputmethod.EditorInfo
import android.widget.ImageView
import android.widget.Toast
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentCollectionBinding
import es.verdnatura.domain.ConstAndValues.VERTICKET
import es.verdnatura.domain.toast
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnMistakeClickListener
import es.verdnatura.presentation.common.OnOptionsSelectedListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.common.OnQuantityClickListener
import es.verdnatura.presentation.common.OnSaleClickListener
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
import es.verdnatura.presentation.common.hideKeyboard
import es.verdnatura.presentation.common.onPackingClickListener
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
class CollectionShowTicketFragment(
var collection: CollectionVO = CollectionVO(0),
var type: String = ""
) : BaseFragment<FragmentCollectionBinding, CollectionViewModel>(CollectionViewModel::class) {
private var sales: List<SaleVO> = listOf()
private var saleAdapter: SaleAdapter? = null
private var lm: LinearLayoutManager? = null
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private lateinit var customDialog: CustomDialog
private var tickets: ArrayList<String> = ArrayList()
private var lastScanned: Int = 0
private var buttonPushedGetCollection = false
companion object {
fun newInstance(collection: CollectionVO, type: String) =
CollectionShowTicketFragment(collection, type)
}
override fun onAttach(context: Context) {
if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context
super.onAttach(context)
}
override fun getLayoutId(): Int = R.layout.fragment_collection
override fun onCreate(savedInstanceState: Bundle?) {
if (collection.tickets.isEmpty()) {
viewModel.collectionTicketGet(
collection.collectionFk,
getDataInt(SECTORFK),
print = "0",
type
)
}
super.onCreate(savedInstanceState)
}
override fun init() {
customDialog = CustomDialog(requireContext())
//84ma.hideBottomNavigation(GONE)
binding.splashProgress.visibility = VISIBLE
setEvents()
setToolBarIcon()
binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE
if (collection.tickets.isNotEmpty()) {
createCollectionList()
}
super.init()
}
private fun setToolBarIcon() {
binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE
val listIcons: ArrayList<ImageView> = ArrayList()
val iconPrint = ImageView(context)
val iconViewCollection = ImageView(context)
iconViewCollection.setImageResource(R.drawable.ic_collection)
iconPrint.setImageResource(R.drawable.ic_print_black_24dp)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
iconPrint.tooltipText = getTooltip(R.drawable.ic_print_black_24dp)
}
listIcons.add(iconPrint)
listIcons.add(iconViewCollection)
binding.mainToolbar.toolbarIcons.adapter =
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
override fun onOptionsItemSelected(item: Drawable) {
when (item) {
iconPrint.drawable -> print()
iconViewCollection.drawable -> getCollection()
}
}
})
binding.mainToolbar.toolbarIcons.layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
}
private fun getCollection() {
binding.splashProgress.visibility = VISIBLE
if (!buttonPushedGetCollection) {
viewModel.collection_get(
collection.collectionFk,
getDataInt(SECTORFK),
print = "0",
type
)
buttonPushedGetCollection = true
} else {
viewModel.collectionTicketGet(
lastScanned,
getDataInt(SECTORFK),
print = "0",
type
)
buttonPushedGetCollection = false
}
lastScanned = collection.collectionFk
}
private fun print() {
//tarea#4672
var isTicket = false
for (t in collection.tickets) {
if (t.ticketFk.toInt() == (collection.collectionFk)) {
isTicket = true
}
}
if (isTicket) {
val builder = AlertDialog.Builder(context)
builder.setTitle(getString(R.string.selectLabeltoPrint))
val labelCount = arrayOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "10")
builder.setItems(labelCount) { dialog, which ->
viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk,
labelCount = (which + 1)
)
}
val dialog = builder.create()
dialog.show()
} else {
viewModel.collectionStickerPrint(
collectionFk = collection.collectionFk,
labelCount = null
)
}
}
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 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED)
if (!binding.scanInput.text.toString().isNullOrEmpty()) {
binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet(
binding.scanInput.text.toString().toInt(),
getDataInt(SECTORFK),
print = "0",
type
)
}
binding.scanInput.setText("")
hideKeyboards()
return@setOnEditorActionListener true
}
true
}
hideKeyboards()
binding.collectionSwipe.setOnRefreshListener {
binding.collectionSwipe.isRefreshing = false
binding.splashProgress.visibility = VISIBLE
viewModel.collectionTicketGet(
collection.collectionFk,
getDataInt(SECTORFK),
print = "0",
type
)
binding.collectionSwipe.isRefreshing = false
}
}
private fun hideKeyboards() {
try {
requireActivity().hideKeyboard()
} catch (e: Exception) {
}
}
override fun observeViewModel() {
with(viewModel) {
binding.splashProgress.visibility = GONE
collectionTicketList.observe(viewLifecycleOwner, Observer {
if (!it.isError) {
if (it.tickets.isNotEmpty()) {
collection = it
createCollectionList()
} else {
binding.mainToolbar.toolbarSubtitle.text = "0/0"
}
} else {
ma.messageWithSound(it.errorMessage, it.isError, false)
if (activity != null) requireActivity().onBackPressed()
}
})
responsePrint.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
if (it.isError) {
ma.messageWithSound(
it.errorMessage,
it.isError, true
)
} else {
(getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
}
})
}
}
private fun createCollectionList() {
binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
binding.splashProgress.visibility = View.GONE
var salesList: ArrayList<SaleVO> = ArrayList()
tickets = ArrayList()
var observations = ""
collection.tickets.forEach { ticket ->
ticket.sales.forEach { saleVO ->
if (type == VERTICKET) {
salesList.add(saleVO)
if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty())
tickets.add(saleVO.ticketFk)
}
observations = observations + " " + ticket.observations
}
}
sales = salesList.sortedWith(compareBy({ it.saleOrder }))
saleAdapter =
SaleAdapter(sales, pasillerosItemClickListener!!, object : OnQuantityClickListener {
override fun onQuantityClick(sale: SaleVO) {
}
}, object : OnSaleClickListener {
override fun onSaleClick(sale: SaleVO) {
}
}, object : OnMistakeClickListener {
override fun onMistakeClickListener(sale: SaleVO) {
}
}, object : onPackingClickListener {
override fun onPackingClick(sale: SaleVO) {
}
}
)
lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
binding.fragmentSacadorCollections.adapter = saleAdapter
binding.fragmentSacadorCollections.layoutManager = lm
setTotalLines()
printObservations(observations)
binding.scanInput.requestFocus()
}
private fun printObservations(observations: String) {
if (observations.trim().isNotEmpty()) {
customDialog.setTitle(getString(R.string.observations)).setDescription(observations)
.setOkButton(getString(R.string.accept)) {
customDialog.hide()
customDialog.dismiss()
}.show()
}
}
private fun setTotalLines() {
var totalMark = 0
sales.forEach {
if (it.isControlled == "1")
totalMark += 1
}
binding.mainToolbar.toolbarTitle.text =
collection.collectionFk.toString()
binding.mainToolbar.toolbarSubtitle.text =
"" + totalMark + "/" + sales.size
if (totalMark == sales.size) {
getString(R.string.Coleccióncompleta).toast(this.context, Toast.LENGTH_SHORT)
}
}
}

View File

@ -37,6 +37,7 @@ import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFra
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPicker import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPicker
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPickerNew import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPickerNew
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreChecker import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreChecker
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionShowTicketFragment
import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment
import es.verdnatura.presentation.view.feature.controlador.fragment.WebFragment 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.ControlVehiculoFragment
@ -1070,6 +1071,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(EndSacadorFragment.newInstance(collection, type)) addFragmentOnTop(EndSacadorFragment.newInstance(collection, type))
} }
"SHOWTICKET" -> {
addFragmentOnTop(CollectionShowTicketFragment.newInstance(collection, type))
}
//Tarea 4711 //Tarea 4711
"PRECHECKER" -> { "PRECHECKER" -> {
addFragmentOnTop(CollectionFragmentPreChecker.newInstance(collection, type)) addFragmentOnTop(CollectionFragmentPreChecker.newInstance(collection, type))

View File

@ -120,6 +120,7 @@ class ShowTicketFragment(var menuOrigin: String) :
} }
private fun navigateToCollectionList(collection: CollectionVO) { private fun navigateToCollectionList(collection: CollectionVO) {
onCollectionSelectedListener?.onCollectionSelected(collection, ConstAndValues.VERTICKET) onCollectionSelectedListener?.onCollectionSelected(collection, ConstAndValues.VERTICKET)
} }

View File

@ -6,7 +6,7 @@ import es.verdnatura.presentation.common.convertToDateString
import es.verdnatura.presentation.view.feature.sacador.model.CollectionTicket import es.verdnatura.presentation.view.feature.sacador.model.CollectionTicket
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.Calendar
fun List<CollectionVO>.toDateFormat(context: Context): ArrayList<CollectionVO> { fun List<CollectionVO>.toDateFormat(context: Context): ArrayList<CollectionVO> {
val collections: ArrayList<CollectionVO> = ArrayList() val collections: ArrayList<CollectionVO> = ArrayList()
@ -29,7 +29,9 @@ fun List<CollectionTicket>.toDateFormating(context: Context): ArrayList<Collecti
collections.add( collections.add(
CollectionTicket( CollectionTicket(
collectionFk = it.collectionFk, collectionFk = it.collectionFk,
created = getCalendarFromDate(it.created, context).convertToDateString(), created = getCalendarFromDate(
it.created ?: "", context
).convertToDateString(),
ticketTotalCount = it.ticketTotalCount ticketTotalCount = it.ticketTotalCount
) )
) )

View File

@ -680,6 +680,9 @@
<string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string> <string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string>
<string name="selectBuyer">Selecciona comprador para visualizar inventario</string> <string name="selectBuyer">Selecciona comprador para visualizar inventario</string>
<string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string> <string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string>
<string name="errorShelving">No se puede llevar a cabo la acción. Selecciona carro antes.</string>
<string name="sendRouteOk">Envíada hoja de ruta</string>
<string name="noteAddOk">Nota añadida correctamente</string>
</resources> </resources>

View File

@ -680,6 +680,9 @@
<string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string> <string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string>
<string name="selectBuyer">Selecciona comprador para visualizar inventario</string> <string name="selectBuyer">Selecciona comprador para visualizar inventario</string>
<string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string> <string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string>
<string name="errorShelving">No se puede llevar a cabo la acción. Selecciona carro antes.</string>
<string name="sendRouteOk">Envíada hoja de ruta</string>
<string name="noteAddOk">Nota añadida correctamente</string>
</resources> </resources>

View File

@ -680,6 +680,9 @@
<string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string> <string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string>
<string name="selectBuyer">Selecciona comprador para visualizar inventario</string> <string name="selectBuyer">Selecciona comprador para visualizar inventario</string>
<string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string> <string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string>
<string name="errorShelving">No se puede llevar a cabo la acción. Selecciona carro antes.</string>
<string name="sendRouteOk">Envíada hoja de ruta</string>
<string name="noteAddOk">Nota añadida correctamente</string>
</resources> </resources>

View File

@ -679,5 +679,8 @@
<string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string> <string name="titleParkingTicketPreviaDescrip">Accede al parking de tickets de previa</string>
<string name="selectBuyer">Selecciona comprador para visualizar inventario</string> <string name="selectBuyer">Selecciona comprador para visualizar inventario</string>
<string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string> <string name="errorNotData">Datos no cargados todavía. Recargue pantalla</string>
<string name="errorShelving">No se puede llevar a cabo la acción. Selecciona carro antes.</string>
<string name="sendRouteOk">Envíada hoja de ruta</string>
<string name="noteAddOk">Nota añadida correctamente</string>
</resources> </resources>

View File

@ -34,6 +34,13 @@ allprojects {
google() google()
mavenCentral()//jcenter()// mavenCentral()//jcenter()//
maven{url 'https://jitpack.io'} maven{url 'https://jitpack.io'}
/* maven {
name "linphone.org maven repository"
url "https://linphone.org/maven_repository/"
content {
includeGroup "org.linphone"
}
}*/
} }
} }