[pos] add button for adding custom products

5 files changed, 86 insertions, 17 deletions

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..bf14aae
--- /dev/null
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/CustomDialogFragment.kt
@@ -0,0 +1,67 @@
+/*
+ * 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 androidx.fragment.app.DialogFragment
+import androidx.fragment.app.activityViewModels
+import net.taler.common.Amount
+import net.taler.merchantpos.MainViewModel
+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 product = ConfigProduct(
+                description = ui.productNameLayout.editText!!.text.toString(),
+                price = Amount.fromString(currency, ui.amountLayout.editText!!.text.toString()),
+                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/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..96d2e83 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
@@ -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