diff options
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt')
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt index f48c1db..c11b5c7 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt @@ -19,9 +19,9 @@ package net.taler.merchantpos.order import androidx.annotation.UiThread import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map +import net.taler.common.Amount import net.taler.common.CombinedLiveData -import net.taler.lib.common.Amount import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct import net.taler.merchantpos.order.RestartState.DISABLED @@ -52,7 +52,7 @@ internal class MutableLiveOrder( get() = productsByCategory.keys.map { it.id to it }.toMap() override val order: MutableLiveData<Order?> = MutableLiveData(Order(id, currency, availableCategories)) - override val orderTotal: LiveData<Amount> = Transformations.map(order) { it?.total } + override val orderTotal: LiveData<Amount> = order.map { it?.total ?: Amount.zero(currency) } override val restartState = MutableLiveData(DISABLED) private val selectedOrderLine = MutableLiveData<ConfigProduct?>() override val selectedProductKey: String? |