taler-android

commit 7f07bdd3e20259c548c231e09958c0a529023c9e
parent a04d3760ec62214415822309788322e8ba97fb77
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 21 Aug 2024 19:42:52 +0200

[pos] add taxes to ConfigProduct

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
 | 
2
++
M
taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
 | 
3
++-

2 files changed, 4 insertions(+), 1 deletion(-)
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
@@ -23,6 +23,7 @@ import net.taler.common.Amount
 import net.taler.common.ContractProduct
 import net.taler.common.Product
 import net.taler.common.TalerUtils
+import net.taler.common.Tax
 import net.taler.merchantlib.MerchantConfig
 import java.util.UUID
 
@@ -86,6 +87,7 @@ data class ConfigProduct(
     @SerialName("delivery_location")
     override val location: String? = null,
     override val image: String? = null,
+    override val taxes: List<Tax>? = null,
     val categories: List<Int>,
     val quantity: Int = 0
 ) : Product() {
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt b/taler-kotlin-android/src/main/java/net/taler/common/ContractTerms.kt
@@ -45,6 +45,7 @@ abstract class Product {
     abstract val price: Amount?
     abstract val location: String?
     abstract val image: String?
+    abstract val taxes: List<Tax>?
     val localizedDescription: String
         get() = if (Build.VERSION.SDK_INT >= 26) {
             getLocalizedString(descriptionI18n, description)
@@ -64,8 +65,8 @@ data class ContractProduct(
     @SerialName("delivery_location")
     override val location: String? = null,
     override val image: String? = null,
+    override val taxes: List<Tax>? = null,
     val quantity: Int = 1,
-    val taxes: List<Tax>? = null,
 ) : Product() {
     val totalPrice: Amount? by lazy {
         price?.let { price * quantity }