diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 8b8cbbca..00000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cfa598f9..47fe0300 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -26,6 +26,7 @@
+
@@ -73,7 +74,6 @@
-
@@ -99,11 +99,11 @@
-
+
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 49cf214d..af9e1e27 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,8 @@ android {
minSdkVersion 21
targetSdkVersion 29
versionCode 76
- versionName "6.1.9" //Sin subir, Modificado y añadido mensajes de error, añadido opcion Dia de venta y su parking, teclado numerico para controlador
+ versionName "6.1.9" //VERSION CODE 76, añadido grouping, reference, prioridad, controladores vs scadores, boton mensaje error,rocket salix y error al añadir elemento a colección.
+ // Sin subir, Modificado y añadido mensajes de error, añadido opcion Dia de venta y su parking, teclado numerico para controlador
// versionName "6.1.8.5" VERSION CODE 75 // 23-10-2021//VERSION CODE 74-75 .Pantalla "Dia de venta y parking" Modificado itemtrash, deprecated preferenceManager, quitados ;,puesto menu general al controlador
//versionName "6.1.8.4.1" //VERSION CODE 73 . Modificar itemtrash
//versionName "6.1.8.4" //VERSION CODE 72 . Se añade ExpedtionScan para el Sorter, y modificion llamadas itemtrash y collectionGetTicket.
diff --git a/app/release/20210611-vn-picking.apk b/app/release/20210611-vn-picking.apk
deleted file mode 100644
index 207aa4d4..00000000
Binary files a/app/release/20210611-vn-picking.apk and /dev/null differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
deleted file mode 100644
index 5ab975f7..00000000
Binary files a/app/release/app-release.apk and /dev/null differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index de0f8c09..9a1ef921 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 75,
- "versionName": "6.1.8.5",
+ "versionCode": 76,
+ "versionName": "6.1.9",
"outputFile": "app-release.apk"
}
],
diff --git a/app/release/vn-picking-old-old.apk b/app/release/vn-picking-old-old.apk
deleted file mode 100644
index 6995a4da..00000000
Binary files a/app/release/vn-picking-old-old.apk and /dev/null differ
diff --git a/app/release/vn-picking-old.apk b/app/release/vn-picking-old.apk
deleted file mode 100644
index 65960acf..00000000
Binary files a/app/release/vn-picking-old.apk and /dev/null differ
diff --git a/app/release/vn-picking-test(delete_fragments).apk b/app/release/vn-picking-test(delete_fragments).apk
deleted file mode 100644
index 8e543fd4..00000000
Binary files a/app/release/vn-picking-test(delete_fragments).apk and /dev/null differ
diff --git a/app/release/vn-picking.apk b/app/release/vn-picking.apk
index e6a61c26..21beb9b4 100644
Binary files a/app/release/vn-picking.apk and b/app/release/vn-picking.apk differ
diff --git a/app/release/vn-picking_deletefragments.apk b/app/release/vn-picking_deletefragments.apk
deleted file mode 100644
index 8e543fd4..00000000
Binary files a/app/release/vn-picking_deletefragments.apk and /dev/null differ
diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
index 76d67b7e..4be1d29d 100644
--- a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
@@ -214,6 +214,26 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
)
}
+ fun item_saveReference(
+ usuario: String,
+ password: String,
+ itemFk: String,
+ value: String
+ ): Call {
+ val params: ArrayList = ArrayList()
+ params.add(itemFk)
+ params.add(value)
+ return restClient!!.item_saveReference(
+ "json",
+ "1",
+ usuario,
+ password,
+ "application/json",
+ params = params
+ )
+ }
+
+
fun barcodes_edit(
usuario: String,
password: String,
diff --git a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
index 3e44e660..ec8123a1 100644
--- a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
@@ -89,24 +89,24 @@ class GetLoginUserCase(context: Context) : RestClient(context)
//SALIX MENSAJE :SERGIO: PARA NO ENVIAR MENSAJES A COMERCIALES PONGO QUE LAS MODIFICACIONES SE ENVIAN AL CANAL CREADO.
- /* fun sendChekingPresence(token:String,workerId:Int,message:String) : Call{
- return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
- }
- // SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA*/
- fun sendChekingPresence(token: String, workerId: Int, message: String): Call
- {
- return salixClient!!.sendGroup(
- content_type = "application/json",
- authorization = token,
- params = SalixGrupo(to = "#android-test", message = message)
- )
- }
+ fun sendChekingPresence(token:String,workerId:Int,message:String) : Call{
+ return salixClient!!.sendChekingPresence(content_type = "application/json", authorization = token, params = SalixMessageVO(workerId = workerId,message = message))
+ }
+ /* // SERGIO: PARA DESARROLLO Y PRUEBAS SE DESCOMENTA ESTAS LÍNEAS Y SE COMENTAN LAS DE ARRIBA
+ fun sendChekingPresence(token: String, workerId: Int, message: String): Call
+ {
+ return salixClient!!.sendGroup(
+ content_type = "application/json",
+ authorization = token,
+ params = SalixGrupo(to = "#android-test", message = message)
+ )
+ }*/
fun checkVersion(usuario: String, password: String, nameApp: String): Call
{
- val params: ArrayList = ArrayList()
- params.add(nameApp)
- return restClient!!.getVersion("json", "1", usuario, password, "application/json", params)
+val params: ArrayList = ArrayList()
+params.add(nameApp)
+return restClient!!.getVersion("json", "1", usuario, password, "application/json", params)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
index d20e9e7d..e9cc698a 100644
--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@@ -490,6 +490,17 @@ interface VerdnaturaService {
):
Call
+ @POST("almacennew/item_saveReference")//REVISADA
+ fun item_saveReference(
+ @Header("aplicacion") aplicacion: String,
+ @Header("version") version: String,
+ @Header("user") user: String,
+ @Header("pass") pass: String,
+ @Header("Content-Type") content_type: String,
+ @Body params: List
+ ):
+ Call
+
@POST("almacennew/barcodes_edit")//REVISADA
fun barcodes_edit(
@Header("aplicacion") aplicacion: String,
diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt
index cb41aae1..66fe178e 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt
@@ -10,6 +10,9 @@ abstract class BaseViewModel : ViewModel(), LifecycleObserver
fun nameofFunction(function: Any): String
{
+
+ // return Thread.currentThread().stackTrace[1].methodName
+
return function.javaClass.enclosingMethod!!.name
}
diff --git a/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt b/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt
index b4170a94..86dda482 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt
@@ -1,16 +1,22 @@
package es.verdnatura.presentation.common
-
-
-class ResponseItemVO (
- var response:String = "",
+class ResponseItemVO(
+ var response: String = "",
var isError: Boolean = false,
var errorMessage: String = ""
-)
+ )
-class ResponseItemMachineControl (
- var response:String = "",
+class ResponseItemMachineControl(
+ var response: String = "",
var isError: Boolean = false,
var errorMessage: String = "",
var type: String
-)
\ No newline at end of file
+ )
+
+class DataMessageSalix(
+ var ticket: String = "",
+ var item: String = "",
+ var quantity: String = "",
+ var personSale: String = ""
+
+ )
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
index c7dacac6..b70a0eb9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
@@ -205,6 +205,7 @@ class ItemCardFragment(
}else{
getItemCard(itemFk)
}
+
})
}
}
@@ -251,11 +252,14 @@ class ItemCardFragment(
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Grouping),value = itemInfo.grouping,isEditable = true, action = "updateGrouping"))
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Packing),value = itemInfo.packing,isEditable = true, action = "updatePacking"))
listItemsRow.add(ItemCardRowVO(title = getString(R.string.MINIMO),value = itemInfo.min,isEditable = true, action = "itemSaveMin"))
+ listItemsRow.add(ItemCardRowVO(title = getString(R.string.Referencia),value = itemInfo.referencia,isEditable = true, action = "item_saveReference"))
listItemsRow.add(ItemCardRowVO(title = getString(R.string.Barcode),barcodes = itemInfo.barcodes,isEditable = true, action = "toBarcode"))
+
//sergio para itemTypePacking
listItemsRow.add(ItemCardRowVO(title = getString(R.string.tipodeencajado),value = itemInfo.itemPackingTypeFk,isEditable = true, action = "updateSector"))
// listItemsRow.add(ItemCardRowVO(title = "Artículos similares",value = itemInfo.itemPackingTypeFk,isEditable = true, action = "itemProposal"))
+
listBarcodes = itemInfo.barcodes as ArrayList
adapter = ItemCardAdapter(listItemsRow,object: OnItemCardRowClickListener{
@@ -387,6 +391,8 @@ class ItemCardFragment(
"updateGrouping" -> viewModel.updateGrouping(itemFk = itemFk, user = user, password = password, value = value,warehouseFk = warehouseFk,"buy_updateGrouping")
"updatePacking" -> viewModel.updatePacking(itemFk = itemFk, user = user, password = password, value = value,warehouseFk = warehouseFk,"buy_updateGrouping")
"itemSaveMin" -> viewModel.itemSaveMin(itemFk = itemFk, user = user, password = password, value = value,"itemSaveMin")
+ "item_saveReference"->viewModel.item_saveReference(itemFk = itemFk, user = user, password = password, value = value,"item_saveReference")
+
}
if(item.action != "itemStockUpdate")
@@ -534,7 +540,8 @@ class ItemCardFragment(
}else{
listBarcodes.add(BarcodeVO(code))
}
- viewModel.barcodesEdit(itemFk = itemFk, user = user, password = password, value = code, delete = delete,"itemBarcode_update")
+ viewModel.barcodesEdit(itemFk = itemInfoG!!.id, user = user, password = password, value = code, delete = delete,"itemBarcode_update")
+ // viewModel.barcodesEdit(itemFk = itemFk, user = user, password = password, value = code, delete = delete,"itemBarcode_update")
barcodeAdapter!!.notifyDataSetChanged()
//changeOfflineValue(item,"", listBarcodes)
showProgress()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
index d0ad2245..568f9296 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
@@ -9,11 +9,13 @@ import es.verdnatura.domain.GetItemCardUserCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageError
import es.verdnatura.presentation.base.getMessageFromAllResponse
+import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.articulo.model.*
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
+import timber.log.Timber
import java.util.*
import kotlin.collections.ArrayList
@@ -45,9 +47,14 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
getItemCardUserCase.getItemCard(user,password,itemFk,warehouseFk).enqueue(object :Callback{
override fun onFailure(call: Call, t: Throwable) {
_itemcard.value = ItemCardVO(isError = true,errorMessage = getMessageFromAllResponse(callFunction,t.message!!))
+
}
override fun onResponse(call: Call, response: Response) {
+
+ // Timber.d("el nombre de la funcion es : "+nameofFunction({ } ))-->devuelve onResponse
+ Timber.d("el nombre de la funcion es : "+nameofFunction(this))//-->devuelve getItemCard
+
if (response.body() != null){
_itemcard.value = response.body()!!
}else{
@@ -237,6 +244,25 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
})
}
+ fun item_saveReference(itemFk:String,user:String,password:String,value:String,callFunction:String){
+ getItemCardUserCase.item_saveReference(user,password,itemFk,value).enqueue(object : Callback{
+ override fun onFailure(call: Call, t: Throwable) {
+ _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(callFunction,t.message!!))
+ }
+
+ override fun onResponse(call: Call, response: Response) {
+
+ if (!response.isSuccessful){
+ _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(callFunction,response.message()))
+ }else{
+ _response.value = ResponseItemVO(isError = false)
+ }
+
+ }
+
+ })
+ }
+
fun barcodesEdit(itemFk:String,user:String,password:String,value:String,delete:String,callFunction:String){
getItemCardUserCase.barcodes_edit(user,password,itemFk,value,delete).enqueue(object : Callback{
override fun onFailure(call: Call, t: Throwable) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt
index 3c1db21d..a24d14b0 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt
@@ -30,7 +30,8 @@ class ItemCardVO (
var errorMessage:String = "",
var urlImage200:String = "",
var urlImage:String = "",
- var itemPackingTypeFk:String =" "
+ var itemPackingTypeFk:String =" ",
+ var referencia:String=""
)
class ItemCardRowVO (
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
index 04482862..177dc498 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
@@ -37,6 +37,7 @@ class PlacementAdapter (
if (placement.visible.isNullOrEmpty())
placement.visible = "("+placement.stockTotal+")"
this.item = placement
+
itemRootLayout.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Ubicador"),placement.shelving)
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
index 199b0136..1d054d9d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R
import es.verdnatura.databinding.ItemArticleRowBinding
+import es.verdnatura.domain.toast
import es.verdnatura.presentation.common.OnMistakeClickListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.common.OnQuantityClickListener
@@ -77,10 +78,21 @@ class SaleAdapter (
}
contentLayout.setOnLongClickListener {
- onMistakeClickListener.onMistakeClickListener(sale)
+ "Nueva funcionalidad en el icono de la derecha".toast(context!!)
+ //onMistakeClickListener.onMistakeClickListener(sale)
false
}
+ /*itemRowLayout.setOnLongClickListener{
+ onMistakeClickListener.onMistakeClickListener(sale)
+ false
+ }*/
+ imageErrorMessage.setOnClickListener{
+ onMistakeClickListener.onMistakeClickListener(sale)
+ false
+ }
+
+
//ERROR
if (sale.originalQuantity != sale.quantity){
layoutError.visibility = View.VISIBLE
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
index 6e09bd02..5fbd65c7 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
@@ -49,6 +49,7 @@ class CollectionFragment(
var collection: CollectionVO = CollectionVO(),
var type: String = SACADOR
) : BaseFragment(CollectionViewModel::class) {
+ private lateinit var dataMessageSalix:DataMessageSalix
private var user = ""
private var password = ""
private var sectorFk = ""
@@ -246,6 +247,8 @@ class CollectionFragment(
if (!scan_input.text.toString().isNullOrEmpty()) {
//////Log.i("VERDNATURA:","Pita o no pita si encuentra. Diferencia si es matricula o no")
findSale(scan_input.text.toString())
+
+
}
scan_input.setText("")
hideKeyboards()
@@ -331,7 +334,15 @@ class CollectionFragment(
customDialog.dismiss()
}.show()
} else {
+
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
+
+ sendSalixMessage(
+ item=dataMessageSalix.item,
+ ticketFk=dataMessageSalix.ticket,
+ quantity=dataMessageSalix.quantity,
+ salePerson=dataMessageSalix.personSale
+ )
viewModel.collectionTicketGet(
user,
password,
@@ -427,6 +438,41 @@ class CollectionFragment(
}
}
+ private fun getSalePerson(ticketFk:String):String
+ {
+
+ var salePerson =""
+ for (it in sales)
+ {
+ if (it.ticketFk.equals(ticketFk))
+ {
+ salePerson= it.salePersonFk
+ break
+ }
+ }
+ return salePerson
+ }
+
+ private fun sendSalixMessage(item:String,ticketFk:String,quantity:String,salePerson:String)
+ {
+ val ticket =
+ "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)"
+ val message =
+ "Se ha añadido el articulo " + item + " con " +quantity+ " unidad/es al ticket " + ticket
+
+
+ /* d("VERDNATURA:","el comercial es " + salePerson)
+ d("VERDNATURA:","el item es " + item)
+ d("VERDNATURA:","el ticket es es " + ticketFk)
+ d("VERDNATURA:","la cantidad es " + quantity)*/
+
+ viewModel.sendChekingPresence(
+ token = token,
+ workerId = salePerson,
+ message = message,"sendChekingPresence"
+ )
+ }
+
//CREATE LIST
private fun createCollectionList() {
state = 0
@@ -459,8 +505,9 @@ class CollectionFragment(
observations = observations + " " + ticket.observations
}
+ //sales = salesList.sortedWith(compareBy({it.placements.get(0).placement}))
sales = salesList.sortedWith(compareBy({it.saleOrder}))
-
+ //sales=salesList
/* for (s in sales)
{
Log.i("VERDNATURA:","La sale del ticket ${s.ticketFk} es ${s.saleOrder}")
@@ -760,6 +807,7 @@ class CollectionFragment(
}
if (mpok != null) mpok!!.start()
"Ticket aparcado".toast(requireContext())
+
} else {
if (mperror != null) mperror!!.start()
}
@@ -769,6 +817,8 @@ class CollectionFragment(
}
+
+
private fun markLine(position: Int, newType: String) {
state = 0
//////Log.i("VERDNATURA:","Marcamos linea y enviamos saleTracking")
@@ -985,7 +1035,7 @@ class CollectionFragment(
customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
- Log.i("VERDNATURA:","Comprobando COGER-1")
+ // Log.i("VERDNATURA:","Comprobando COGER-1")
if (customDialogList.getValueTwo().isNotEmpty()) {
try {
if (isNumber(customDialogList.getValue()) && customDialogList.getValue()
@@ -1208,6 +1258,16 @@ class CollectionFragment(
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
} else {
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
+
+ //sergio datos para mensaje salix
+
+ dataMessageSalix= DataMessageSalix(
+ ticket=ticketSelected,
+ item = customDialogList.getValue(),
+ quantity=customDialogList.getValueTwo(),
+ personSale=getSalePerson(ticketSelected)
+ )
+
viewModel.collectionAddItem(
usuario = user,
password = password,
@@ -1217,6 +1277,8 @@ class CollectionFragment(
warehouseFk = warehouseFk,
callFunction="collection_addItem"
)
+
+
scanRequest()
customDialogList.dismiss()
}
@@ -1252,6 +1314,14 @@ class CollectionFragment(
getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
} else {
if (splash_progress != null) splash_progress.visibility = View.VISIBLE
+
+ dataMessageSalix= DataMessageSalix(
+ ticket=ticketSelected,
+ item = customDialogList.getValue(),
+ quantity=customDialogList.getValueTwo(),
+ personSale=getSalePerson(ticketSelected)
+ )
+
viewModel.collectionAddItem(
usuario = user,
password = password,
@@ -1377,11 +1447,17 @@ class CollectionFragment(
"" + totalMark + "/" + sales.size
if (totalMark == sales.size) {
getString(R.string.Coleccióncompleta).toast(this.context, Toast.LENGTH_SHORT)
+ showBottomNavigation(View.VISIBLE)
//sergio: se quita porque se realiza desde triggers
//changeTicketState()
}
}
+ private fun showBottomNavigation(visibilitiy:Int)
+ {
+ //requireActivity().main_bottom_navigation.visibility = visibilitiy
+ }
+
//FALTAS / BASURA / SPLIT
private fun showQuantityDialog(position: Int) {
// //Log.i("VERDNATURA:","Aparece CustomDialog")
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
index b8bcd020..2a4eaa84 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
@@ -226,7 +226,7 @@ class SacadorFragment :
adapter?.notifyDataSetChanged()
} else {
customDialog.setTitle("Atención")
- .setDescription("La colección " + collection + " sigue pendiente de preparar")
+ .setDescription("La colección " + collection + " sigue pendiente de prepararr")
.setOkButton("Aceptar") {
customDialog.dismiss()
}.show()
diff --git a/app/src/main/res/drawable/emoticon_error.xml b/app/src/main/res/drawable/emoticon_error.xml
new file mode 100644
index 00000000..1df9abbe
--- /dev/null
+++ b/app/src/main/res/drawable/emoticon_error.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_article_row.xml b/app/src/main/res/layout/item_article_row.xml
index 345198d3..7525b06c 100644
--- a/app/src/main/res/layout/item_article_row.xml
+++ b/app/src/main/res/layout/item_article_row.xml
@@ -29,6 +29,7 @@
android:background="@color/verdnatura_warm_grey"
android:padding="@dimen/layout_margin_min"
android:orientation="vertical">
+
+ android:textSize="@dimen/h8"
+ />
+
+
+
+
+ android:layout_marginRight="@dimen/layout_margin_min"
+ android:visibility="gone"/>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index cf530f67..90c7bf07 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -149,4 +149,5 @@
Escanear expedición
Día de venta
Carro
+ Referencia
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1b79d78..9496caf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -147,5 +147,6 @@
Scan expedition
Day of sale
Wagon
+ Reference