1 files changed, 4 insertions, 4 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
index 0bea20c..a22ab0a 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt
@@ -16,10 +16,10 @@
 
 package net.taler.merchantpos.order
 
+import net.taler.common.Amount
 import net.taler.common.ContractTerms
+import net.taler.common.Timestamp
 import net.taler.common.now
-import net.taler.lib.common.Amount
-import net.taler.lib.common.Timestamp
 import net.taler.merchantpos.config.Category
 import net.taler.merchantpos.config.ConfigProduct
 import java.net.URLEncoder
@@ -73,7 +73,7 @@ data class Order(val id: Int, val currency: String, val availableCategories: Map
         val categories = HashMap<Category, Int>()
         products.forEach { product ->
             val categoryId = product.categories[0]
-            val category = availableCategories.getValue(categoryId)
+            val category = availableCategories[categoryId] ?: return@forEach // custom products
             val oldQuantity = categories[category] ?: 0
             categories[category] = oldQuantity + product.quantity
         }
@@ -117,7 +117,7 @@ data class Order(val id: Int, val currency: String, val availableCategories: Map
         }
 
     fun toContractTerms(): ContractTerms {
-        val deadline = Timestamp(now() + HOURS.toMillis(1))
+        val deadline = Timestamp.fromMillis(now() + HOURS.toMillis(1))
         return ContractTerms(
             summary = summary,
             summaryI18n = summaryI18n,