refs varios
This commit is contained in:
parent
05304b96d0
commit
88dd90a2bb
|
@ -11,8 +11,8 @@
|
|||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 223,
|
||||
"versionName": "23.30.1Beta",
|
||||
"versionCode": 227,
|
||||
"versionName": "23.36Beta",
|
||||
"outputFile": "app-beta-release.apk"
|
||||
}
|
||||
],
|
||||
|
|
|
@ -354,7 +354,6 @@ class SaleAdapter(
|
|||
itemArticleQuantityPicked.visibility = View.VISIBLE
|
||||
itemArticleQuantityLine3.visibility = View.VISIBLE
|
||||
if (type != SACADOR) {
|
||||
refs
|
||||
val colorRes =
|
||||
if (sale.hasMistake) R.color.verdnatura_red_salix else R.color.verdnatura_black
|
||||
imageErrorMessage.imageTintList =
|
||||
|
|
|
@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable
|
|||
import android.os.Build
|
||||
import android.view.View
|
||||
import android.widget.ImageView
|
||||
import androidx.core.widget.addTextChangedListener
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.FragmentPackagingSummaryBinding
|
||||
|
@ -19,9 +18,8 @@ import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryView
|
|||
import es.verdnatura.presentation.view.feature.inventario.fragment.SearchDepartmentModel
|
||||
import es.verdnatura.presentation.view.feature.workermistake.adapter.WorkermistakeAdapter
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorkerType
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
||||
import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
|
||||
|
||||
|
||||
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||
|
@ -62,7 +60,7 @@ class PackagingSummaryFragment(
|
|||
override fun init() {
|
||||
|
||||
binding.totalImages.text = getData("ENTRYNUMBERIMAGES")
|
||||
binding.observations.text=getData("ENTRYOBSERVATIONS")
|
||||
binding.observations.text = getData("ENTRYOBSERVATIONS")
|
||||
|
||||
departmentId = getData(DEPARTMENTMISTAKEID)
|
||||
customDialogList = CustomDialogList(requireContext())
|
||||
|
@ -196,7 +194,7 @@ class PackagingSummaryFragment(
|
|||
}
|
||||
|
||||
|
||||
private fun showMistakeList(list: List<MistakeWorkerType>) {
|
||||
private fun showMistakeList(list: List<MistakeType>) {
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
listMistakes = ArrayList()
|
||||
list.forEach {
|
||||
|
@ -219,10 +217,10 @@ class PackagingSummaryFragment(
|
|||
override fun onBarcodeRowClickListener(item: BarcodeVO) {
|
||||
list.forEach {
|
||||
if (it.description == item.code) {
|
||||
/* viewModel.workerMistake_Add(
|
||||
vUserFk = workerMistakeName!!.id!!,
|
||||
vTypeFk = it.code
|
||||
)*/
|
||||
/* viewModel.workerMistake_Add(
|
||||
vUserFk = workerMistakeName!!.id!!,
|
||||
vTypeFk = it.code
|
||||
)*/
|
||||
// getString(R.string.errorRegistered).toast(requireContext())
|
||||
customDialogList.dismiss()
|
||||
}
|
||||
|
|
|
@ -294,69 +294,7 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
fun collectionIncreaseQuantitySilex(
|
||||
saleFk: String,
|
||||
quantity: String
|
||||
) {
|
||||
silex.collectionIncreaseQuantity(
|
||||
saleFk,
|
||||
quantity
|
||||
).enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responseIncQuantity.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_responseIncQuantity.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/* fun sendChekingPresence(
|
||||
workerId: String,
|
||||
message: String,
|
||||
) {
|
||||
try {
|
||||
salix.sendChekingPresence(
|
||||
params = SalixMessageVO(
|
||||
workerId = workerId.toInt(),
|
||||
message = message
|
||||
)
|
||||
)
|
||||
.enqueue(object : SilexCallback<Boolean>(context) {
|
||||
override fun onResponse(call: Call<Boolean>, response: Response<Boolean>) {
|
||||
if (!response.isSuccessful || response.message() == "false") {
|
||||
_responseSalixMessage.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this), response.message()
|
||||
)
|
||||
)
|
||||
//Log.i("Salix","Mensaje enviado a salix")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
override fun onError(t: Throwable) {
|
||||
_responseSalixMessage.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this), t.message!!
|
||||
)
|
||||
)
|
||||
|
||||
}
|
||||
})
|
||||
} catch (e: Exception) {
|
||||
//Log.d("error " + e.message)
|
||||
}
|
||||
|
||||
}*/
|
||||
|
||||
fun ticket_printLabelPrevious(ticketFk: Int) {
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ import es.verdnatura.presentation.common.OnCollectionSelectedListener
|
|||
import es.verdnatura.presentation.common.OnGeneralItemRowClickListener
|
||||
import es.verdnatura.presentation.view.component.CustomDialogList
|
||||
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorkerType
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
|
||||
|
||||
|
||||
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
|
||||
|
@ -118,7 +118,7 @@ class PackingMistakeFragment(var menuOrigin: String) :
|
|||
}
|
||||
}
|
||||
|
||||
private fun showMistakeList(list: List<MistakeWorkerType>) {
|
||||
private fun showMistakeList(list: List<MistakeType>) {
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
listMistakes = ArrayList()
|
||||
list.forEach {
|
||||
|
|
|
@ -303,7 +303,7 @@
|
|||
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
||||
<string name="parkingOk">Parking ok</string>
|
||||
<string name="showParking">Escanea el parking</string>
|
||||
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe.</string>
|
||||
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe o el valor escaneado se utiliza para un id de compra y de item y no están relacionados.</string>
|
||||
<string name="pendingReview">Pendiente de revisar : </string>
|
||||
<string name="review">Revisar</string>
|
||||
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
||||
|
|
Loading…
Reference in New Issue