taler-android

commit ae327937e9d7424f19e152593fb3e27b6d526057
parent 7f07bdd3e20259c548c231e09958c0a529023c9e
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 21 Aug 2024 20:11:32 +0200

[wallet+pos] Tax rendering fixes

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
 | 
1
+
M
wallet/src/main/java/net/taler/wallet/payment/ProductAdapter.kt
 | 
6
+++---

2 files changed, 4 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
@@ -100,6 +100,7 @@ data class ConfigProduct(
         price = price,
         location = location,
         image = image,
+        taxes = taxes,
         quantity = quantity
     )
 
diff --git a/wallet/src/main/java/net/taler/wallet/payment/ProductAdapter.kt b/wallet/src/main/java/net/taler/wallet/payment/ProductAdapter.kt
@@ -64,7 +64,7 @@ internal class ProductAdapter(private val listener: ProductImageClickListener) :
         diffResult.dispatchUpdatesTo(this)
 
         items = newItems
-        taxesEqual = newItems.distinctBy { it.taxes }.size > 1
+        taxesEqual = newItems.distinctBy { it.taxes }.size == 1
     }
 
     internal inner class ProductViewHolder(v: View) : ViewHolder(v) {
@@ -100,8 +100,8 @@ internal class ProductAdapter(private val listener: ProductImageClickListener) :
             } else {
                 price.visibility = GONE
             }
-
-            if (!taxesEqual && product.taxes != null) {
+    
+            if (!taxesEqual && product.taxes != null && product.taxes!!.isNotEmpty()) {
                 taxes.visibility = VISIBLE
                 taxes.text = product.taxes!!.filter {
                     !it.tax.isZero()