summaryrefslogtreecommitdiff
path: root/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-08-11 17:35:16 -0300
committerTorsten Grote <t@grobox.de>2020-08-11 17:35:16 -0300
commit3ab6f1569b307b155de6049ad7207e10bdf97567 (patch)
tree5fb80477e94ff8c54b7f91db7004d746dcb54151 /wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
parentd13be7c5c1be2492d38959a29e1b1c33df4938ff (diff)
downloadtaler-android-3ab6f1569b307b155de6049ad7207e10bdf97567.tar.gz
taler-android-3ab6f1569b307b155de6049ad7207e10bdf97567.tar.bz2
taler-android-3ab6f1569b307b155de6049ad7207e10bdf97567.zip
[wallet] upgrade wallet-core and adapt payment API
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt')
-rw-r--r--wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt7
1 files changed, 3 insertions, 4 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
index ce2b6f7..40664e3 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt
@@ -96,7 +96,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener {
is PayStatus.Prepared -> {
showLoading(false)
val fees = payStatus.amountEffective - payStatus.amountRaw
- showOrder(payStatus.contractTerms, fees)
+ showOrder(payStatus.contractTerms, payStatus.amountRaw, fees)
confirmButton.isEnabled = true
confirmButton.setOnClickListener {
model.showProgressBar.value = true
@@ -110,7 +110,7 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener {
}
is PayStatus.InsufficientBalance -> {
showLoading(false)
- showOrder(payStatus.contractTerms)
+ showOrder(payStatus.contractTerms, payStatus.amountRaw)
errorView.setText(R.string.payment_balance_insufficient)
errorView.fadeIn()
}
@@ -142,11 +142,10 @@ class PromptPaymentFragment : Fragment(), ProductImageClickListener {
}
}
- private fun showOrder(contractTerms: ContractTerms, totalFees: Amount? = null) {
+ private fun showOrder(contractTerms: ContractTerms, amount:Amount, totalFees: Amount? = null) {
orderView.text = contractTerms.summary
adapter.setItems(contractTerms.products)
if (contractTerms.products.size == 1) paymentManager.toggleDetailsShown()
- val amount = contractTerms.amount
totalView.text = amount.toString()
if (totalFees != null && !totalFees.isZero()) {
feeView.text = getString(R.string.payment_fee, totalFees)