[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-terminal-android] branch master updated: Pass through pr
From: |
gnunet |
Subject: |
[taler-merchant-terminal-android] branch master updated: Pass through product images to contract terms |
Date: |
Wed, 11 Mar 2020 13:13:40 +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.
The following commit(s) were added to refs/heads/master by this push:
new f4e152e Pass through product images to contract terms
f4e152e is described below
commit f4e152ecabe2152a11b422bbcbd72eaaa05bf626
Author: Torsten Grote <address@hidden>
AuthorDate: Tue Mar 10 13:38:22 2020 -0300
Pass through product images to contract terms
---
app/src/main/java/net/taler/merchantpos/order/Definitions.kt | 4 ++++
1 file changed, 4 insertions(+)
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 269b74a..bc16047 100644
--- a/app/src/main/java/net/taler/merchantpos/order/Definitions.kt
+++ b/app/src/main/java/net/taler/merchantpos/order/Definitions.kt
@@ -31,6 +31,7 @@ abstract class Product {
abstract val price: String
@get:JsonProperty("delivery_location")
abstract val location: String?
+ abstract val image: String?
@get:JsonIgnore
val localizedDescription: String
get() = getLocalizedString(descriptionI18n, description)
@@ -44,6 +45,7 @@ data class ConfigProduct(
override val descriptionI18n: Map<String, String>?,
override val price: String,
override val location: String?,
+ override val image: String?,
val categories: List<Int>,
@JsonIgnore
val quantity: Int = 0
@@ -60,6 +62,7 @@ data class ContractProduct(
override val descriptionI18n: Map<String, String>?,
override val price: String,
override val location: String?,
+ override val image: String?,
val quantity: Int
) : Product() {
constructor(product: ConfigProduct) : this(
@@ -68,6 +71,7 @@ data class ContractProduct(
product.descriptionI18n,
product.price,
product.location,
+ product.image,
product.quantity
)
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant-terminal-android] branch master updated: Pass through product images to contract terms,
gnunet <=