From 84b6ac449170dfdf7a6bebb0dd2b64e68a9b3077 Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Wed, 22 May 2024 15:01:30 -0400
Subject: [PATCH 1/8] Add string

---
 WooCommerce/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index 1435dc12767..3e8d87f7832 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -579,6 +579,7 @@
     <string name="cash_payments_cash_received">Cash received</string>
     <string name="cash_payments_change_due">Change due</string>
     <string name="cash_payments_record_transaction_details">Record transaction details in order note</string>
+    <string name="cash_payments_mark_order_as_complete">Mark Order as Complete</string>
 
     <!--
          Custom Amounts

From ea1b9ea4479a36e3996298d4acc0592b00a6fa80 Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Wed, 22 May 2024 15:02:03 -0400
Subject: [PATCH 2/8] Mark order as complete

---
 .../ChangeDueCalculatorScreen.kt              | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index 6546d2adba4..66c603b5404 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
@@ -106,6 +107,12 @@ fun ChangeDueCalculatorScreen(
                         RecordTransactionDetailsNote(
                             modifier = Modifier.padding(top = 16.dp, bottom = 16.dp, start = 16.dp).fillMaxWidth()
                         )
+
+                        val onCompleteOrderClick = Unit
+                        MarkOrderAsCompleteButton(
+                            onClick = { onCompleteOrderClick },
+                            modifier = Modifier.padding(top = 16.dp)
+                        )
                     }
 
                     is ChangeDueCalculatorViewModel.UiState.Error -> {
@@ -141,6 +148,18 @@ fun RecordTransactionDetailsNote(
     }
 }
 
+@Composable
+fun MarkOrderAsCompleteButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
+    Button(
+        onClick = onClick,
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(start = 16.dp, top = 8.dp, end = 16.dp)
+    ) {
+        Text(text = stringResource(R.string.cash_payments_mark_order_as_complete))
+    }
+}
+
 @Composable
 private fun getTitleText(uiState: ChangeDueCalculatorViewModel.UiState): String {
     return when (uiState) {

From 81c807a2d9974cf412bd3229708762d53b54ef39 Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Wed, 22 May 2024 16:48:34 -0400
Subject: [PATCH 3/8] Mark order as complete button

---
 .../ChangeDueCalculatorFragment.kt                  |  4 +++-
 .../ChangeDueCalculatorScreen.kt                    | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt
index 5bd63c6270c..ce34bd34c82 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt
@@ -21,7 +21,9 @@ class ChangeDueCalculatorFragment : BaseFragment() {
         return ComposeView(requireContext()).apply {
             setContent {
                 val uiState by viewModel.uiState.collectAsState()
-                ChangeDueCalculatorScreen(uiState = uiState, onNavigateUp = { findNavController().navigateUp() })
+                ChangeDueCalculatorScreen(uiState = uiState, onNavigateUp = {
+                    findNavController().navigateUp()
+                }, onCompleteOrderClick = {})
             }
         }
     }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index 66c603b5404..ff7dfe66bd9 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -37,7 +37,8 @@ import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
 @Composable
 fun ChangeDueCalculatorScreen(
     uiState: ChangeDueCalculatorViewModel.UiState,
-    onNavigateUp: () -> Unit
+    onNavigateUp: () -> Unit,
+    onCompleteOrderClick: () -> Unit
 ) {
     WooThemeWithBackground {
         Scaffold(
@@ -105,12 +106,13 @@ fun ChangeDueCalculatorScreen(
                         )
 
                         RecordTransactionDetailsNote(
-                            modifier = Modifier.padding(top = 16.dp, bottom = 16.dp, start = 16.dp).fillMaxWidth()
+                            modifier = Modifier
+                                .padding(top = 16.dp, bottom = 16.dp, start = 16.dp)
+                                .fillMaxWidth()
                         )
 
-                        val onCompleteOrderClick = Unit
                         MarkOrderAsCompleteButton(
-                            onClick = { onCompleteOrderClick },
+                            onClick = onCompleteOrderClick,
                             modifier = Modifier.padding(top = 16.dp)
                         )
                     }
@@ -180,6 +182,7 @@ fun ChangeDueCalculatorScreenSuccessPreview() {
             amountDue = "$666.00",
             change = 0.00.toBigDecimal()
         ),
-        onNavigateUp = {}
+        onNavigateUp = {},
+        onCompleteOrderClick = {}
     )
 }

From cc675bc3567a2e1631a8c8590b86efaa8e9d1a58 Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Wed, 22 May 2024 17:31:08 -0400
Subject: [PATCH 4/8] Request keyboard

---
 .../ChangeDueCalculatorScreen.kt              | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index ff7dfe66bd9..1cd660b43b5 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -21,8 +21,12 @@ import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -40,6 +44,12 @@ fun ChangeDueCalculatorScreen(
     onNavigateUp: () -> Unit,
     onCompleteOrderClick: () -> Unit
 ) {
+    val focusRequester = remember { FocusRequester() }
+
+    LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+    }
+
     WooThemeWithBackground {
         Scaffold(
             topBar = {
@@ -67,12 +77,9 @@ fun ChangeDueCalculatorScreen(
             ) {
                 when (uiState) {
                     is ChangeDueCalculatorViewModel.UiState.Loading -> Text(
-                        stringResource(
-                            R.string.loading,
-                        ),
+                        stringResource(R.string.loading),
                         style = MaterialTheme.typography.h6
                     )
-
                     is ChangeDueCalculatorViewModel.UiState.Success -> {
                         OutlinedTextField(
                             value = uiState.amountDue,
@@ -81,7 +88,8 @@ fun ChangeDueCalculatorScreen(
                             },
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .padding(top = 8.dp, bottom = 8.dp, start = 16.dp),
+                                .padding(top = 8.dp, bottom = 8.dp, start = 16.dp)
+                                .focusRequester(focusRequester),
                             label = { Text(stringResource(R.string.cash_payments_cash_received)) },
                             textStyle = LocalTextStyle.current.copy(
                                 fontWeight = FontWeight.Bold,
@@ -116,7 +124,6 @@ fun ChangeDueCalculatorScreen(
                             modifier = Modifier.padding(top = 16.dp)
                         )
                     }
-
                     is ChangeDueCalculatorViewModel.UiState.Error -> {
                         Text(text = stringResource(R.string.error_generic), style = MaterialTheme.typography.h6)
                     }
@@ -169,7 +176,6 @@ private fun getTitleText(uiState: ChangeDueCalculatorViewModel.UiState): String
             R.string.cash_payments_take_payment_title,
             uiState.amountDue
         )
-
         else -> stringResource(id = R.string.cash_payments_take_payment_title)
     }
 }
@@ -183,6 +189,6 @@ fun ChangeDueCalculatorScreenSuccessPreview() {
             change = 0.00.toBigDecimal()
         ),
         onNavigateUp = {},
-        onCompleteOrderClick = {}
+        onCompleteOrderClick = { /* Your complete order logic here */ }
     )
 }

From 1dd1a7e7afeacb24c8c66647a59365f589aa1cc0 Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Wed, 22 May 2024 17:36:34 -0400
Subject: [PATCH 5/8] It doesn't crash

---
 .../changeduecalculator/ChangeDueCalculatorScreen.kt         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index 1cd660b43b5..3e36fe38932 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -46,10 +45,6 @@ fun ChangeDueCalculatorScreen(
 ) {
     val focusRequester = remember { FocusRequester() }
 
-    LaunchedEffect(Unit) {
-        focusRequester.requestFocus()
-    }
-
     WooThemeWithBackground {
         Scaffold(
             topBar = {

From 6af62c637c00d4c7f0add183eb60077400a5d56f Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Fri, 24 May 2024 15:23:02 -0400
Subject: [PATCH 6/8] Restore the button

---
 .../ChangeDueCalculatorFragment.kt                   |  3 ++-
 .../changeduecalculator/ChangeDueCalculatorScreen.kt | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt
index eb0bb25c325..869d351fe61 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorFragment.kt
@@ -36,7 +36,8 @@ class ChangeDueCalculatorFragment : BaseFragment() {
                 val uiState by viewModel.uiState.collectAsState()
                 ChangeDueCalculatorScreen(
                     uiState = uiState,
-                    onNavigateUp = { viewModel.onBackPressed() }
+                    onNavigateUp = { viewModel.onBackPressed() },
+                    onCompleteOrderClick = {}
                 )
             }
         }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index 02efb03ce24..f8618812945 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
@@ -38,7 +39,8 @@ import java.math.BigDecimal
 @Composable
 fun ChangeDueCalculatorScreen(
     uiState: ChangeDueCalculatorViewModel.UiState,
-    onNavigateUp: () -> Unit
+    onNavigateUp: () -> Unit,
+    onCompleteOrderClick: () -> Unit
 ) {
     WooThemeWithBackground {
         Scaffold(
@@ -121,6 +123,11 @@ fun ChangeDueCalculatorScreen(
                                 .padding(top = 16.dp, bottom = 16.dp, start = 16.dp)
                                 .fillMaxWidth()
                         )
+
+                        MarkOrderAsCompleteButton(
+                            onClick = onCompleteOrderClick,
+                            modifier = Modifier.padding(top = 16.dp)
+                        )
                     }
 
                     is ChangeDueCalculatorViewModel.UiState.Error -> {
@@ -191,6 +198,7 @@ fun ChangeDueCalculatorScreenSuccessPreview() {
             amountDue = BigDecimal("666.00"),
             change = BigDecimal("0.00")
         ),
-        onNavigateUp = {}
+        onNavigateUp = {},
+        onCompleteOrderClick = {}
     )
 }

From 448e7149fb4121ff5923c4e80ebad778ead4cfd8 Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Fri, 24 May 2024 15:23:28 -0400
Subject: [PATCH 7/8] Detekt

---
 .../payments/changeduecalculator/ChangeDueCalculatorScreen.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index f8618812945..3c1ad066fd1 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -144,9 +144,9 @@ fun ChangeDueCalculatorScreen(
 
 @Composable
 fun RecordTransactionDetailsNote(
+    modifier: Modifier = Modifier,
     checked: Boolean = false,
     onCheckedChange: (Boolean) -> Unit = {},
-    modifier: Modifier = Modifier
 ) {
     Row(
         modifier = modifier.fillMaxWidth(),

From f99dc1dc76e238769d9189e9eb7d6d6e9b84179d Mon Sep 17 00:00:00 2001
From: Rooney <backwardstruck@users.noreply.github.com>
Date: Fri, 24 May 2024 17:11:03 -0400
Subject: [PATCH 8/8] Pop the keyboard

---
 .../ChangeDueCalculatorScreen.kt              | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
index 3c1ad066fd1..adc0ea85a5c 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/changeduecalculator/ChangeDueCalculatorScreen.kt
@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.payments.changeduecalculator
 
 import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -21,8 +22,14 @@ import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -42,6 +49,8 @@ fun ChangeDueCalculatorScreen(
     onNavigateUp: () -> Unit,
     onCompleteOrderClick: () -> Unit
 ) {
+    val context = LocalContext.current
+
     WooThemeWithBackground {
         Scaffold(
             topBar = {
@@ -75,6 +84,17 @@ fun ChangeDueCalculatorScreen(
 
                     is ChangeDueCalculatorViewModel.UiState.Success -> {
                         val hintString = stringResource(R.string.cash_payments_cash_received)
+                        var view: WCMaterialOutlinedCurrencyEditTextView? by remember { mutableStateOf(null) }
+
+                        LaunchedEffect(view) {
+                            view?.let {
+                                it.requestFocus()
+                                context.getSystemService(
+                                    InputMethodManager::class.java
+                                ).showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
+                            }
+                        }
+
                         AndroidView(
                             factory = { ctx ->
                                 WCMaterialOutlinedCurrencyEditTextView(ctx).apply {
@@ -89,6 +109,7 @@ fun ChangeDueCalculatorScreen(
                                     supportsNegativeValues = false
                                     hint = hintString
                                     setValueIfDifferent(uiState.amountDue)
+                                    view = this
                                 }
                             },
                             modifier = Modifier