diff options
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config')
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfig.kt | 5 | ||||
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfig.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfig.kt index 0e707d3..0c7e3b7 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfig.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfig.kt @@ -23,7 +23,7 @@ import net.taler.common.Amount import net.taler.common.ContractProduct import net.taler.common.Product import net.taler.common.TalerUtils -import java.util.* +import java.util.UUID data class Config( val configUrl: String, @@ -50,6 +50,9 @@ data class MerchantConfig( } return uriBuilder.toString() } + fun convert() = net.taler.merchantlib.MerchantConfig( + baseUrl, instance, apiKey + ) } data class Category( diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt index 6c9c741..9cfae94 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt @@ -16,7 +16,6 @@ package net.taler.merchantpos.config - import android.util.ArrayMap import com.android.volley.Response import com.android.volley.toolbox.JsonObjectRequest |