diff options
author | Torsten Grote <t@grobox.de> | 2020-03-20 15:43:23 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-03-20 15:43:23 -0300 |
commit | db8b71418b766258a7a4bda91e496b1b03cb28cd (patch) | |
tree | bd221d1a7ecf77d7752ea7a6086da344e74619cc /merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt | |
parent | 82b8b57dc16112b859150696199774fcf06655e1 (diff) | |
download | taler-android-db8b71418b766258a7a4bda91e496b1b03cb28cd.tar.gz taler-android-db8b71418b766258a7a4bda91e496b1b03cb28cd.tar.bz2 taler-android-db8b71418b766258a7a4bda91e496b1b03cb28cd.zip |
Let all apps use the same Amount class
The wallet now also uses taler-kotlin-common
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt')
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt index 5954e63..ff6e6b7 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt @@ -16,10 +16,11 @@ package net.taler.merchantpos.order +import net.taler.common.Amount import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct -data class Order(val id: Int, val availableCategories: Map<Int, Category>) { +data class Order(val id: Int, val currency: String, val availableCategories: Map<Int, Category>) { val products = ArrayList<ConfigProduct>() val title: String = id.toString() val summary: String @@ -29,17 +30,14 @@ data class Order(val id: Int, val availableCategories: Map<Int, Category>) { "$quantity x ${category.localizedName}" }.joinToString() } - val total: Double + val total: Amount get() { - var total = 0.0 + var total = Amount.zero(currency) products.forEach { product -> - val price = product.priceAsDouble - total += price * product.quantity + total += product.price * product.quantity } return total } - val totalAsString: String - get() = String.format("%.2f", total) operator fun plus(product: ConfigProduct): Order { val i = products.indexOf(product) |