[pos] Remove QR code once order has been claimed

1 files changed, 12 insertions, 8 deletions

diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
index dc5d554..201c9cf 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
@@ -45,8 +45,8 @@ class ProcessPaymentFragment : Fragment() {
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+        savedInstanceState: Bundle?,
+    ): View {
         ui = FragmentProcessPaymentBinding.inflate(inflater, container, false)
         return ui.root
     }
@@ -79,18 +79,22 @@ class ProcessPaymentFragment : Fragment() {
             navigate(actionProcessPaymentToPaymentSuccess())
             return
         }
+        if (payment.claimed) {
+            ui.qrcodeView.fadeOut()
+            ui.payIntroView.setText(R.string.payment_claimed)
+        } else {
+            payment.talerPayUri?.let {
+                ui.qrcodeView.setImageBitmap(makeQrCode(it))
+                ui.qrcodeView.fadeIn()
+                ui.progressBar.fadeOut()
+            }
+        }
         ui.payIntroView.fadeIn()
         ui.amountView.text = payment.order.total.toString()
         payment.orderId?.let {
             ui.orderRefView.text = getString(R.string.payment_order_id, it)
             ui.orderRefView.fadeIn()
         }
-        payment.talerPayUri?.let {
-            val qrcodeBitmap = makeQrCode(it)
-            ui.qrcodeView.setImageBitmap(qrcodeBitmap)
-            ui.qrcodeView.fadeIn()
-            ui.progressBar.fadeOut()
-        }
     }
 
     private fun onPaymentCancel() {