diff options
author | Torsten Grote <t@grobox.de> | 2020-09-03 14:35:49 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-09-03 14:39:30 -0300 |
commit | e92fb0d6d4f20c0109638a695f30bd8737686d7b (patch) | |
tree | fdf59619d448a03cca786880185ecacc8832d326 /merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt | |
parent | 4572a3d5fc5ae5f3bbeaa8836fb919dcec0483e0 (diff) | |
download | taler-android-e92fb0d6d4f20c0109638a695f30bd8737686d7b.tar.gz taler-android-e92fb0d6d4f20c0109638a695f30bd8737686d7b.tar.bz2 taler-android-e92fb0d6d4f20c0109638a695f30bd8737686d7b.zip |
Remove instance parameter from merchant config
and reset order state when moving to new config
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt')
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt index 7def7cc..971f92c 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt @@ -23,6 +23,7 @@ import net.taler.common.ContractProduct import net.taler.common.Product import net.taler.common.TalerUtils import net.taler.lib.common.Amount +import net.taler.merchantlib.MerchantConfig import java.util.UUID data class Config( @@ -37,7 +38,7 @@ data class Config( @Serializable data class PosConfig( @SerialName("config") - val merchantConfig: net.taler.merchantlib.MerchantConfig, + val merchantConfig: MerchantConfig, val categories: List<Category>, val products: List<ConfigProduct> ) |