From e92fb0d6d4f20c0109638a695f30bd8737686d7b Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 3 Sep 2020 14:35:49 -0300 Subject: Remove instance parameter from merchant config and reset order state when moving to new config --- .../src/main/java/net/taler/merchantpos/config/PosConfig.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config') 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, val products: List ) -- cgit v1.2.3