From db0cf385fe707091f219cc61fb4e12b5b1fe64d0 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 30 Mar 2020 14:17:09 -0300 Subject: Fix amount serialization in PoS app --- .../src/main/java/net/taler/merchantpos/payment/PaymentManager.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt') diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt index f83370e..054d7cd 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt @@ -71,9 +71,9 @@ class PaymentManager( val merchantConfig = configManager.merchantConfig!! val currency = merchantConfig.currency!! - val amount = order.total.toJSONString() val summary = order.summary val summaryI18n = order.summaryI18n +// val refundDeadline = Timestamp(System.currentTimeMillis() + HOURS.toMillis(2)) mPayment.value = Payment(order, summary, currency) @@ -82,12 +82,13 @@ class PaymentManager( "${FULFILLMENT_PREFIX}${URLEncoder.encode(summary, "UTF-8")}#$fulfillmentId" val body = JSONObject().apply { put("order", JSONObject().apply { - put("amount", amount) + put("amount", order.total.toJSONString()) put("summary", summary) if (summaryI18n != null) put("summary_i18n", order.summaryI18n) // fulfillment_url needs to be unique per order put("fulfillment_url", fulfillmentUrl) put("instance", "default") +// put("refund_deadline", JSONObject(mapper.writeValueAsString(refundDeadline))) put("products", order.getProductsJson()) }) } -- cgit v1.2.3