diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt index ce0a4c70..4dd86a60 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt @@ -178,9 +178,9 @@ class PackagingCountFragment( viewModel.entry_addFromBuy( getDataInt("ENTRYID"), item = item.id!!.toInt(), (if (getData("ENTRYTYPE") == "Rec") { - (item.quantity!!.plus(customDialogInput.getValue().toInt())) + (item.printedStickers!!.plus(customDialogInput.getValue().toInt())) } else { - item.quantity!!.plus(customDialogInput.getValue().toInt() * -1) + item.printedStickers!!.plus(customDialogInput.getValue().toInt() * -1) }) as Number ) customDialog.cancel() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt index 58bab5c1..c8dd8b04 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt @@ -11,9 +11,11 @@ data class Supplier( class SupplierList( var list: List = listOf() ) + class EntryList( var list: List = listOf() ) + class itemSupplierList( var list: List = listOf() ) @@ -23,6 +25,7 @@ data class ItemSupplier( var name: String? = null, var quantity: Int = 0, var quantityTotal: Int = 0, + var printedStickers: Int = 0, var buy: Int? = null, var isError: Boolean = false, var errorMessage: String? = null diff --git a/app/src/main/res/layout/item_itemsupplier_row.xml b/app/src/main/res/layout/item_itemsupplier_row.xml index e42ed28e..3694ea63 100644 --- a/app/src/main/res/layout/item_itemsupplier_row.xml +++ b/app/src/main/res/layout/item_itemsupplier_row.xml @@ -69,7 +69,7 @@ android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" android:layout_weight="1.25" android:layout_gravity="center" - android:text="@{Integer.toString(item.quantity)}" + android:text="@{Integer.toString(item.printedStickers)}" android:textColor="@color/verdnatura_white" android:textSize="@dimen/h8" android:visibility="visible"