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/payment | |
| 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/payment')
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt | 2 | ||||
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt index 4cfb069..f83370e 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt @@ -71,7 +71,7 @@ class PaymentManager( val merchantConfig = configManager.merchantConfig!! val currency = merchantConfig.currency!! - val amount = "$currency:${order.totalAsString}" + val amount = order.total.toJSONString() val summary = order.summary val summaryI18n = order.summaryI18n diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt index 1d61894..9c9457c 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt @@ -16,7 +16,6 @@ package net.taler.merchantpos.payment -import android.annotation.SuppressLint import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -73,8 +72,7 @@ class ProcessPaymentFragment : Fragment() { return } payIntroView.fadeIn() - @SuppressLint("SetTextI18n") - amountView.text = "${payment.order.totalAsString} ${payment.currency}" + amountView.text = payment.order.total.toString() payment.orderId?.let { orderRefView.text = getString(R.string.payment_order_ref, it) orderRefView.fadeIn() |