From 3ab6f1569b307b155de6049ad7207e10bdf97567 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 11 Aug 2020 17:35:16 -0300 Subject: [wallet] upgrade wallet-core and adapt payment API --- .../main/java/net/taler/wallet/payment/PromptPaymentFragment.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/payment/PromptPaymentFragment.kt') 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) -- cgit v1.2.3