diff options
Diffstat (limited to 'merchant-terminal/src/main')
28 files changed, 556 insertions, 137 deletions
diff --git a/merchant-terminal/src/main/AndroidManifest.xml b/merchant-terminal/src/main/AndroidManifest.xml index 1518293..3b23dfc 100644 --- a/merchant-terminal/src/main/AndroidManifest.xml +++ b/merchant-terminal/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="net.taler.merchantpos"> + xmlns:tools="http://schemas.android.com/tools"> <uses-permission android:name="android.permission.NFC" /> @@ -39,6 +38,7 @@ tools:ignore="GoogleAppIndexingWarning"> <activity android:name=".MainActivity" + android:exported="true" android:label="@string/app_name" android:screenOrientation="landscape" android:theme="@style/AppTheme.NoActionBar" diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt index 47da74e..4a46b27 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt @@ -55,11 +55,11 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener { ui = ActivityMainBinding.inflate(layoutInflater) setContentView(ui.root) - model.paymentManager.payment.observe(this, { payment -> + model.paymentManager.payment.observe(this) { payment -> payment?.talerPayUri?.let { nfcManager.setTagString(it) } - }) + } val navHostFragment = supportFragmentManager.findFragmentById(R.id.navHostFragment) as NavHostFragment @@ -75,8 +75,8 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener { override fun onStart() { super.onStart() - if (!model.configManager.config.isValid() && nav.currentDestination?.id != R.id.nav_settings) { - nav.navigate(R.id.action_global_merchantSettings) + if (!model.configManager.config.isValid()) { + if (nav.currentDestination?.id != R.id.nav_settings) nav.navigate(R.id.action_global_merchantSettings) } else if (model.configManager.merchantConfig == null && nav.currentDestination?.id != R.id.configFetcher) { nav.navigate(R.id.action_global_configFetcher) } @@ -103,6 +103,7 @@ class MainActivity : AppCompatActivity(), OnNavigationItemSelectedListener { return true } + @Deprecated("Deprecated in Java") override fun onBackPressed() { val currentDestination = nav.currentDestination?.id if (ui.drawerLayout.isDrawerOpen(START)) { diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt index 87004d8..9e82a5a 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFetcherFragment.kt @@ -22,7 +22,6 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.lifecycle.Observer import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT import com.google.android.material.snackbar.Snackbar import net.taler.common.navigate @@ -40,24 +39,23 @@ class ConfigFetcherFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { + savedInstanceState: Bundle?, + ): View { ui = FragmentConfigFetcherBinding.inflate(inflater) return ui.root } - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { configManager.fetchConfig(configManager.config, false) - configManager.configUpdateResult.observe(viewLifecycleOwner, Observer { result -> + configManager.configUpdateResult.observe(viewLifecycleOwner) { result -> when (result) { - null -> return@Observer + null -> return@observe is ConfigUpdateResult.Error -> onNetworkError(result.msg) is ConfigUpdateResult.Success -> { navigate(actionConfigFetcherToOrder()) } } - }) + } } private fun onNetworkError(msg: String) { diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt index 3ee5148..9a5b7a7 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt @@ -49,7 +49,7 @@ class ConfigFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { ui = FragmentMerchantConfigBinding.inflate(inflater, container, false) return ui.root } @@ -74,11 +74,11 @@ class ConfigFragment : Fragment() { password = ui.passwordView.editText!!.text.toString() ) configManager.fetchConfig(config, true, ui.savePasswordCheckBox.isChecked) - configManager.configUpdateResult.observe(viewLifecycleOwner, { result -> + configManager.configUpdateResult.observe(viewLifecycleOwner) { result -> if (onConfigUpdate(result)) { configManager.configUpdateResult.removeObservers(viewLifecycleOwner) } - }) + } } ui.forgetPasswordButton.setOnClickListener { configManager.forgetPassword() @@ -93,8 +93,8 @@ class ConfigFragment : Fragment() { super.onStart() // focus password if this is the only empty field if (ui.passwordView.editText!!.text.isBlank() - && !ui.configUrlView.editText!!.text.isBlank() - && !ui.usernameView.editText!!.text.isBlank() + && ui.configUrlView.editText!!.text.isNotBlank() + && ui.usernameView.editText!!.text.isNotBlank() ) { ui.passwordView.requestFocus() } diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt index 165bb8e..70c7b18 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt @@ -26,7 +26,8 @@ import androidx.annotation.WorkerThread import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import io.ktor.client.HttpClient -import io.ktor.client.features.ClientRequestException +import io.ktor.client.call.body +import io.ktor.client.plugins.ClientRequestException import io.ktor.client.request.get import io.ktor.client.request.header import io.ktor.http.HttpHeaders.Authorization @@ -34,11 +35,12 @@ import io.ktor.http.HttpStatusCode.Companion.Unauthorized import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import net.taler.common.Version import net.taler.common.getIncompatibleStringOrNull -import net.taler.lib.common.Version import net.taler.merchantlib.ConfigResponse import net.taler.merchantlib.MerchantApi import net.taler.merchantlib.MerchantConfig +import net.taler.merchantpos.BuildConfig import net.taler.merchantpos.R private const val SETTINGS_NAME = "taler-merchant-terminal" @@ -51,7 +53,7 @@ internal const val CONFIG_URL_DEMO = "https://docs.taler.net/_static/sample-pos- internal const val CONFIG_USERNAME_DEMO = "" internal const val CONFIG_PASSWORD_DEMO = "" -private val VERSION = Version(1, 0, 0) +private val VERSION = Version.parse(BuildConfig.BACKEND_API_VERSION)!! private val TAG = ConfigManager::class.java.simpleName @@ -73,7 +75,7 @@ class ConfigManager( private val configurationReceivers = ArrayList<ConfigurationReceiver>() var config = Config( - configUrl = prefs.getString(SETTINGS_CONFIG_URL, CONFIG_URL_DEMO)!!, + configUrl = prefs.getString(SETTINGS_CONFIG_URL, "")!!, username = prefs.getString(SETTINGS_USERNAME, CONFIG_USERNAME_DEMO)!!, password = prefs.getString(SETTINGS_PASSWORD, CONFIG_PASSWORD_DEMO)!! ) @@ -105,7 +107,7 @@ class ConfigManager( val credentials = "${config.username}:${config.password}" val auth = ("Basic ${encodeToString(credentials.toByteArray(), NO_WRAP)}") header(Authorization, auth) - } + }.body() val merchantConfig = posConfig.merchantConfig // get config from merchant backend API api.getConfig(merchantConfig.baseUrl).handleSuspend(::onNetworkError) { @@ -136,6 +138,7 @@ class ConfigManager( val versionIncompatible = VERSION.getIncompatibleStringOrNull(context, configResponse.version) if (versionIncompatible != null) { + Log.e(TAG, "Versions incompatible $configResponse") mConfigUpdateResult.postValue(ConfigUpdateResult.Error(versionIncompatible)) return } diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt index 971f92c..556f05f 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt @@ -19,10 +19,10 @@ package net.taler.merchantpos.config import android.os.Build.VERSION.SDK_INT import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import net.taler.common.Amount import net.taler.common.ContractProduct import net.taler.common.Product import net.taler.common.TalerUtils -import net.taler.lib.common.Amount import net.taler.merchantlib.MerchantConfig import java.util.UUID @@ -31,8 +31,8 @@ data class Config( val username: String, val password: String ) { - fun isValid() = !configUrl.isBlank() - fun hasPassword() = !password.isBlank() + fun isValid() = configUrl.isNotBlank() + fun hasPassword() = password.isNotBlank() } @Serializable diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/CategoriesFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/CategoriesFragment.kt index 69e74ce..8c8b1d5 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/CategoriesFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/CategoriesFragment.kt @@ -55,10 +55,10 @@ class CategoriesFragment : Fragment(), CategorySelectionListener { layoutManager = LinearLayoutManager(requireContext()) } - orderManager.categories.observe(viewLifecycleOwner, { categories -> + orderManager.categories.observe(viewLifecycleOwner) { categories -> adapter.setItems(categories) ui.progressBar.visibility = INVISIBLE - }) + } } override fun onCategorySelected(category: Category) { diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/CustomDialogFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/CustomDialogFragment.kt new file mode 100644 index 0000000..45aaf06 --- /dev/null +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/CustomDialogFragment.kt @@ -0,0 +1,78 @@ +/* + * This file is part of GNU Taler + * (C) 2023 Taler Systems S.A. + * + * GNU Taler is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 3, or (at your option) any later version. + * + * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + * A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + */ + +package net.taler.merchantpos.order + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import android.widget.Toast.LENGTH_LONG +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.activityViewModels +import net.taler.common.Amount +import net.taler.common.AmountParserException +import net.taler.merchantpos.MainViewModel +import net.taler.merchantpos.R +import net.taler.merchantpos.config.ConfigProduct +import net.taler.merchantpos.databinding.FragmentCustomDialogBinding + +class CustomDialogFragment : DialogFragment() { + + companion object { + const val TAG = "CustomDialogFragment" + } + + private val viewModel: MainViewModel by activityViewModels() + + private lateinit var ui: FragmentCustomDialogBinding + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + ui = FragmentCustomDialogBinding.inflate(inflater, container, false) + return ui.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + val currency = viewModel.configManager.currency ?: error("No currency") + ui.currencyView.text = currency + ui.addButton.setOnClickListener { + val currentOrderId = + viewModel.orderManager.currentOrderId.value ?: return@setOnClickListener + val amount = try { + Amount.fromString(currency, ui.amountLayout.editText!!.text.toString()) + } catch (e: AmountParserException) { + Toast.makeText(requireContext(), R.string.refund_error_invalid_amount, LENGTH_LONG) + .show() + return@setOnClickListener + } + val product = ConfigProduct( + description = ui.productNameLayout.editText!!.text.toString(), + price = amount, + categories = listOf(Int.MIN_VALUE), + ) + viewModel.orderManager.addProduct(currentOrderId, product) + dismiss() + } + ui.cancelButton.setOnClickListener { + dismiss() + } + } +} diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt index f48c1db..c11b5c7 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt @@ -19,9 +19,9 @@ package net.taler.merchantpos.order import androidx.annotation.UiThread import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map +import net.taler.common.Amount import net.taler.common.CombinedLiveData -import net.taler.lib.common.Amount import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct import net.taler.merchantpos.order.RestartState.DISABLED @@ -52,7 +52,7 @@ internal class MutableLiveOrder( get() = productsByCategory.keys.map { it.id to it }.toMap() override val order: MutableLiveData<Order?> = MutableLiveData(Order(id, currency, availableCategories)) - override val orderTotal: LiveData<Amount> = Transformations.map(order) { it?.total } + override val orderTotal: LiveData<Amount> = order.map { it?.total ?: Amount.zero(currency) } override val restartState = MutableLiveData(DISABLED) private val selectedOrderLine = MutableLiveData<ConfigProduct?>() override val selectedProductKey: String? diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt index 0bea20c..a22ab0a 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt @@ -16,10 +16,10 @@ package net.taler.merchantpos.order +import net.taler.common.Amount import net.taler.common.ContractTerms +import net.taler.common.Timestamp import net.taler.common.now -import net.taler.lib.common.Amount -import net.taler.lib.common.Timestamp import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct import java.net.URLEncoder @@ -73,7 +73,7 @@ data class Order(val id: Int, val currency: String, val availableCategories: Map val categories = HashMap<Category, Int>() products.forEach { product -> val categoryId = product.categories[0] - val category = availableCategories.getValue(categoryId) + val category = availableCategories[categoryId] ?: return@forEach // custom products val oldQuantity = categories[category] ?: 0 categories[category] = oldQuantity + product.quantity } @@ -117,7 +117,7 @@ data class Order(val id: Int, val currency: String, val availableCategories: Map } fun toContractTerms(): ContractTerms { - val deadline = Timestamp(now() + HOURS.toMillis(1)) + val deadline = Timestamp.fromMillis(now() + HOURS.toMillis(1)) return ContractTerms( summary = summary, summaryI18n = summaryI18n, diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt index 25a1874..cdd2b67 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt @@ -44,15 +44,15 @@ class OrderFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { + savedInstanceState: Bundle?, + ): View { ui = FragmentOrderBinding.inflate(inflater, container, false) return ui.root } - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) - orderManager.currentOrderId.observe(viewLifecycleOwner, { orderId -> + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + orderManager.currentOrderId.observe(viewLifecycleOwner) { orderId -> val liveOrder = orderManager.getOrder(orderId) onOrderSwitched(orderId, liveOrder) // add a new OrderStateFragment for each order @@ -60,7 +60,10 @@ class OrderFragment : Fragment() { childFragmentManager.beginTransaction() .replace(R.id.fragment1, OrderStateFragment()) .commit() - }) + } + ui.customButton.setOnClickListener { + CustomDialogFragment().show(childFragmentManager, CustomDialogFragment.TAG) + } } override fun onStart() { @@ -74,13 +77,13 @@ class OrderFragment : Fragment() { private fun onOrderSwitched(orderId: Int, liveOrder: LiveOrder) { // order title - liveOrder.order.observe(viewLifecycleOwner, { order -> + liveOrder.order.observe(viewLifecycleOwner) { order -> if (order == null) return@observe activity?.title = getString(R.string.order_label_title, order.title) - }) + } // restart button ui.restartButton.setOnClickListener { liveOrder.restartOrUndo() } - liveOrder.restartState.observe(viewLifecycleOwner, { state -> + liveOrder.restartState.observe(viewLifecycleOwner) { state -> beginDelayedTransition(view as ViewGroup) if (state == UNDO) { ui.restartButton.setText(R.string.order_undo) @@ -91,19 +94,19 @@ class OrderFragment : Fragment() { ui.restartButton.isEnabled = state == ENABLED ui.completeButton.isEnabled = state == ENABLED } - }) + } // -1 and +1 buttons - liveOrder.modifyOrderAllowed.observe(viewLifecycleOwner, { allowed -> + liveOrder.modifyOrderAllowed.observe(viewLifecycleOwner) { allowed -> ui.minusButton.isEnabled = allowed ui.plusButton.isEnabled = allowed - }) + } ui.minusButton.setOnClickListener { liveOrder.decreaseSelectedOrderLine() } ui.plusButton.setOnClickListener { liveOrder.increaseSelectedOrderLine() } // previous and next button ui.prevButton.isEnabled = orderManager.hasPreviousOrder(orderId) - orderManager.hasNextOrder(orderId).observe(viewLifecycleOwner, { hasNextOrder -> + orderManager.hasNextOrder(orderId).observe(viewLifecycleOwner) { hasNextOrder -> ui.nextButton.isEnabled = hasNextOrder - }) + } ui.prevButton.setOnClickListener { orderManager.previousOrder() } ui.nextButton.setOnClickListener { orderManager.nextOrder() } // complete button diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt index 6c5ecdf..2efdf4c 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderManager.kt @@ -21,7 +21,7 @@ import android.util.Log import androidx.annotation.UiThread import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations.map +import androidx.lifecycle.map import net.taler.merchantpos.R import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct @@ -32,7 +32,7 @@ import net.taler.merchantpos.order.RestartState.ENABLED class OrderManager(private val context: Context) : ConfigurationReceiver { companion object { - val TAG = OrderManager::class.java.simpleName + val TAG: String = OrderManager::class.java.simpleName } private lateinit var currency: String @@ -150,7 +150,7 @@ class OrderManager(private val context: Context) : ConfigurationReceiver { return currentOrderId != orders.keys.first() } - fun hasNextOrder(currentOrderId: Int) = map(order(currentOrderId).restartState) { state -> + fun hasNextOrder(currentOrderId: Int) = order(currentOrderId).restartState.map { state -> state == ENABLED || currentOrderId != orders.keys.last() } diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt index d86f504..c4a5228 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderStateFragment.kt @@ -26,6 +26,7 @@ import androidx.recyclerview.selection.SelectionPredicates import androidx.recyclerview.selection.SelectionTracker import androidx.recyclerview.selection.StorageStrategy import androidx.recyclerview.widget.LinearLayoutManager +import net.taler.common.Amount import net.taler.common.fadeIn import net.taler.common.fadeOut import net.taler.merchantpos.MainViewModel @@ -82,11 +83,11 @@ class OrderStateFragment : Fragment() { liveOrder.selectOrderLine(item) } }) - liveOrder.order.observe(viewLifecycleOwner, { order -> + liveOrder.order.observe(viewLifecycleOwner) { order -> if (order == null) return@observe onOrderChanged(order, tracker) - }) - liveOrder.orderTotal.observe(viewLifecycleOwner, { orderTotal -> + } + liveOrder.orderTotal.observe(viewLifecycleOwner) { orderTotal: Amount -> if (orderTotal.isZero()) { ui.totalView.fadeOut() ui.totalView.text = null @@ -94,7 +95,7 @@ class OrderStateFragment : Fragment() { ui.totalView.text = getString(R.string.order_total, orderTotal) ui.totalView.fadeIn() } - }) + } } override fun onSaveInstanceState(outState: Bundle) { 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 98161db..efcb158 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 @@ -26,8 +26,8 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.isActive import kotlinx.coroutines.launch +import net.taler.common.RelativeTime import net.taler.common.assertUiThread -import net.taler.lib.common.Duration import net.taler.merchantlib.CheckPaymentResponse import net.taler.merchantlib.MerchantApi import net.taler.merchantlib.PostOrderRequest @@ -36,10 +36,9 @@ import net.taler.merchantpos.R import net.taler.merchantpos.config.ConfigManager import net.taler.merchantpos.order.Order import java.util.concurrent.TimeUnit.HOURS -import java.util.concurrent.TimeUnit.MINUTES import java.util.concurrent.TimeUnit.SECONDS -private val TIMEOUT = MINUTES.toMillis(2) +private const val TIMEOUT = Long.MAX_VALUE private val CHECK_INTERVAL = SECONDS.toMillis(1) class PaymentManager( @@ -74,7 +73,7 @@ class PaymentManager( mPayment.value = Payment(order, order.summary, configManager.currency!!) val request = PostOrderRequest( contractTerms = order.toContractTerms(), - refundDelay = Duration(HOURS.toMillis(1)) + refundDelay = RelativeTime.fromMillis(HOURS.toMillis(1)) ) api.postOrder(merchantConfig, request).handle(::onNetworkError) { orderResponse -> assertUiThread() @@ -85,7 +84,10 @@ class PaymentManager( private fun checkPayment(orderId: String) = scope.launch { val merchantConfig = configManager.merchantConfig!! - api.checkOrder(merchantConfig, orderId).handle(::onNetworkError) { response -> + api.checkOrder(merchantConfig, orderId).handle({ error -> + // don't call onNetworkError() to not cancel payment, just keep trying + Log.d(TAG, "Network error: $error") + }) { response -> assertUiThread() if (!isActive) return@handle // don't continue if job was cancelled val currentValue = requireNotNull(mPayment.value) diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt index 5b95dea..c2635c7 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentSuccessFragment.kt @@ -31,11 +31,12 @@ class PaymentSuccessFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { ui = FragmentPaymentSuccessBinding.inflate(inflater, container, false) return ui.root } + @Deprecated("Deprecated in Java") override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) ui.paymentButton.setOnClickListener { 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 201c9cf..443ca91 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 @@ -55,9 +55,9 @@ class ProcessPaymentFragment : Fragment() { val introRes = if (hasNfc(requireContext())) R.string.payment_intro_nfc else R.string.payment_intro ui.payIntroView.setText(introRes) - paymentManager.payment.observe(viewLifecycleOwner, { payment -> + paymentManager.payment.observe(viewLifecycleOwner) { payment -> onPaymentStateChanged(payment) - }) + } ui.cancelPaymentButton.setOnClickListener { onPaymentCancel() } diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt index bb98dbd..03c786f 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundFragment.kt @@ -24,12 +24,12 @@ import androidx.annotation.StringRes import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.navigation.fragment.findNavController +import net.taler.common.Amount +import net.taler.common.AmountParserException import net.taler.common.fadeIn import net.taler.common.fadeOut import net.taler.common.navigate import net.taler.common.showError -import net.taler.lib.common.Amount -import net.taler.lib.common.AmountParserException import net.taler.merchantlib.OrderHistoryEntry import net.taler.merchantpos.MainViewModel import net.taler.merchantpos.R diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundManager.kt index 8b3efca..849dbaa 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/refund/RefundManager.kt @@ -21,8 +21,8 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch +import net.taler.common.Amount import net.taler.common.assertUiThread -import net.taler.lib.common.Amount import net.taler.merchantlib.MerchantApi import net.taler.merchantlib.OrderHistoryEntry import net.taler.merchantlib.RefundRequest diff --git a/merchant-terminal/src/main/res/drawable/ic_dialpad.xml b/merchant-terminal/src/main/res/drawable/ic_dialpad.xml new file mode 100644 index 0000000..33ba1d9 --- /dev/null +++ b/merchant-terminal/src/main/res/drawable/ic_dialpad.xml @@ -0,0 +1,25 @@ +<!-- + ~ This file is part of GNU Taler + ~ (C) 2023 Taler Systems S.A. + ~ + ~ GNU Taler is free software; you can redistribute it and/or modify it under the + ~ terms of the GNU General Public License as published by the Free Software + ~ Foundation; either version 3, or (at your option) any later version. + ~ + ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along with + ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,19c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" /> +</vector> diff --git a/merchant-terminal/src/main/res/layout/fragment_custom_dialog.xml b/merchant-terminal/src/main/res/layout/fragment_custom_dialog.xml new file mode 100644 index 0000000..8da50ad --- /dev/null +++ b/merchant-terminal/src/main/res/layout/fragment_custom_dialog.xml @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2023 Taler Systems S.A. + ~ + ~ GNU Taler is free software; you can redistribute it and/or modify it under the + ~ terms of the GNU General Public License as published by the Free Software + ~ Foundation; either version 3, or (at your option) any later version. + ~ + ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along with + ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + --> + +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/titleView" + style="@style/TextAppearance.Material3.TitleMedium" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:text="@string/order_custom" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/productNameLayout" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/titleView"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/order_custom_product" + android:inputType="textShortMessage" + android:singleLine="true" + android:text="@string/order_custom_product_default" /> + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/amountLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="8dp" + android:minEms="5" + app:layout_constraintEnd_toStartOf="@+id/currencyView" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/productNameLayout"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/refund_amount" + android:inputType="numberDecimal"> + + <requestFocus /> + </com.google.android.material.textfield.TextInputEditText> + </com.google.android.material.textfield.TextInputLayout> + + <TextView + android:id="@+id/currencyView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + app:layout_constraintBottom_toBottomOf="@+id/amountLayout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/amountLayout" + app:layout_constraintTop_toTopOf="@+id/amountLayout" + tools:text="TESTKUDOS" /> + + <Button + android:id="@+id/addButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" + android:text="@string/order_custom_add_button" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/amountLayout" + app:layout_constraintVertical_bias="0.0" /> + + <Button + android:id="@+id/cancelButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:text="@android:string/cancel" + app:layout_constraintEnd_toStartOf="@+id/addButton" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/amountLayout" /> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/merchant-terminal/src/main/res/layout/fragment_order.xml b/merchant-terminal/src/main/res/layout/fragment_order.xml index dc49db1..dd2edc5 100644 --- a/merchant-terminal/src/main/res/layout/fragment_order.xml +++ b/merchant-terminal/src/main/res/layout/fragment_order.xml @@ -25,7 +25,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toStartOf="@+id/guideline1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintStart_toStartOf="@+id/guideline1" app:layout_constraintTop_toTopOf="parent" @@ -63,75 +63,102 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline2" app:layout_constraintTop_toTopOf="parent" tools:layout="@layout/fragment_categories" /> - <Button - android:id="@+id/restartButton" - android:layout_width="wrap_content" + <HorizontalScrollView + android:id="@+id/buttonBar" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_restart" + android:scrollbars="horizontal" + android:fadeScrollbars="false" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintEnd_toStartOf="@id/completeButton"> - <Button - android:id="@+id/plusButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:minWidth="48dp" - android:text="+1" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/minusButton" - tools:ignore="HardcodedText" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> - <Button - android:id="@+id/minusButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:minWidth="48dp" - android:text="-1" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/restartButton" - tools:ignore="HardcodedText" /> + <Button + android:id="@+id/restartButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_restart" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - <Button - android:id="@+id/prevButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_previous" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/plusButton" /> + <Button + android:id="@+id/plusButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:minWidth="48dp" + android:text="+1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/minusButton" + tools:ignore="HardcodedText" /> - <Button - android:id="@+id/nextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_next" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/prevButton" /> + <Button + android:id="@+id/minusButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:minWidth="48dp" + android:text="-1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/restartButton" + tools:ignore="HardcodedText" /> + + <Button + android:id="@+id/prevButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_previous" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/plusButton" /> + + <Button + android:id="@+id/nextButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_next" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/prevButton" /> + + <ImageButton + android:id="@+id/customButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="8dp" + android:backgroundTint="?colorPrimary" + app:srcCompat="@drawable/ic_dialpad" + android:contentDescription="@string/order_custom" /> + + </LinearLayout> + + </HorizontalScrollView> <Button android:id="@+id/completeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="32dp" android:layout_marginEnd="8dp" - android:backgroundTint="@color/button_bottom" + android:backgroundTint="@color/green" android:text="@string/order_complete" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/nextButton" /> + app:layout_constraintHorizontal_bias="1.0" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/merchant-terminal/src/main/res/values-de/strings.xml b/merchant-terminal/src/main/res/values-de/strings.xml index 6d7730a..5936a52 100644 --- a/merchant-terminal/src/main/res/values-de/strings.xml +++ b/merchant-terminal/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name_short">Kassenterminal</string> + <string name="app_name_short">Merchant Terminal</string> <string name="project_name">GNU Taler</string> <string name="menu_order">Bestellungen</string> <string name="menu_history">Verlauf</string> @@ -18,37 +18,39 @@ <string name="config_error_network">Fehler: Es konnte keine Verbindung zum Konfigurationsserver hergestellt werden</string> <string name="config_error_category">Fehler: Keine gültige Produktkategorie gefunden</string> <string name="config_error_currency">Fehler: Produkt %1$s hat die Währung %2$s, aber %3$s wird erwartet</string> - <string name="config_error_product_category_id">Fehler: Produkt %1$s verweist auf unbekannte Kategorie ID %2$d</string> + <string name="config_error_product_category_id">Fehler: Produkt %1$s verweist auf unbekannte Kategorie %2$d</string> <string name="config_error_product_zero">Fehler: Keine gültigen Produkte gefunden</string> <string name="config_fetching">Konfiguration wird abgerufen…</string> <string name="config_save_password">Passwort merken</string> <string name="config_forget_password">Vergessen</string> <string name="config_fetching_label">Konfiguration wird abgerufen</string> - <string name="payment_intro_nfc">Bitte zum Bezahlen den QR-Code scannen oder per NFC empfangen</string> - <string name="payment_intro">Bitte scannen Sie den QR-Code um zu bezahlen</string> + <string name="payment_intro_nfc">Bitte zum Bezahlen den QR-Code scannen oder per NFC empfangen.</string> + <string name="payment_intro">Bitte lassen Sie zum Bezahlen den QR-Code scannen.</string> <string name="payment_cancel">Bezahlvorgang abbrechen</string> <string name="payment_received">Zahlung erhalten</string> <string name="payment_back_button">Weiter</string> <string name="payment_process_label">Kundenzahlung erforderlich</string> <string name="payment_canceled">Die Zahlung wurde abgebrochen</string> - <string name="history_label">Zahlungsverlauf</string> + <string name="history_label">Bisher getätigte Zahlungen</string> <string name="refund_amount">Betrag</string> <string name="refund_reason">Rückerstattungsgrund</string> <string name="refund_abort">Abbrechen</string> - <string name="refund_confirm">Rückerstattung geben</string> + <string name="refund_confirm">Rückerstattung bestätigen</string> <string name="refund_error_zero">Der Betrag muss positiv sein</string> <string name="refund_error_deadline">Die Rückerstattungsfrist ist abgelaufen</string> - <string name="refund_intro">Bitte scannen Sie den QR-Code, um eine Rückerstattung zu erhalten</string> - <string name="refund_order_ref">Bestellreferenz: %1$s\n\n%2$s</string> - <string name="toast_back_to_exit">Klicken Sie zum Beenden erneut auf «zurück»</string> - <string name="app_name">Taler Merchant Kassenterminal</string> + <string name="refund_intro">Zur Rückerstattung lassen Sie bitte den QR-Code einscannen</string> + <string name="refund_order_ref">Referenznummer des Kaufs: %1$s +\n +\n%2$s</string> + <string name="toast_back_to_exit">Klicken Sie zum Beenden erneut auf «Zurück»</string> + <string name="app_name">GNU Taler Point-of-Sale</string> <string name="config_label">Händlereinstellungen</string> <string name="config_username">Benutzername</string> <string name="config_password">Passwort</string> - <string name="config_error_malformed">Fehler: Die JSON Konfiguration ist fehlerhaft</string> + <string name="config_error_malformed">Fehler: Die JSON-Konfiguration ist fehlerhaft</string> <string name="config_error_unknown">Fehler: Ungültige Konfiguration</string> <string name="config_docs">Informationen zum Konfigurationsformat finden Sie in <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">der Dokumentation</a>.</string> - <string name="refund_error_max_amount">Größer als die Zahlung der Bestellung von %s</string> + <string name="refund_error_max_amount">Größer als Bestellmenge von %s</string> <string name="refund_error_backend">Fehler bei der Verarbeitung der Rückerstattung</string> <string name="refund_intro_nfc">Bitte scannen Sie den QR-Code oder verwenden Sie NFC, um eine Rückerstattung zu erhalten</string> <string name="config_changed">Neuer Händler für %s aktiviert</string> @@ -57,9 +59,10 @@ <string name="refund_error_invalid_amount">Ungültiger Betrag</string> <string name="refund_error_already_refunded">Bereits erstattet</string> <string name="payment_order_id">Beleg #%s</string> - <string name="history_unpaid">Unbezahlt</string> - <string name="error_cancelled">Zahlvorgang abgebrochen</string> + <string name="history_unpaid">Noch nicht bezahlt</string> + <string name="error_cancelled">Bezahlvorgang abgebrochen</string> <string name="error_payment">Fehler: Keine Zahlung erhalten</string> - <string name="error_timeout">Keine Zahlung innerhalb des Zahlungszeitraums, bitte versuchen Sie es erneut!</string> + <string name="error_timeout">Keine Zahlung innerhalb des vorgegebenen Zeitraums erhalten, bitte versuchen Sie es erneut!</string> <string name="error_history">Fehler beim Abrufen des Bestellverlaufs</string> + <string name="payment_claimed">Warten auf Zahlungsbestätigung durch Kunden…</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-es/strings.xml b/merchant-terminal/src/main/res/values-es/strings.xml index 7fcd835..4beb9fe 100644 --- a/merchant-terminal/src/main/res/values-es/strings.xml +++ b/merchant-terminal/src/main/res/values-es/strings.xml @@ -64,4 +64,9 @@ <string name="config_docs">Por favor refiérete <a href=\"https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats\">a la documentación</a> para la configuración del formato.<a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">the documentation</a> for the configuration format.</string> <string name="refund_error_max_amount">Mayor que la cantidad del pedido de %s</string> <string name="refund_intro_nfc">Por favor permite al cliente escanear el código QR o usar NFC para ofrecer reembolso</string> + <string name="payment_claimed">A la espera de que el cliente confirme el pago…</string> + <string name="order_custom_product">Nombre de producto personalizado</string> + <string name="order_custom_product_default">Consejo</string> + <string name="order_custom_add_button">Añadir</string> + <string name="order_custom">Añadir producto personalizado</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-fi/strings.xml b/merchant-terminal/src/main/res/values-fi/strings.xml new file mode 100644 index 0000000..ff7c02e --- /dev/null +++ b/merchant-terminal/src/main/res/values-fi/strings.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">GNU Taler -myyntipiste</string> + <string name="app_name_short">Kauppiasterminaali</string> + <string name="project_name">GNU Taler</string> + <string name="menu_order">Tilaukset</string> + <string name="menu_history">Historia</string> + <string name="order_label_title">Tilaus #%s</string> + <string name="order_total">Yhteensä: #%s</string> + <string name="order_undo">Kumoa</string> + <string name="order_previous">Edellinen</string> + <string name="order_custom">Lisää mukautettu tuote</string> + <string name="order_complete">Valmis</string> + <string name="order_custom_product">Mukautettu tuotteen nimi</string> + <string name="order_custom_product_default">Tip</string> + <string name="config_label">Kauppiaan asetukset</string> + <string name="config_url">Määrityksen URL -osoite</string> + <string name="config_username">Käyttäjänimi</string> + <string name="config_password">Salasana</string> + <string name="config_ok">Nouda määritykset</string> + <string name="config_error_network">Virhe: Ei voitu muodostaa yhteyttä määrityspalvelimeen</string> + <string name="config_error_category">Virhe: kelvollista tuoteluokkaa ei löytynyt</string> + <string name="config_error_malformed">Virhe: Määrityksen JSON on virheellinen</string> + <string name="config_error_currency">Virhe: Tuotteen %1$s valuutta on %2$s, mutta %3$s odotetaan</string> + <string name="config_error_product_category_id">Virhe: Tuote %1$s viittaa tuntemattomaan luokkatunnukseen %2$d</string> + <string name="config_error_product_zero">Virhe: kelvollisia tuotteita ei löytynyt</string> + <string name="config_error_unknown">Virhe: Virheellinen määritys</string> + <string name="config_fetching">Haetaan määritystä…</string> + <string name="config_save_password">Muista salasana</string> + <string name="config_forget_password">Unohda</string> + <string name="config_changed">Vaihdettu uudeksi kauppiaaksi käyttämällä %s</string> + <string name="payment_intro_nfc">Anna asiakkaan skannata QR-koodi tai käyttää NFC:tä maksamiseen.</string> + <string name="payment_intro">Anna asiakkaan skannata QR-koodi maksaaksesi.</string> + <string name="payment_claimed">Odotetaan asiakkaan maksun vahvistamista…</string> + <string name="payment_cancel">Peruuta maksu</string> + <string name="payment_received">Maksu vastaanotettu</string> + <string name="payment_back_button">Jatka</string> + <string name="payment_order_id">Kuitti #%s</string> + <string name="payment_process_label">Maksua vaaditaan</string> + <string name="payment_canceled">Maksu peruutettu</string> + <string name="history_label">Maksu historia</string> + <string name="history_refund">Palautus</string> + <string name="history_unpaid">Maksamaton</string> + <string name="refund_amount">Summa</string> + <string name="refund_reason">Palautuksen syy</string> + <string name="refund_abort">Keskeytä</string> + <string name="refund_complete">Vastaanotettu</string> + <string name="refund_confirm">Hyväksy hyvitys</string> + <string name="refund_error_max_amount">Suurempi kuin tilausmäärä %s</string> + <string name="refund_error_invalid_amount">Virheellinen summa</string> + <string name="refund_error_zero">On oltava positiivinen määrä</string> + <string name="refund_error_backend">Hyvityksen käsittelyssä tapahtui virhe</string> + <string name="refund_error_already_refunded">Palautettu jo</string> + <string name="refund_intro_nfc">Anna asiakkaan skannata QR-koodi tai käyttää NFC:tä hyvityksen tarjoamiseksi</string> + <string name="refund_intro">Anna asiakkaan skannata QR-koodi hyvityksen tarjoamiseksi</string> + <string name="refund_order_ref">Ostoviite: %1$s +\n +\n%2$s</string> + <string name="error_payment">Virhe: Maksua ei vastaanotettu</string> + <string name="error_timeout">Maksua ei ole suoritettu maksuajan kuluessa, yritä uudelleen!</string> + <string name="error_cancelled">Maksu peruutettu</string> + <string name="error_history">Virhe noudettaessa tilaushistoriaa</string> + <string name="toast_back_to_exit">Napsauta «takaisin» uudelleen poistuaksesi</string> + <string name="menu_settings">Asetukset</string> + <string name="order_restart">Uudelleenkäynnistys</string> + <string name="order_next">Seuraava</string> + <string name="order_custom_add_button">Lisää</string> + <string name="config_auth_error">Virhe: Virheellinen käyttäjätunnus tai salasana</string> + <string name="config_fetching_label">Haetaan määritystä</string> + <string name="config_docs">Katso määritysmuodon <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">dokumentaatiosta</a>.</string> + <string name="refund_error_deadline">Palautusaika on umpeutunut</string> +</resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-fr/strings.xml b/merchant-terminal/src/main/res/values-fr/strings.xml index 10c7af5..4d9636d 100644 --- a/merchant-terminal/src/main/res/values-fr/strings.xml +++ b/merchant-terminal/src/main/res/values-fr/strings.xml @@ -10,8 +10,8 @@ <string name="config_docs">Veuillez vous référer à <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">la documentation</a> pour le format de configuration.</string> <string name="refund_confirm">Approuver le remboursement</string> <string name="refund_error_backend">Erreur lors du traitement du remboursement</string> - <string name="menu_settings">Réglages</string> - <string name="app_name">Point de vente GNU Taler</string> + <string name="menu_settings">Paramètres</string> + <string name="app_name">GNU Taler Point de vente</string> <string name="app_name_short">Terminal marchand</string> <string name="menu_order">Commandes</string> <string name="order_label_title">Commande numéro %s</string> @@ -59,4 +59,10 @@ \n \n%2$s</string> <string name="toast_back_to_exit">Cliquez à nouveau sur «retour» pour quitter</string> + <string name="error_payment">Erreur : Aucun paiement reçu</string> + <string name="history_unpaid">Non payé</string> + <string name="payment_claimed">En attendant que le client confirme le paiement…</string> + <string name="error_cancelled">Paiement annulé</string> + <string name="error_history">Erreur d\'accès à l\'historique des commandes</string> + <string name="error_timeout">Aucun paiement n\'a été effectué pendant la période de paiement, veuillez réessayer !</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-sv/strings.xml b/merchant-terminal/src/main/res/values-sv/strings.xml index b46c560..a6a7c17 100644 --- a/merchant-terminal/src/main/res/values-sv/strings.xml +++ b/merchant-terminal/src/main/res/values-sv/strings.xml @@ -64,4 +64,5 @@ <string name="refund_order_ref">Inköpsreferens: %1$s \n \n%2$s</string> + <string name="payment_claimed">Väntar på att kunden ska bekräfta betalningen…</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-tr/strings.xml b/merchant-terminal/src/main/res/values-tr/strings.xml new file mode 100644 index 0000000..bdd4d40 --- /dev/null +++ b/merchant-terminal/src/main/res/values-tr/strings.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="config_username">Kullanıcı adı</string> + <string name="config_password">Şifre</string> + <string name="refund_amount">Miktar</string> + <string name="refund_reason">Geri ödeme nedeni</string> + <string name="refund_abort">Durdur</string> + <string name="refund_complete">Alındı</string> + <string name="refund_error_max_amount">%s sipariş miktarından büyük</string> + <string name="refund_error_invalid_amount">Geçersiz miktar</string> + <string name="refund_error_zero">Pozitif miktar olması gerekiyor</string> + <string name="refund_error_backend">Geri ödeme işlenirken hata oluştu</string> + <string name="refund_error_already_refunded">Çoktan geri ödendi</string> + <string name="refund_intro">Geri ödeme sunmak için lütfen müşterinin QR Kodunu taramasına izin verin</string> + <string name="refund_order_ref">Satın alma referansı %1$s +\n +\n%2$s</string> + <string name="error_payment">Hata: Ödeme alınmadı</string> + <string name="error_timeout">Ödeme süresi içinde ödeme yapılmadı, lütfen tekrar deneyin!</string> + <string name="error_cancelled">Ödeme iptal edildi</string> + <string name="error_history">Sipariş geçmişi getirilirken hata oluştu</string> + <string name="config_forget_password">Unut</string> + <string name="config_auth_error">Hata! Geçersiz kullanıcı adı veya şifre</string> + <string name="config_error_malformed">Hata: JSON konfigürasyonu hatalı oluşturulmuş</string> + <string name="config_error_unknown">Hata: Geçersiz kurulum</string> + <string name="history_refund">Geri ödeme</string> + <string name="refund_confirm">Geri ödemeyi onayla</string> + <string name="refund_error_deadline">Geri ödeme süresi geçti</string> + <string name="refund_intro_nfc">Geri ödeme sunmak için lütfen müşterinin QR Kodunu taramasına veya NFC\'yi kullanmasına izin verin</string> + <string name="toast_back_to_exit">Çıkmak için tekrar «geri» yi tıklayın</string> + <string name="config_changed">%s kullanılarak yeni satıcı olarak değiştirildi</string> + <string name="config_fetching_label">Kurulum getiriliyor</string> + <string name="config_docs">Lütfen kurulum formatı için <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">belgelere</a> bakın.</string> + <string name="payment_intro_nfc">Lütfen müşterinin QR Kodunu taramasına veya ödeme yapmak için NFC\'yi kullanmasına izin verin.</string> + <string name="payment_intro">Lütfen müşterinin ödeme yapmak için QR Kodunu taramasına izin verin.</string> + <string name="payment_claimed">Müşterinin ödemeyi onaylaması bekleniyor…</string> + <string name="payment_cancel">Ödemeyi iptal et</string> + <string name="payment_received">Ödeme alındı</string> + <string name="payment_back_button">Devam et</string> + <string name="payment_order_id">Makbuz #%s</string> + <string name="payment_process_label">Ödeme gerekli</string> + <string name="payment_canceled">Ödeme iptal edildi</string> + <string name="history_label">Ödeme geçmişi</string> + <string name="history_unpaid">Ödenmemiş</string> + <string name="app_name">GNU Taler Satış Noktası</string> + <string name="app_name_short">Ticari Terminal</string> + <string name="project_name">GNU Taler</string> + <string name="menu_order">Siparişler</string> + <string name="menu_settings">Ayarlar</string> + <string name="order_label_title">Sipariş #%s</string> + <string name="order_total">Toplam: %s</string> + <string name="order_restart">Tekrar başlat</string> + <string name="order_undo">Geri al</string> + <string name="order_previous">Önceki</string> + <string name="order_next">Sonraki</string> + <string name="order_complete">Tamam</string> + <string name="config_label">Satıcı ayarları</string> + <string name="config_url">Konfigürasyon URL\'i</string> + <string name="config_ok">Konfigürasyonu getir</string> + <string name="config_error_network">Hata: Konfigürasyon sunucusuna bağlanılamadı</string> + <string name="config_error_category">Hata: Geçerli ürün kategorisi bulunamadı</string> + <string name="config_error_currency">"Hata: %1$s ürününün para birimi %2$s ama %3$s bekleniyor"</string> + <string name="config_error_product_category_id">Hata: Ürün %1$s, bilinmeyen kategori kimliğine referans veriyor %2$d</string> + <string name="config_error_product_zero">Hata: Geçerli ürün bulunamadı</string> + <string name="config_fetching">Kurulum getiriliyor…</string> + <string name="config_save_password">Şifreyi hatırla</string> + <string name="menu_history">Geçmiş</string> + <string name="order_custom">Özel ürün ekle</string> + <string name="order_custom_product">Özel ürünün ismi</string> + <string name="order_custom_product_default">Bahşiş</string> + <string name="order_custom_add_button">Ekle</string> +</resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values/strings.xml b/merchant-terminal/src/main/res/values/strings.xml index f06866d..3cd2043 100644 --- a/merchant-terminal/src/main/res/values/strings.xml +++ b/merchant-terminal/src/main/res/values/strings.xml @@ -14,7 +14,11 @@ <string name="order_undo">Undo</string> <string name="order_previous">Prev</string> <string name="order_next">Next</string> + <string name="order_custom">Add custom product</string> <string name="order_complete">Complete</string> + <string name="order_custom_product">Custom product name</string> + <string name="order_custom_product_default">Tip</string> + <string name="order_custom_add_button">Add</string> <string name="config_label">Merchant settings</string> <string name="config_url">Configuration URL</string> |