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

v5.2.9

This commit is contained in:
Enrique Blasco Blanquer 2020-10-01 06:39:48 +02:00
parent f180658242
commit 0221d9b6c3
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -683,7 +683,7 @@ class CollectionFragment(
try { try {
customDialogList.setTitle("$shelving($item) $total de $longName").setOkButton("Coger") { customDialogList.setTitle("$shelving($item) $total de $longName").setOkButton("Coger") {
if (customDialogList.getValueTwo().isNotEmpty()) { if (customDialogList.getValueTwo().isNotEmpty()) {
if (isNumber(customDialogList.getValue()) && customDialogList.getValue().toInt() > total.toInt()) { if (isNumber(customDialogList.getValue()) && isNumber(total) && customDialogList.getValue().toInt() > total.toInt()) {
"La cantidad supera a la disponible".toast(requireContext()) "La cantidad supera a la disponible".toast(requireContext())
} else if (isNumber(customDialogList.getValue())) { } else if (isNumber(customDialogList.getValue())) {
if (checkItemScan(customDialogList.getValueTwo())) { if (checkItemScan(customDialogList.getValueTwo())) {
@ -956,7 +956,10 @@ class CollectionFragment(
customDialogInput.setTitle(getString(R.string.Verdisponible)).setDescription(getString(R.string.Escaneaetiqueta)).setOkButton(getString(R.string.Buscar)){ customDialogInput.setTitle(getString(R.string.Verdisponible)).setDescription(getString(R.string.Escaneaetiqueta)).setOkButton(getString(R.string.Buscar)){
try{ try{
splash_progress.visibility = View.VISIBLE if (splash_progress != null){
splash_progress.visibility = View.VISIBLE
}
}catch (e:Exception){} }catch (e:Exception){}
hideKeyboards() hideKeyboards()
@ -970,7 +973,9 @@ class CollectionFragment(
customDialogInput.dismiss() customDialogInput.dismiss()
}.setKoButton("Cancelar"){ }.setKoButton("Cancelar"){
splash_progress.visibility = View.GONE if (splash_progress != null){
splash_progress.visibility = View.GONE
}
hideKeyboards() hideKeyboards()
scanRequest() scanRequest()
customDialogInput.dismiss() customDialogInput.dismiss()
@ -1024,7 +1029,7 @@ class CollectionFragment(
} }
} }
//toolbar_title.text = "" + totalMark + "/" + sales.size //toolbar_title.text = "" + totalMark + "/" + sales.size
toolbar_title.text = collection.collectionFk toolbar_title.text = if (collection.collectionFk != null )collection.collectionFk else ""
toolbar_subtitle.text = "" +totalMark + "/" + sales.size toolbar_subtitle.text = "" +totalMark + "/" + sales.size
if (totalMark == sales.size) { if (totalMark == sales.size) {
getString(R.string.Coleccióncompleta).toast(this.context,Toast.LENGTH_SHORT) getString(R.string.Coleccióncompleta).toast(this.context,Toast.LENGTH_SHORT)

2
app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
View File

@ -292,7 +292,7 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
var shelvingIndex = 0 var shelvingIndex = 0
for (placementVO in saleVO.carros){ for (placementVO in saleVO.carros){
if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){ if (txtscan.toUpperCase() == placementVO.shelving.toUpperCase()){
mpok!!.start() if (mpok!= null) mpok!!.start()
isOk = true isOk = true
showShelving(index,shelvingIndex) showShelving(index,shelvingIndex)
isBreak = true isBreak = true

4
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -229,7 +229,9 @@ class UbicadorFragment(
it.stickers = "0" it.stickers = "0"
it.visible = "0" it.visible = "0"
} }
adapter!!.notifyDataSetChanged() if (adapter != null){
adapter!!.notifyDataSetChanged()
}
customDialog.dismiss() customDialog.dismiss()
}.setKoButton("Cancelar"){ }.setKoButton("Cancelar"){
customDialog.dismiss() customDialog.dismiss()

2
build.gradle
View File

@ -20,7 +20,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.2' classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Apr 29 06:26:47 CEST 2020 #Thu Oct 01 06:19:26 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip