diff options
Diffstat (limited to 'merchant-terminal/src/main')
24 files changed, 986 insertions, 250 deletions
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 29f5da4..4a46b27 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainActivity.kt @@ -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 5564447..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 @@ -45,9 +45,7 @@ class ConfigFetcherFragment : Fragment() { return ui.root } - @Deprecated("Deprecated in Java") - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { configManager.fetchConfig(configManager.config, false) configManager.configUpdateResult.observe(viewLifecycleOwner) { result -> when (result) { 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..d2167db 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,16 +49,34 @@ class ConfigFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { ui = FragmentMerchantConfigBinding.inflate(inflater, container, false) return ui.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + ui.configToggle.check(when (configManager.config) { + is Config.Old -> R.id.oldConfigButton + is Config.New -> R.id.newConfigButton + }) + + ui.oldConfigButton.setOnClickListener { + showOldConfig() + } + + ui.newConfigButton.setOnClickListener { + showNewConfig() + } + + /* + * Old configuration (JSON) + */ + ui.configUrlView.editText!!.setOnFocusChangeListener { _, hasFocus -> if (!hasFocus) checkForUrlCredentials() } - ui.okButton.setOnClickListener { + + ui.okOldButton.setOnClickListener { checkForUrlCredentials() val inputUrl = ui.configUrlView.editText!!.text val url = if (inputUrl.startsWith("http")) { @@ -66,26 +84,55 @@ class ConfigFragment : Fragment() { } else { "https://$inputUrl".also { ui.configUrlView.editText!!.setText(it) } } - ui.progressBar.visibility = VISIBLE - ui.okButton.visibility = INVISIBLE - val config = Config( + ui.progressBarOld.visibility = VISIBLE + ui.okOldButton.visibility = INVISIBLE + val config = Config.Old( configUrl = url, username = ui.usernameView.editText!!.text.toString(), 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() ui.passwordView.editText!!.text = null ui.forgetPasswordButton.visibility = GONE } + ui.configDocsView.movementMethod = LinkMovementMethod.getInstance() + + /* + * New configuration (Merchant) + */ + + ui.okNewButton.setOnClickListener { + val inputUrl = ui.merchantUrlView.editText!!.text + val url = if (inputUrl.startsWith("http")) { + inputUrl.toString() + } else { + "https://$inputUrl".also { ui.merchantUrlView.editText!!.setText(it) } + } + + ui.progressBarNew.visibility = VISIBLE + ui.okNewButton.visibility = INVISIBLE + val config = Config.New( + merchantUrl = url, + accessToken = ui.tokenView.editText!!.text.toString(), + ) + configManager.fetchConfig(config, true, ui.saveTokenCheckBox.isChecked) + configManager.configUpdateResult.observe(viewLifecycleOwner) { result -> + if (onConfigUpdate(result)) { + configManager.configUpdateResult.removeObservers(viewLifecycleOwner) + } + } + } + updateView(savedInstanceState == null) } @@ -93,28 +140,74 @@ 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() } } private fun updateView(isInitialization: Boolean = false) { - val config = configManager.config - ui.configUrlView.editText!!.setText( - if (isInitialization && config.configUrl.isBlank()) CONFIG_URL_DEMO - else config.configUrl - ) - ui.usernameView.editText!!.setText( - if (isInitialization && config.username.isBlank()) CONFIG_USERNAME_DEMO - else config.username - ) - ui.passwordView.editText!!.setText( - if (isInitialization && config.password.isBlank()) CONFIG_PASSWORD_DEMO - else config.password - ) - ui.forgetPasswordButton.visibility = if (config.hasPassword()) VISIBLE else GONE + if (isInitialization) { + ui.configUrlView.editText!!.setText(OLD_CONFIG_URL_DEMO) + ui.usernameView.editText!!.setText(OLD_CONFIG_USERNAME_DEMO) + ui.passwordView.editText!!.setText(OLD_CONFIG_PASSWORD_DEMO) + + ui.merchantUrlView.editText!!.setText(NEW_CONFIG_URL_DEMO) + ui.tokenView.editText!!.setText(NEW_CONFIG_ACCESS_TOKEN_DEMO) + + when (val config = configManager.config) { + is Config.Old -> { + if (config.configUrl.isNotBlank()) { + ui.configUrlView.editText!!.setText(config.configUrl) + } + + if (config.username.isNotBlank()) { + ui.usernameView.editText!!.setText(config.username) + } + + if (config.password.isNotBlank()) { + ui.passwordView.editText!!.setText(config.password) + } + } + + is Config.New -> { + if (config.merchantUrl.isNotBlank()) { + ui.merchantUrlView.editText!!.setText(config.merchantUrl) + } + + if (config.accessToken.isNotBlank()) { + ui.tokenView.editText!!.setText(config.accessToken) + } + } + } + } + + when (val config = configManager.config) { + is Config.Old -> { + ui.configToggle.check(R.id.oldConfigButton) + showOldConfig() + + ui.forgetPasswordButton.visibility = if (config.hasPassword()) VISIBLE else GONE + } + is Config.New -> { + ui.configToggle.check(R.id.newConfigButton) + showNewConfig() + + ui.tokenView.visibility = if (config.hasPassword()) VISIBLE else GONE + } + } + + } + + private fun showOldConfig() { + ui.oldConfigForm.visibility = VISIBLE + ui.newConfigForm.visibility = GONE + } + + private fun showNewConfig() { + ui.oldConfigForm.visibility = GONE + ui.newConfigForm.visibility = VISIBLE } private fun checkForUrlCredentials() { @@ -158,8 +251,10 @@ class ConfigFragment : Fragment() { } private fun onResultReceived() { - ui.progressBar.visibility = INVISIBLE - ui.okButton.visibility = VISIBLE + ui.progressBarOld.visibility = INVISIBLE + ui.okOldButton.visibility = VISIBLE + ui.progressBarNew.visibility = INVISIBLE + ui.okNewButton.visibility = VISIBLE } } 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 8986fc0..7531a4a 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 @@ -18,6 +18,7 @@ package net.taler.merchantpos.config import android.content.Context import android.content.Context.MODE_PRIVATE +import android.net.Uri import android.util.Base64.NO_WRAP import android.util.Base64.encodeToString import android.util.Log @@ -40,19 +41,35 @@ import net.taler.common.getIncompatibleStringOrNull 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" +private const val SETTINGS_CONFIG_VERSION = "configVersion" + +internal const val CONFIG_VERSION_OLD = 0 +internal const val CONFIG_VERSION_NEW = 1 + +// Old JSON config + basic auth config + private const val SETTINGS_CONFIG_URL = "configUrl" private const val SETTINGS_USERNAME = "username" private const val SETTINGS_PASSWORD = "password" -internal const val CONFIG_URL_DEMO = "https://docs.taler.net/_static/sample-pos-config.json" -internal const val CONFIG_USERNAME_DEMO = "" -internal const val CONFIG_PASSWORD_DEMO = "" +internal const val OLD_CONFIG_URL_DEMO = "https://docs.taler.net/_static/sample-pos-config.json" +internal const val OLD_CONFIG_USERNAME_DEMO = "" +internal const val OLD_CONFIG_PASSWORD_DEMO = "" + +// New merchant API + token config + +private const val SETTINGS_MERCHANT_URL = "merchantUrl" +private const val SETTINGS_ACCESS_TOKEN = "accessToken" -private val VERSION = Version(3, 0, 1) +internal const val NEW_CONFIG_URL_DEMO = "https://backend.demo.taler.net/instances/pos" +internal const val NEW_CONFIG_ACCESS_TOKEN_DEMO = "sandbox" + +private val VERSION = Version.parse(BuildConfig.BACKEND_API_VERSION)!! private val TAG = ConfigManager::class.java.simpleName @@ -73,14 +90,23 @@ class ConfigManager( private val prefs = context.getSharedPreferences(SETTINGS_NAME, MODE_PRIVATE) private val configurationReceivers = ArrayList<ConfigurationReceiver>() - var config = Config( - configUrl = prefs.getString(SETTINGS_CONFIG_URL, CONFIG_URL_DEMO)!!, - username = prefs.getString(SETTINGS_USERNAME, CONFIG_USERNAME_DEMO)!!, - password = prefs.getString(SETTINGS_PASSWORD, CONFIG_PASSWORD_DEMO)!! - ) + var config: Config = if (prefs.getInt(SETTINGS_CONFIG_VERSION, CONFIG_VERSION_NEW) == CONFIG_VERSION_NEW) { + Config.New( + merchantUrl = prefs.getString(SETTINGS_MERCHANT_URL, "")!!, + accessToken = prefs.getString(SETTINGS_ACCESS_TOKEN, NEW_CONFIG_ACCESS_TOKEN_DEMO)!!, + ) + } else { + Config.Old( + configUrl = prefs.getString(SETTINGS_CONFIG_URL, "")!!, + username = prefs.getString(SETTINGS_USERNAME, OLD_CONFIG_USERNAME_DEMO)!!, + password = prefs.getString(SETTINGS_PASSWORD, OLD_CONFIG_PASSWORD_DEMO)!!, + ) + } + @Volatile var merchantConfig: MerchantConfig? = null private set + @Volatile var currency: String? = null private set @@ -96,18 +122,44 @@ class ConfigManager( fun fetchConfig(config: Config, save: Boolean, savePassword: Boolean = false) { mConfigUpdateResult.value = null val configToSave = if (save) { - if (savePassword) config else config.copy(password = "") + if (savePassword) config else when (val c = config) { + is Config.Old -> c.copy(password = "") + is Config.New -> c.copy(accessToken = "") + } } else null scope.launch(Dispatchers.IO) { try { + val url = when(val c = config) { + is Config.Old -> c.configUrl + is Config.New -> Uri.parse(c.merchantUrl) + .buildUpon() + .appendPath("private/pos") + .build() + .toString() + } + // get PoS configuration - val posConfig: PosConfig = httpClient.get(config.configUrl) { - val credentials = "${config.username}:${config.password}" - val auth = ("Basic ${encodeToString(credentials.toByteArray(), NO_WRAP)}") - header(Authorization, auth) + val posConfig: PosConfig = httpClient.get(url) { + when (val c = config) { + is Config.Old -> { + val credentials = "${c.username}:${c.password}" + val auth = ("Basic ${encodeToString(credentials.toByteArray(), NO_WRAP)}") + header(Authorization, auth) + } + is Config.New -> { + val token = "secret-token:${c.accessToken}" + val auth = ("Bearer $token") + header(Authorization, auth) + } + } }.body() - val merchantConfig = posConfig.merchantConfig + + val merchantConfig = when (val c = config) { + is Config.Old -> posConfig.merchantConfig!! + is Config.New -> MerchantConfig(c.merchantUrl, "secret-token:${c.accessToken}") + } + // get config from merchant backend API api.getConfig(merchantConfig.baseUrl).handleSuspend(::onNetworkError) { onMerchantConfigReceived(configToSave, posConfig, merchantConfig, it) @@ -164,18 +216,29 @@ class ConfigManager( @UiThread fun forgetPassword() { - config = config.copy(password = "") + config = when (val c = config) { + is Config.Old -> c.copy(password = "") + is Config.New -> c.copy(accessToken = "") + } saveConfig(config) merchantConfig = null } @UiThread private fun saveConfig(config: Config) { - prefs.edit() - .putString(SETTINGS_CONFIG_URL, config.configUrl) - .putString(SETTINGS_USERNAME, config.username) - .putString(SETTINGS_PASSWORD, config.password) - .apply() + when (val c = config) { + is Config.Old -> prefs.edit() + .putInt(SETTINGS_CONFIG_VERSION, CONFIG_VERSION_OLD) + .putString(SETTINGS_CONFIG_URL, c.configUrl) + .putString(SETTINGS_USERNAME, c.username) + .putString(SETTINGS_PASSWORD, c.password) + .apply() + is Config.New -> prefs.edit() + .putInt(SETTINGS_CONFIG_VERSION, CONFIG_VERSION_NEW) + .putString(SETTINGS_MERCHANT_URL, c.merchantUrl) + .putString(SETTINGS_ACCESS_TOKEN, c.accessToken) + .apply() + } } private fun onNetworkError(msg: String) = scope.launch(Dispatchers.Main) { 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 1f1ab74..634d3a3 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 @@ -26,19 +26,38 @@ import net.taler.common.TalerUtils import net.taler.merchantlib.MerchantConfig import java.util.UUID -data class Config( - val configUrl: String, - val username: String, - val password: String -) { - fun isValid() = !configUrl.isBlank() - fun hasPassword() = !password.isBlank() +sealed class Config { + abstract fun isValid(): Boolean + abstract fun hasPassword(): Boolean + + /** + * JSON config URL + user/password + */ + data class Old( + val configUrl: String, + val username: String, + val password: String, + ): Config() { + override fun isValid() = configUrl.isNotBlank() + override fun hasPassword() = password.isNotBlank() + } + + /** + * Merchant URL + access token + */ + data class New( + val merchantUrl: String, + val accessToken: String, + ): Config() { + override fun isValid() = merchantUrl.isNotBlank() + override fun hasPassword() = accessToken.isNotBlank() + } } @Serializable data class PosConfig( @SerialName("config") - val merchantConfig: MerchantConfig, + val merchantConfig: MerchantConfig? = null , val categories: List<Category>, val products: List<ConfigProduct> ) 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 ad9af74..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,7 +19,7 @@ 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.merchantpos.config.Category @@ -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 2d4d32c..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 @@ -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 } 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 0de5939..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,14 @@ 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 } - @Deprecated("Deprecated in Java") - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) orderManager.currentOrderId.observe(viewLifecycleOwner) { orderId -> val liveOrder = orderManager.getOrder(orderId) onOrderSwitched(orderId, liveOrder) @@ -62,6 +61,9 @@ class OrderFragment : Fragment() { .replace(R.id.fragment1, OrderStateFragment()) .commit() } + ui.customButton.setOnClickListener { + CustomDialogFragment().show(childFragmentManager, CustomDialogFragment.TAG) + } } override fun onStart() { @@ -75,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) @@ -92,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/payment/PaymentManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/PaymentManager.kt index 02f66fa..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 @@ -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( @@ -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/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/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_merchant_config.xml b/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml index 0061a1c..f53ecf6 100644 --- a/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml +++ b/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml @@ -21,131 +21,279 @@ android:layout_height="match_parent" android:fillViewport="true"> - <androidx.constraintlayout.widget.ConstraintLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:orientation="vertical" tools:context=".config.ConfigFragment"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/configUrlView" - android:layout_width="0dp" + <com.google.android.material.button.MaterialButtonToggleGroup + android:id="@+id/configToggle" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp" - android:hint="@string/config_url" - app:boxBackgroundColor="@android:color/transparent" - app:boxBackgroundMode="outline" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - - <com.google.android.material.textfield.TextInputEditText - android:layout_width="match_parent" + app:singleSelection="true" + app:checkedButton="@id/newConfigButton"> + <Button + style="?attr/materialButtonOutlinedStyle" + android:id="@+id/oldConfigButton" + android:layout_width="0dp" android:layout_height="wrap_content" - android:inputType="textUri" /> - - </com.google.android.material.textfield.TextInputLayout> + android:layout_weight="1" + android:text="@string/config_old_label"/> + <Button + style="?attr/materialButtonOutlinedStyle" + android:id="@+id/newConfigButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/config_new_label" /> + </com.google.android.material.button.MaterialButtonToggleGroup> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/usernameView" - android:layout_width="0dp" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/oldConfigForm" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp" - android:hint="@string/config_username" - app:boxBackgroundColor="@android:color/transparent" - app:boxBackgroundMode="outline" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/configUrlView"> - - <com.google.android.material.textfield.TextInputEditText + android:visibility="gone" + tools:visibility="visible"> + + <androidx.cardview.widget.CardView + android:id="@+id/deprecationCard" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="text" /> + app:contentPadding="10dp" + android:layout_margin="16dp" + app:cardBackgroundColor="@color/red" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAlignment="center" + android:textColor="@android:color/white" + android:text="@string/config_old_deprecation" /> + </androidx.cardview.widget.CardView> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/configUrlView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_url" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/deprecationCard"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/passwordView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:hint="@string/config_password" - app:boxBackgroundColor="@android:color/transparent" - app:boxBackgroundMode="outline" - app:endIconMode="password_toggle" - app:layout_constraintEnd_toStartOf="@+id/forgetPasswordButton" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/usernameView"> - - <com.google.android.material.textfield.TextInputEditText - android:layout_width="match_parent" + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textUri" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/usernameView" + android:layout_width="0dp" android:layout_height="wrap_content" - android:inputType="textWebPassword" /> + android:layout_margin="16dp" + android:hint="@string/config_username" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/configUrlView"> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="text" /> - <Button - android:id="@+id/forgetPasswordButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/config_forget_password" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="@+id/passwordView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/passwordView" - tools:visibility="visible" /> - - <CheckBox - android:id="@+id/savePasswordCheckBox" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:checked="true" - android:text="@string/config_save_password" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/okButton" - app:layout_constraintHorizontal_chainStyle="spread_inside" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/passwordView" - app:layout_constraintVertical_bias="0.0" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/okButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/config_ok" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/savePasswordCheckBox" - app:layout_constraintTop_toBottomOf="@+id/passwordView" - app:layout_constraintVertical_bias="0.0" /> - - <ProgressBar - android:id="@+id/progressBar" - style="?android:attr/progressBarStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="@+id/okButton" - app:layout_constraintEnd_toEndOf="@+id/okButton" - app:layout_constraintStart_toStartOf="@+id/okButton" - app:layout_constraintTop_toTopOf="@+id/okButton" - tools:visibility="visible" /> - - <TextView - android:id="@+id/configDocsView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/config_docs" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/okButton" /> + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/passwordView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_password" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:endIconMode="password_toggle" + app:layout_constraintEnd_toStartOf="@+id/forgetPasswordButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/usernameView"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textWebPassword" /> + + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/forgetPasswordButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_forget_password" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/passwordView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/passwordView" + tools:visibility="visible" /> + + <CheckBox + android:id="@+id/savePasswordCheckBox" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:checked="true" + android:text="@string/config_save_password" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/okOldButton" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/passwordView" + app:layout_constraintVertical_bias="0.0" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/okOldButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_ok" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/savePasswordCheckBox" + app:layout_constraintTop_toBottomOf="@+id/passwordView" + app:layout_constraintVertical_bias="0.0" /> + + <ProgressBar + android:id="@+id/progressBarOld" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="@+id/okOldButton" + app:layout_constraintEnd_toEndOf="@+id/okOldButton" + app:layout_constraintStart_toStartOf="@+id/okOldButton" + app:layout_constraintTop_toTopOf="@+id/okOldButton" + tools:visibility="visible" /> + + <TextView + android:id="@+id/configDocsView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_docs" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/okOldButton" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/newConfigForm" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/merchantUrlView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_merchant_url" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textUri" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/tokenView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_token" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:endIconMode="password_toggle" + app:layout_constraintEnd_toStartOf="@+id/forgetTokenButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/merchantUrlView"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textWebPassword" /> + + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/forgetTokenButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_forget_password" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/tokenView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/tokenView" + tools:visibility="visible" /> + + <CheckBox + android:id="@+id/saveTokenCheckBox" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:checked="true" + android:text="@string/config_save_password" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/okNewButton" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tokenView" + app:layout_constraintVertical_bias="0.0" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/okNewButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_ok" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/saveTokenCheckBox" + app:layout_constraintTop_toBottomOf="@+id/tokenView" + app:layout_constraintVertical_bias="0.0" /> + + <ProgressBar + android:id="@+id/progressBarNew" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="@+id/okNewButton" + app:layout_constraintEnd_toEndOf="@+id/okNewButton" + app:layout_constraintStart_toStartOf="@+id/okNewButton" + app:layout_constraintTop_toTopOf="@+id/okNewButton" + tools:visibility="visible" /> + + </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.constraintlayout.widget.ConstraintLayout> + </LinearLayout> </ScrollView> 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 5936a52..7cad87c 100644 --- a/merchant-terminal/src/main/res/values-de/strings.xml +++ b/merchant-terminal/src/main/res/values-de/strings.xml @@ -9,8 +9,8 @@ <string name="order_total">Summe: %s</string> <string name="order_restart">Neustart</string> <string name="order_undo">Rückgängig machen</string> - <string name="order_previous">Zurück</string> - <string name="order_next">Vorwärts</string> + <string name="order_previous">Vorherige Bestellung</string> + <string name="order_next">Nächste Bestellung</string> <string name="order_complete">Abschließen</string> <string name="config_url">Konfigurations-URL</string> <string name="config_ok">Konfiguration abrufen</string> diff --git a/merchant-terminal/src/main/res/values-es/strings.xml b/merchant-terminal/src/main/res/values-es/strings.xml index 1ab7d92..4beb9fe 100644 --- a/merchant-terminal/src/main/res/values-es/strings.xml +++ b/merchant-terminal/src/main/res/values-es/strings.xml @@ -65,4 +65,8 @@ <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 44756ce..4d9636d 100644 --- a/merchant-terminal/src/main/res/values-fr/strings.xml +++ b/merchant-terminal/src/main/res/values-fr/strings.xml @@ -10,7 +10,7 @@ <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="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> diff --git a/merchant-terminal/src/main/res/values-ru/strings.xml b/merchant-terminal/src/main/res/values-ru/strings.xml new file mode 100644 index 0000000..4a92343 --- /dev/null +++ b/merchant-terminal/src/main/res/values-ru/strings.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="config_error_unknown">Ошибка: Неправильная конфигурация</string> + <string name="config_fetching">Получение конфигурации…</string> + <string name="config_forget_password">Не сохранять пароль</string> + <string name="payment_intro_nfc">Для совершения платежа покупателем, разрешите сканирование QR-кода или использование NFC.</string> + <string name="payment_intro">Пожалуйста позвольте клиенту отсканировать QR-код для платежа.</string> + <string name="payment_cancel">Отменить оплату</string> + <string name="payment_received">Платёж получен</string> + <string name="payment_back_button">Продолжить</string> + <string name="payment_process_label">Требуется оплата</string> + <string name="payment_canceled">Оплата отменена</string> + <string name="history_label">История платежей</string> + <string name="history_unpaid">Неоплачено</string> + <string name="history_refund">Возврат</string> + <string name="refund_reason">Причина возврата</string> + <string name="refund_abort">Отменить</string> + <string name="refund_complete">Получено</string> + <string name="refund_confirm">Подтвердить возврат</string> + <string name="app_name">GNU Taler Точка Продажи</string> + <string name="app_name_short">Терминал продавца</string> + <string name="project_name">GNU Taler</string> + <string name="menu_order">Заказы</string> + <string name="menu_history">История</string> + <string name="menu_settings">Настройки</string> + <string name="order_label_title">Заказ №%s</string> + <string name="order_total">Итого: %s</string> + <string name="order_restart">Перезапустить</string> + <string name="order_undo">Отменить</string> + <string name="order_previous">Предыдущая</string> + <string name="order_next">Следующая</string> + <string name="order_custom">Добавить свой продукт</string> + <string name="order_complete">Выполнено</string> + <string name="order_custom_product">Название своего продукта</string> + <string name="order_custom_product_default">Чаевые</string> + <string name="order_custom_add_button">Добавить</string> + <string name="config_label">Настройки Продавца</string> + <string name="config_url">URL конфигурации</string> + <string name="config_username">Имя пользователя</string> + <string name="config_password">Пароль</string> + <string name="config_ok">Получить конфигурацию</string> + <string name="config_auth_error">Ошибка: Неверное имя пользователя или пароль</string> + <string name="config_error_network">Ошибка: не удается подключиться к серверу конфигурации</string> + <string name="config_error_category">Ошибка: не удается найти категорию товара</string> + <string name="config_error_malformed">Ошибка: Битый JSON конфигурации</string> + <string name="config_error_currency">Ошибка: Продукт %1$s имеет валюту %2$s, но ожидалось %3$s</string> + <string name="config_error_product_category_id">Ошибка: Продукт %1$s ссылается на неизвестную категорию с ID %2$d</string> + <string name="config_error_product_zero">Ошибка: не удается найти товар</string> + <string name="config_save_password">Запомнить пароль</string> + <string name="config_changed">Изменено на нового продавца используя %s</string> + <string name="config_fetching_label">Получение конфигурации</string> + <string name="config_docs">Пожалуйста перейдите к <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">документации</a> по формату конфигурации</string> + <string name="payment_claimed">Ожидание пока клиент подтвердит платёж…</string> + <string name="payment_order_id">Чек №%s</string> + <string name="refund_amount">Сумма</string> + <string name="refund_error_max_amount">Сумма возврата превосходит сумму заказа %s</string> + <string name="refund_error_invalid_amount">Неправильное количество</string> + <string name="refund_error_zero">Сумма должна быть положительным числом</string> + <string name="refund_error_backend">Ошибка при обработке возврата</string> + <string name="refund_error_deadline">Возврат просрочен</string> + <string name="refund_error_already_refunded">Уже возвращено</string> + <string name="refund_intro_nfc">Пожалуйста дайте клиенту отсканировать QR-код или используйте NFC чтобы предложить возврат</string> + <string name="refund_intro">Пожалуйста дайте клиенту отсканировать QR-код чтобы предложить возврат</string> + <string name="refund_order_ref">Номер вашего заказа: %1$s +\n +\n%2$s</string> + <string name="error_payment">Ошибка: Никакого платежа не получено</string> + <string name="error_timeout">Платеж не был сделан за срок оплаты, пожалуйста попробуйте снова!</string> + <string name="error_cancelled">Платеж отменен</string> + <string name="error_history">Ошибка получения истории платежей</string> + <string name="toast_back_to_exit">Нажмите «назад» ещё раз чтобы выйти</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 index a6362ca..bdd4d40 100644 --- a/merchant-terminal/src/main/res/values-tr/strings.xml +++ b/merchant-terminal/src/main/res/values-tr/strings.xml @@ -65,4 +65,8 @@ <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..ff2cd44 100644 --- a/merchant-terminal/src/main/res/values/strings.xml +++ b/merchant-terminal/src/main/res/values/strings.xml @@ -14,12 +14,21 @@ <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_old_label">JSON file (old)</string> + <string name="config_new_label">Merchant (new)</string> + <string name="config_old_deprecation">This configuration method is deprecated, please use the new merchant API configuration.</string> <string name="config_url">Configuration URL</string> + <string name="config_merchant_url">Merchant URL</string> <string name="config_username">Username</string> <string name="config_password">Password</string> + <string name="config_token">Access token</string> <string name="config_ok">Fetch configuration</string> <string name="config_auth_error">Error: Invalid username or password</string> <string name="config_error_network">Error: Could not connect to configuration server</string> |