From 21c79819fa6aad2bf9c68bd03faa273ff450ca56 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 5 Feb 2021 13:49:51 -0300 Subject: [pos] Remove QR code once order has been claimed --- .../net/taler/merchantpos/payment/PaymentManager.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 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 b017726..98161db 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 @@ -46,7 +46,7 @@ class PaymentManager( private val context: Context, private val configManager: ConfigManager, private val scope: CoroutineScope, - private val api: MerchantApi + private val api: MerchantApi, ) { private val mPayment = MutableLiveData() @@ -89,12 +89,17 @@ class PaymentManager( assertUiThread() if (!isActive) return@handle // don't continue if job was cancelled val currentValue = requireNotNull(mPayment.value) - if (response.paid) { - mPayment.value = currentValue.copy(paid = true) - checkTimer.cancel() - } else if (currentValue.talerPayUri == null) { - response as CheckPaymentResponse.Unpaid - mPayment.value = currentValue.copy(talerPayUri = response.talerPayUri) + when (response) { + is CheckPaymentResponse.Unpaid -> { + mPayment.value = currentValue.copy(talerPayUri = response.talerPayUri) + } + is CheckPaymentResponse.Claimed -> { + mPayment.value = currentValue.copy(claimed = true) + } + is CheckPaymentResponse.Paid -> { + mPayment.value = currentValue.copy(paid = true) + checkTimer.cancel() + } } } } -- cgit v1.2.3