diff --git a/core/src/main/java/io/snabble/sdk/Project.kt b/core/src/main/java/io/snabble/sdk/Project.kt index 328231b2d9..40a08fa63a 100644 --- a/core/src/main/java/io/snabble/sdk/Project.kt +++ b/core/src/main/java/io/snabble/sdk/Project.kt @@ -4,7 +4,6 @@ import com.google.gson.Gson import com.google.gson.JsonElement import com.google.gson.JsonObject import com.google.gson.JsonSyntaxException -import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken import io.snabble.sdk.auth.SnabbleAuthorizationInterceptor import io.snabble.sdk.checkout.Checkout @@ -351,6 +350,10 @@ class Project internal constructor( private set var appTheme: AppTheme? = null + private set + + var customizationConfig: JsonElement? = null + private set init { parse(jsonObject) @@ -368,7 +371,7 @@ class Project internal constructor( brand = Snabble.brands[brandId] } - val customizationConfig: JsonElement? = jsonObject["appCustomizationConfig"] + customizationConfig = jsonObject["appCustomizationConfig"] try { val lightModeColors: LightModeColors? = gson.fromJson(customizationConfig, LightModeColors::class.java) val darkModeColors: DarkModeColors? = gson.fromJson(customizationConfig, DarkModeColors::class.java) diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt index f461b827bf..a0418e2717 100644 --- a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt +++ b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/repository/PurchasesRepository.kt @@ -42,10 +42,11 @@ internal class PurchasesRepositoryImpl( } private fun Array.mapToPurchases(count: Int): List { - val purchases = filter { it.pdfUrl != null } - if (purchases.isEmpty()) return emptyList() - return purchases - .slice(0 until size.coerceAtMost(count)) - .map { it.toPurchase(timeFormatter) } + val receipts = filter { it.pdfUrl != null } + return when { + receipts.isEmpty() -> emptyList() + else -> receipts.slice(0 until size.coerceAtMost(count)) + .map { it.toPurchase(timeFormatter) } + } } } diff --git a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java index 026cd2c450..2164431250 100644 --- a/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java +++ b/ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutCustomerCardView.java @@ -117,4 +117,4 @@ public void setHelperImage(Bitmap bitmap) { helperText.setVisibility(View.VISIBLE); } } -} \ No newline at end of file +}