diff options
author | Torsten Grote <t@grobox.de> | 2020-07-23 15:41:50 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-07-23 15:42:43 -0300 |
commit | 8eb241ccce345a35b05a6335d11306465220f66d (patch) | |
tree | fe78879b2c0cafdb9ba47f38db6a3572a7116594 /merchant-terminal/src/main/java/net/taler/merchantpos/payment | |
parent | 08b10a2408f958cae96ae0c674ee450a35109e8a (diff) | |
download | taler-android-8eb241ccce345a35b05a6335d11306465220f66d.tar.gz taler-android-8eb241ccce345a35b05a6335d11306465220f66d.tar.bz2 taler-android-8eb241ccce345a35b05a6335d11306465220f66d.zip |
[pos] refactor configuration fetching and validation
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/payment')
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt | 8 |
1 files changed, 4 insertions, 4 deletions
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 ea16cb4..fc4f642 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 @@ -63,9 +63,9 @@ class PaymentManager( @UiThread fun createPayment(order: Order) { val merchantConfig = configManager.merchantConfig!! - mPayment.value = Payment(order, order.summary, merchantConfig.currency!!) + mPayment.value = Payment(order, order.summary, configManager.currency!!) scope.launch(Dispatchers.IO) { - val response = api.postOrder(merchantConfig.convert(), order.toContractTerms()) + val response = api.postOrder(merchantConfig, order.toContractTerms()) response.handle(::onNetworkError, ::onOrderCreated) } } @@ -78,7 +78,7 @@ class PaymentManager( private fun checkPayment(orderId: String) { val merchantConfig = configManager.merchantConfig!! scope.launch(Dispatchers.IO) { - val response = api.checkOrder(merchantConfig.convert(), orderId) + val response = api.checkOrder(merchantConfig, orderId) response.handle(::onNetworkError, ::onPaymentChecked) } } @@ -106,7 +106,7 @@ class PaymentManager( if (!payment.paid) payment.orderId?.let { orderId -> Log.e(TAG, "Deleting cancelled and unpaid order $orderId") scope.launch(Dispatchers.IO) { - api.deleteOrder(merchantConfig.convert(), orderId) + api.deleteOrder(merchantConfig, orderId) } } } |