gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant-terminal-android] 01/03: If there's just one product, u


From: gnunet
Subject: [taler-merchant-terminal-android] 01/03: If there's just one product, use its description as order summary
Date: Tue, 17 Mar 2020 16:30:45 +0100

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository merchant-terminal-android.

commit e4750a543a8b243e02f6156a6d08bbc8a3cf6cc2
Author: Torsten Grote <address@hidden>
AuthorDate: Mon Mar 16 13:29:49 2020 -0300

    If there's just one product, use its description as order summary
---
 app/src/main/java/net/taler/merchantpos/order/Definitions.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/taler/merchantpos/order/Definitions.kt 
b/app/src/main/java/net/taler/merchantpos/order/Definitions.kt
index b22413c..63eda17 100644
--- a/app/src/main/java/net/taler/merchantpos/order/Definitions.kt
+++ b/app/src/main/java/net/taler/merchantpos/order/Definitions.kt
@@ -120,9 +120,12 @@ data class Order(val id: Int, val availableCategories: 
Map<Int, Category>) {
     val products = ArrayList<ConfigProduct>()
     val title: String = id.toString()
     val summary: String
-        get() = getCategoryQuantities().map { (category: Category, quantity: 
Int) ->
-            "$quantity x ${category.localizedName}"
-        }.joinToString()
+        get() {
+            if (products.size == 1) return products[0].description
+            return getCategoryQuantities().map { (category: Category, 
quantity: Int) ->
+                "$quantity x ${category.localizedName}"
+            }.joinToString()
+        }
     val total: Double
         get() {
             var total = 0.0
@@ -175,6 +178,7 @@ data class Order(val id: Int, val availableCategories: 
Map<Int, Category>) {
      */
     val summaryI18n: Map<String, String>?
         get() {
+            if (products.size == 1) return products[0].descriptionI18n
             val categoryQuantities = getCategoryQuantities()
             // get all available locales
             val availableLocales = categoryQuantities.mapNotNull { (category, 
_) ->

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]