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/history/HistoryManager.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/history/HistoryManager.kt')
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt index fc3f93a..3aaf3a4 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt @@ -42,7 +42,7 @@ data class HistoryItem( val timestamp: Timestamp ) { @get:JsonIgnore - val amount: Amount by lazy { Amount.fromString(amountStr) } + val amount: Amount by lazy { Amount.fromJSONString(amountStr) } @get:JsonIgnore val time = timestamp.ms |