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

refs #4021 Cambiado quantity a printedStickers

This commit is contained in:
Sergio De la torre 2023-06-12 08:38:32 +02:00
parent 258c4d134b
commit 86c51e4e99
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,9 +178,9 @@ class PackagingCountFragment(
viewModel.entry_addFromBuy( viewModel.entry_addFromBuy(
getDataInt("ENTRYID"), item = item.id!!.toInt(), getDataInt("ENTRYID"), item = item.id!!.toInt(),
(if (getData("ENTRYTYPE") == "Rec") { (if (getData("ENTRYTYPE") == "Rec") {
(item.quantity!!.plus(customDialogInput.getValue().toInt())) (item.printedStickers!!.plus(customDialogInput.getValue().toInt()))
} else { } else {
item.quantity!!.plus(customDialogInput.getValue().toInt() * -1) item.printedStickers!!.plus(customDialogInput.getValue().toInt() * -1)
}) as Number }) as Number
) )
customDialog.cancel() customDialog.cancel()

3
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt
View File

@ -11,9 +11,11 @@ data class Supplier(
class SupplierList( class SupplierList(
var list: List<Supplier> = listOf() var list: List<Supplier> = listOf()
) )
class EntryList( class EntryList(
var list: List<EntrySalix> = listOf() var list: List<EntrySalix> = listOf()
) )
class itemSupplierList( class itemSupplierList(
var list: List<ItemSupplier> = listOf() var list: List<ItemSupplier> = listOf()
) )
@ -23,6 +25,7 @@ data class ItemSupplier(
var name: String? = null, var name: String? = null,
var quantity: Int = 0, var quantity: Int = 0,
var quantityTotal: Int = 0, var quantityTotal: Int = 0,
var printedStickers: Int = 0,
var buy: Int? = null, var buy: Int? = null,
var isError: Boolean = false, var isError: Boolean = false,
var errorMessage: String? = null var errorMessage: String? = null

2
app/src/main/res/layout/item_itemsupplier_row.xml
View File

@ -69,7 +69,7 @@
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
android:layout_weight="1.25" android:layout_weight="1.25"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@{Integer.toString(item.quantity)}" android:text="@{Integer.toString(item.printedStickers)}"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/h8" android:textSize="@dimen/h8"
android:visibility="visible" android:visibility="visible"