taler-android

commit f3e41b0e18cc1334432ff2eb45d8fcd216680b56
parent 0222da65ab41283d52acd885d94ec42c67bec6b4
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue, 22 Jul 2025 18:08:41 +0200

[wallet] add product_name to order / contract terms

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
 | 
4
++--
M
taler-kotlin-android/src/main/java/net/taler/common/Order.kt
 | 
2
+-

3 files changed, 5 insertions(+), 3 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
@@ -89,6 +89,8 @@ data class ConfigProduct(
     val id: String = UUID.randomUUID().toString(),
     @SerialName("product_id")
     override val productId: String? = null,
+    @SerialName("product_name")
+    override val productName: String? = null,
     override val description: String,
     @SerialName("description_i18n")
     override val descriptionI18n: Map<String, String>? = null,
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
@@ -155,8 +155,6 @@ sealed class ContractTerms {
         val tokenFamilies: Map<String, ContractTokenFamily>,
     ) : ContractTerms() {
         override val version: ContractVersion = ContractVersion.V1
-
-        fun getTokenFamily(slug: String) = tokenFamilies[slug]
     }
 }
 
@@ -194,6 +192,8 @@ data class Location(
 data class ContractProduct(
     @SerialName("product_id")
     override val productId: String? = null,
+    @SerialName("product_name")
+    override val productName: String? = null,
     override val description: String,
     @SerialName("description_i18n")
     override val descriptionI18n: Map<String, String>? = null,
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/Order.kt b/taler-kotlin-android/src/main/java/net/taler/common/Order.kt
@@ -16,7 +16,6 @@
 
 package net.taler.common
 
-import android.os.Build
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import net.taler.common.TalerUtils.getLocalizedString
@@ -47,6 +46,7 @@ data class Order(
 @Serializable
 abstract class OrderProduct {
     abstract val productId: String?
+    abstract val productName: String?
     abstract val description: String
     abstract val descriptionI18n: Map<String, String>?
     abstract val price: Amount?