verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version 24.2Beta

This commit is contained in:
Sergio De la torre 2024-01-09 09:23:09 +01:00
parent b788e29663
commit 6a8d702fcf
5 changed files with 93 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
.idea/workspace.xml
View File

@ -127,31 +127,14 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #6460 fix:date">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #6276: prepare Salixback">
<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/src/main/java/es/verdnatura/domain/Extensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.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/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/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.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/base/BaseFragmentSalix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragmentSalix.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.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/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/adapters/ExpeditionLogAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.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/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/diadeventa/fragment/DayOfSaleViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/model/ItemShelvingSaleDate.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/model/ItemShelvingSaleDate.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.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/ubicador/adapter/UbicadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -283,6 +266,7 @@
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_itemexpeditionstate_card.xml" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" root0="FORCE_HIGHLIGHTING" />
@ -336,6 +320,13 @@
&quot;keyToStringList&quot;: {
&quot;ExportApk.BuildVariants&quot;: [
&quot;betaRelease&quot;
],
&quot;com.android.tools.idea.sqlite.queryhistory&quot;: [
&quot;select * from expedition where routeFk=182933;&quot;,
&quot;select * from expedition;&quot;,
&quot;select * from expeditionPending;&quot;,
&quot;select * from expedition where id = 7753995;\n\n&quot;,
&quot;\nselect * from expedition where id = 7753995;&quot;
]
}
}</component>
@ -510,69 +501,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00169" summary="versionBeta 23.28 renovarToken">
<created>1689163182438</created>
<option name="number" value="00169" />
<option name="presentableId" value="LOCAL-00169" />
<option name="project" value="LOCAL" />
<updated>1689163182438</updated>
</task>
<task id="LOCAL-00170" summary="refs #4676 delivery-&gt;picking">
<created>1689657014312</created>
<option name="number" value="00170" />
<option name="presentableId" value="LOCAL-00170" />
<option name="project" value="LOCAL" />
<updated>1689657014312</updated>
</task>
<task id="LOCAL-00171" summary="refs #4676 delivery-&gt;picking">
<created>1689846753642</created>
<option name="number" value="00171" />
<option name="presentableId" value="LOCAL-00171" />
<option name="project" value="LOCAL" />
<updated>1689846753642</updated>
</task>
<task id="LOCAL-00172" summary="refs ##5613 login">
<created>1689846825769</created>
<option name="number" value="00172" />
<option name="presentableId" value="LOCAL-00172" />
<option name="project" value="LOCAL" />
<updated>1689846825769</updated>
</task>
<task id="LOCAL-00173" summary="version 23.28 general y beta">
<created>1689846845251</created>
<option name="number" value="00173" />
<option name="presentableId" value="LOCAL-00173" />
<option name="project" value="LOCAL" />
<updated>1689846845251</updated>
</task>
<task id="LOCAL-00174" summary="refs #5891 inventoryParking">
<created>1690456054648</created>
<option name="number" value="00174" />
<option name="presentableId" value="LOCAL-00174" />
<option name="project" value="LOCAL" />
<updated>1690456054648</updated>
</task>
<task id="LOCAL-00175" summary="refs #4677 delivery→picking">
<created>1690467514784</created>
<option name="number" value="00175" />
<option name="presentableId" value="LOCAL-00175" />
<option name="project" value="LOCAL" />
<updated>1690467514785</updated>
</task>
<task id="LOCAL-00176" summary="test ubicador">
<created>1690467529203</created>
<option name="number" value="00176" />
<option name="presentableId" value="LOCAL-00176" />
<option name="project" value="LOCAL" />
<updated>1690467529203</updated>
</task>
<task id="LOCAL-00177" summary="version 23.30Beta">
<created>1690467556690</created>
<option name="number" value="00177" />
<option name="presentableId" value="LOCAL-00177" />
<option name="project" value="LOCAL" />
<updated>1690467556690</updated>
</task>
<task id="LOCAL-00178" summary="refs #5652 add dynamic buttons for mermas">
<created>1691048336702</created>
<option name="number" value="00178" />
@ -853,7 +781,70 @@
<option name="project" value="LOCAL" />
<updated>1701936308933</updated>
</task>
<option name="localTasksCounter" value="218" />
<task id="LOCAL-00218" summary="refs #6276: prepare Salixback">
<created>1704287624399</created>
<option name="number" value="00218" />
<option name="presentableId" value="LOCAL-00218" />
<option name="project" value="LOCAL" />
<updated>1704287624400</updated>
</task>
<task id="LOCAL-00219" summary="refs #6276: prepare Salixback">
<created>1704287791903</created>
<option name="number" value="00219" />
<option name="presentableId" value="LOCAL-00219" />
<option name="project" value="LOCAL" />
<updated>1704287791904</updated>
</task>
<task id="LOCAL-00220" summary="refs #5135: refactor animation">
<created>1704288200726</created>
<option name="number" value="00220" />
<option name="presentableId" value="LOCAL-00220" />
<option name="project" value="LOCAL" />
<updated>1704288200726</updated>
</task>
<task id="LOCAL-00221" summary="refs #5135: refactor animation">
<created>1704293181753</created>
<option name="number" value="00221" />
<option name="presentableId" value="LOCAL-00221" />
<option name="project" value="LOCAL" />
<updated>1704293181753</updated>
</task>
<task id="LOCAL-00222" summary="refs #6276: prepare Salixback">
<created>1704293230120</created>
<option name="number" value="00222" />
<option name="presentableId" value="LOCAL-00222" />
<option name="project" value="LOCAL" />
<updated>1704293230120</updated>
</task>
<task id="LOCAL-00223" summary="refs #6275 feat: back to Salix">
<created>1704786437169</created>
<option name="number" value="00223" />
<option name="presentableId" value="LOCAL-00223" />
<option name="project" value="LOCAL" />
<updated>1704786437170</updated>
</task>
<task id="LOCAL-00224" summary="refs #5135 feat: refactor animation">
<created>1704786635795</created>
<option name="number" value="00224" />
<option name="presentableId" value="LOCAL-00224" />
<option name="project" value="LOCAL" />
<updated>1704786635795</updated>
</task>
<task id="LOCAL-00225" summary="refs #6275 feat: back to Salix (delivery)">
<created>1704786709770</created>
<option name="number" value="00225" />
<option name="presentableId" value="LOCAL-00225" />
<option name="project" value="LOCAL" />
<updated>1704786709770</updated>
</task>
<task id="LOCAL-00226" summary="refs #6276: prepare Salixback">
<created>1704786754497</created>
<option name="number" value="00226" />
<option name="presentableId" value="LOCAL-00226" />
<option name="project" value="LOCAL" />
<updated>1704786754497</updated>
</task>
<option name="localTasksCounter" value="227" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -895,7 +886,7 @@
<entry key="branch">
<value>
<list>
<option value="dev" />
<option value="dev-5135" />
</list>
</value>
</entry>
@ -954,11 +945,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="version 23.40Beta" />
<MESSAGE value="refs #5652" />
<MESSAGE value="strings" />
<MESSAGE value="refs #5867 sendDriverRoute" />
<MESSAGE value="refs #4677 texts" />
<MESSAGE value="refs #5867 sendPDF" />
<MESSAGE value="varios" />
<MESSAGE value="refs #5890" />
@ -979,7 +965,12 @@
<MESSAGE value="refs #6275 modify call" />
<MESSAGE value="refs #6004 add:saveData" />
<MESSAGE value="refs #6460 fix:date" />
<option name="LAST_COMMIT_MESSAGE" value="refs #6460 fix:date" />
<MESSAGE value="refs #5135: refactor animation" />
<MESSAGE value="refs #6275 feat: back to Salix" />
<MESSAGE value="refs #5135 feat: refactor animation" />
<MESSAGE value="refs #6275 feat: back to Salix (delivery)" />
<MESSAGE value="refs #6276: prepare Salixback" />
<option name="LAST_COMMIT_MESSAGE" value="refs #6276: prepare Salixback" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 245
versionName = "23.48Beta"
versionCode 246
versionName = "24.2Beta" //23.48Beta son la misma
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

6
app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
View File

@ -433,7 +433,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(
saveWorkForm(
WorkForms(
"TestHome",
"http://192.168.1.132:9000",
"http://192.168.1.142:9000",
urlSalix = "https://test-salix.verdnatura.es"
)
)
@ -447,8 +447,8 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(
saveWorkForm(
WorkForms(
"TestLOCALHOME",
"http://192.168.1.132:9000",
urlSalix = "http://192.168.1.132:3000"
"http://192.168.1.142:9000",
urlSalix = "http://192.168.1.142:3000"
)
)
} else {

6
app/src/main/java/es/verdnatura/presentation/base/BaseFragmentSalix.kt
View File

@ -391,7 +391,7 @@ abstract class BaseFragmentSalix<T : ViewDataBinding, V : BaseViewModel, W : Bas
saveWorkForm(
WorkForms(
"TestHome",
"http://192.168.1.132:9000",
"http://192.168.1.142:9000",
urlSalix = "https://test-salix.verdnatura.es"
)
)
@ -405,8 +405,8 @@ abstract class BaseFragmentSalix<T : ViewDataBinding, V : BaseViewModel, W : Bas
saveWorkForm(
WorkForms(
"TestLOCALHOME",
"http://192.168.1.132:9000",
urlSalix = "http://192.168.1.132:3000"
"http://192.168.1.142:9000",
urlSalix = "http://192.168.1.142:3000"
)
)
} else {

2
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
View File

@ -44,7 +44,7 @@ class UbicadorAdapter(
binding.apply {
this.item = item
multiText.text = "${item.stickers}x${item.packing}"
imgItem.loadUrl("https://verdnatura.es/vn-image-data/catalog/200x200/" + item.item)
imgItem.loadUrl("https://cdn.verdnatura.es/image/catalog/200x200/" + item.item)
imgItem.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO(