taler-android

commit 3962afc92df544786a52556b076b634202437495
parent ae327937e9d7424f19e152593fb3e27b6d526057
Author: Iván Ávalos <avalos@disroot.org>
Date:   Thu, 22 Aug 2024 11:25:16 +0200

[wallet+pos] Parse taxes to set instead of list

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
wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
 | 
4
++--

3 files changed, 5 insertions(+), 5 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
@@ -87,7 +87,7 @@ data class ConfigProduct(
     @SerialName("delivery_location")
     override val location: String? = null,
     override val image: String? = null,
-    override val taxes: List<Tax>? = null,
+    override val taxes: Set<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,7 +45,7 @@ abstract class Product {
     abstract val price: Amount?
     abstract val location: String?
     abstract val image: String?
-    abstract val taxes: List<Tax>?
+    abstract val taxes: Set<Tax>?
     val localizedDescription: String
         get() = if (Build.VERSION.SDK_INT >= 26) {
             getLocalizedString(descriptionI18n, description)
@@ -65,7 +65,7 @@ data class ContractProduct(
     @SerialName("delivery_location")
     override val location: String? = null,
     override val image: String? = null,
-    override val taxes: List<Tax>? = null,
+    override val taxes: Set<Tax>? = null,
     val quantity: Int = 1,
 ) : Product() {
     val totalPrice: Amount? by lazy {
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
@@ -156,7 +156,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener {
         }
     }
 
-    private fun compileTaxes(contractTerms: ContractTerms): List<Tax>? {
+    private fun compileTaxes(contractTerms: ContractTerms): Set<Tax>? {
         val distinct = contractTerms.products.distinctBy { it.taxes }
         return if (distinct.size == 1) {
             distinct.first().taxes
@@ -169,7 +169,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener {
         contractTerms: ContractTerms,
         amount: Amount,
         totalFees: Amount? = null,
-        taxes: List<Tax>? = null,
+        taxes: Set<Tax>? = null,
     ) {
         ui.details.orderView.text = contractTerms.summary
         adapter.update(contractTerms.products)