From db8b71418b766258a7a4bda91e496b1b03cb28cd Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 20 Mar 2020 15:43:23 -0300 Subject: Let all apps use the same Amount class The wallet now also uses taler-kotlin-common --- .../main/java/net/taler/merchantpos/order/OrderStateFragment.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt') diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt index a90334b..f792d7a 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt @@ -95,12 +95,11 @@ class OrderStateFragment : Fragment() { onOrderChanged(order, tracker) }) liveOrder.orderTotal.observe(viewLifecycleOwner, Observer { orderTotal -> - if (orderTotal == 0.0) { + if (orderTotal.isZero()) { totalView.fadeOut() totalView.text = null } else { - val currency = viewModel.configManager.merchantConfig?.currency - totalView.text = getString(R.string.order_total, orderTotal, currency) + totalView.text = getString(R.string.order_total, orderTotal) totalView.fadeIn() } }) @@ -184,7 +183,7 @@ private class OrderAdapter : Adapter() { v.isActivated = selected quantity.text = product.quantity.toString() name.text = product.localizedDescription - price.text = String.format("%.2f", product.priceAsDouble * product.quantity) + price.text = product.totalPrice.amountStr } } -- cgit v1.2.3