diff options
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 | 3 | ||||
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt | 12 |
2 files changed, 7 insertions, 8 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 7f15816..4cfb069 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 @@ -30,7 +30,6 @@ import com.android.volley.VolleyError import com.fasterxml.jackson.databind.ObjectMapper import net.taler.merchantpos.config.ConfigManager import net.taler.merchantpos.config.MerchantRequest -import net.taler.merchantpos.order.ContractProduct import net.taler.merchantpos.order.Order import org.json.JSONArray import org.json.JSONObject @@ -103,7 +102,7 @@ class PaymentManager( } private fun Order.getProductsJson(): JSONArray { - val contractProducts = products.map { ContractProduct(it) } + val contractProducts = products.map { it.toContractProduct() } val productsStr = mapper.writeValueAsString(contractProducts) return JSONArray(productsStr) } 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 24f67f1..1d61894 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 @@ -27,13 +27,13 @@ import androidx.lifecycle.Observer import androidx.navigation.fragment.findNavController import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG import kotlinx.android.synthetic.main.fragment_process_payment.* +import net.taler.common.NfcManager.Companion.hasNfc +import net.taler.common.QrCodeManager.makeQrCode +import net.taler.common.fadeIn +import net.taler.common.fadeOut +import net.taler.common.navigate import net.taler.merchantpos.MainViewModel -import net.taler.merchantpos.NfcManager.Companion.hasNfc -import net.taler.merchantpos.QrCodeManager.makeQrCode import net.taler.merchantpos.R -import net.taler.merchantpos.fadeIn -import net.taler.merchantpos.fadeOut -import net.taler.merchantpos.navigate import net.taler.merchantpos.payment.ProcessPaymentFragmentDirections.Companion.actionProcessPaymentToPaymentSuccess import net.taler.merchantpos.topSnackbar @@ -69,7 +69,7 @@ class ProcessPaymentFragment : Fragment() { } if (payment.paid) { model.orderManager.onOrderPaid(payment.order.id) - actionProcessPaymentToPaymentSuccess().navigate(findNavController()) + navigate(actionProcessPaymentToPaymentSuccess()) return } payIntroView.fadeIn() |