diff options
| author | Torsten Grote <t@grobox.de> | 2020-03-18 17:24:02 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-03-18 17:24:02 -0300 |
| commit | 82b8b57dc16112b859150696199774fcf06655e1 (patch) | |
| tree | e4bc3e9b799b7b3529821fa29041abe71f85e986 /merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt | |
| parent | b24169502d8052c7359632059f147734d8da1dd9 (diff) | |
| download | taler-android-82b8b57dc16112b859150696199774fcf06655e1.tar.gz taler-android-82b8b57dc16112b859150696199774fcf06655e1.tar.bz2 taler-android-82b8b57dc16112b859150696199774fcf06655e1.zip | |
Factor out code from merchant-terminal into common library
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 | 11 |
1 files changed, 2 insertions, 9 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 faee226..fc3f93a 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 @@ -24,22 +24,15 @@ import com.android.volley.RequestQueue import com.android.volley.Response.ErrorListener import com.android.volley.Response.Listener import com.fasterxml.jackson.annotation.JsonIgnore -import com.fasterxml.jackson.annotation.JsonInclude -import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import net.taler.merchantpos.Amount +import net.taler.common.Amount +import net.taler.common.Timestamp import net.taler.merchantpos.config.ConfigManager import net.taler.merchantpos.config.MerchantRequest import org.json.JSONObject -@JsonInclude(NON_EMPTY) -class Timestamp( - @JsonProperty("t_ms") - val ms: Long -) - data class HistoryItem( @JsonProperty("order_id") val orderId: String, |