diff options
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt')
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt index a89a85d..6c5ecdf 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt @@ -120,7 +120,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver { val currentOrder = order(currentId) if (currentOrder.isEmpty()) orders.remove(currentId) else currentOrder.lastAddedProduct = null // not needed anymore and it would get selected - mCurrentOrderId.value = nextId + mCurrentOrderId.value = requireNotNull(nextId) } @UiThread @@ -143,7 +143,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver { // and would get selected when navigating back instead of last selection if (currentOrder.isEmpty()) orders.remove(currentId) else currentOrder.lastAddedProduct = null - mCurrentOrderId.value = previousId + mCurrentOrderId.value = requireNotNull(previousId) } fun hasPreviousOrder(currentOrderId: Int): Boolean { @@ -159,7 +159,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver { forEach { if (it.selected) it.selected = false } category.selected = true } - mCategories.postValue(newCategories) + mCategories.postValue(newCategories ?: emptyList()) mProducts.postValue(productsByCategory[category]) } |