[Woo POS] Start card reader connection flow and adapt to return result of connection to pos

WooCommerce/src/main/AndroidManifest.xml

@@ -163,6 +163,9 @@
         <activity
             android:name="com.woocommerce.android.ui.woopos.root.WooPosActivity"
             android:exported="false" />
+        <activity
+            android:name="com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity"
+            android:theme="@style/Theme.Woo.Transparent" />
 
         <!-- Stats today app widget -->
         <meta-data

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt

@@ -381,6 +381,7 @@ class AnalyticsTracker private constructor(
         const val VALUE_ORDER_CREATION_PAYMENTS_FLOW = "creation"
         const val VALUE_SCAN_TO_PAY_PAYMENT_FLOW = "scan_to_pay"
         const val VALUE_TTP_TRY_PAYMENT_FLOW = "tap_to_pay_try_a_payment"
+        const val VALUE_WOO_POS_PAYMENTS_FLOW = "woo_pos"
 
         const val KEY_JITM = "jitm"
         const val KEY_JITM_COUNT = "count"

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/connect/CardReaderConnectDialogFragment.kt

@@ -41,6 +41,7 @@ import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectE
 import com.woocommerce.android.ui.payments.cardreader.connect.adapter.MultipleCardReadersFoundAdapter
 import com.woocommerce.android.ui.payments.cardreader.update.CardReaderUpdateDialogFragment
 import com.woocommerce.android.ui.payments.cardreader.update.CardReaderUpdateViewModel.UpdateResult
+import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity
 import com.woocommerce.android.util.ChromeCustomTabUtils
 import com.woocommerce.android.util.LocationUtils
 import com.woocommerce.android.util.UiHelpers
@@ -244,6 +245,12 @@ class CardReaderConnectDialogFragment : PaymentsBaseDialogFragment(R.layout.card
                         result = event.data as Boolean,
                     )
                 }
+                is CardReaderConnectEvent.PopBackStackForWooPOS -> {
+                    parentFragmentManager.setFragmentResult(
+                        WooPosCardReaderActivity.WOO_POS_CARD_CONNECTION_REQUEST_KEY,
+                        Bundle(),
+                    )
+                }
                 is CardReaderConnectEvent.ShowToast ->
                     ToastUtils.showToast(requireContext(), getString(event.message))
                 is CardReaderConnectEvent.ShowToastString ->

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/connect/CardReaderConnectEvent.kt

@@ -46,4 +46,6 @@ sealed class CardReaderConnectEvent : MultiLiveEvent.Event() {
     data class OpenWPComWebView(val url: String) : CardReaderConnectEvent()
 
     data class OpenGenericWebView(val url: String) : CardReaderConnectEvent()
+
+    data object PopBackStackForWooPOS : CardReaderConnectEvent()
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/connect/CardReaderConnectViewModel.kt

@@ -35,6 +35,7 @@ import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectE
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.OpenLocationSettings
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.OpenPermissionsSettings
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.OpenWPComWebView
+import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.PopBackStackForWooPOS
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.RequestBluetoothRuntimePermissions
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.RequestEnableBluetooth
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.RequestLocationPermissions
@@ -57,6 +58,7 @@ import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectV
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectViewState.MissingMerchantAddressError
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectViewState.MultipleExternalReadersFoundState
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectViewState.ScanningFailedState
+import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingChecker
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderType.BUILT_IN
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderType.EXTERNAL
@@ -281,6 +283,7 @@ class CardReaderConnectViewModel @Inject constructor(
                         Unit
                     }
                 }
+
                 CardReaderStatus.Connecting -> {
                     connectionStarted = true
                     viewState.value = provideConnectingState()
@@ -309,13 +312,16 @@ class CardReaderConnectViewModel @Inject constructor(
                     viewState.value = provideScanningState()
                 }
             }
+
             is ReadersFound -> {
                 tracker.trackReadersDiscovered(discoveryEvent.list.size)
                 onReadersFound(discoveryEvent)
             }
+
             Succeeded -> {
                 // noop
             }
+
             is Failed -> {
                 tracker.trackReaderDiscoveryFailed(discoveryEvent.msg)
                 WooLog.e(WooLog.T.CARD_READER, "Scanning failed: ${discoveryEvent.msg}")
@@ -330,6 +336,7 @@ class CardReaderConnectViewModel @Inject constructor(
                 triggerEvent(ShowToast(R.string.card_reader_detail_connected_update_failed))
                 exitFlow(connected = false)
             }
+
             CardReaderUpdateViewModel.UpdateResult.SUCCESS -> {
                 // noop
             }
@@ -400,6 +407,7 @@ class CardReaderConnectViewModel @Inject constructor(
                 ::onCancelClicked,
                 ::onLearnMoreClicked
             )
+
             EXTERNAL -> ExternalReaderScanningState(
                 ::onCancelClicked,
                 ::onLearnMoreClicked
@@ -424,6 +432,7 @@ class CardReaderConnectViewModel @Inject constructor(
                         tracker.trackFetchingLocationSucceeded()
                         cardReaderManager.startConnectionToReader(cardReader, result.locationId)
                     }
+
                     is CardReaderLocationRepository.LocationIdFetchingResult.Error -> {
                         handleLocationFetchingError(result)
                     }
@@ -453,10 +462,12 @@ class CardReaderConnectViewModel @Inject constructor(
                     }
                 )
             }
+
             is CardReaderLocationRepository.LocationIdFetchingResult.Error.InvalidPostalCode -> {
                 trackLocationFailureFetching("Invalid Postal Code")
                 viewState.value = InvalidMerchantAddressPostCodeError(::restartFlow)
             }
+
             is CardReaderLocationRepository.LocationIdFetchingResult.Error.Other -> {
                 trackLocationFailureFetching(result.error)
                 onReaderConnectionFailed()
@@ -510,7 +521,13 @@ class CardReaderConnectViewModel @Inject constructor(
 
     private fun exitFlow(connected: Boolean) {
         if (!connected) {
-            triggerEvent(ExitWithResult(false))
+            when (arguments.cardReaderFlowParam) {
+                is CardReaderFlowParam.CardReadersHub,
+                is CardReaderFlowParam.PaymentOrRefund.Payment,
+                is CardReaderFlowParam.PaymentOrRefund.Refund -> triggerEvent(ExitWithResult(false))
+
+                CardReaderFlowParam.WooPosConnection -> triggerEvent(PopBackStackForWooPOS)
+            }
         } else {
             triggerEvent(ShowCardReaderTutorial(arguments.cardReaderFlowParam, arguments.cardReaderType))
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/onboarding/CardReaderOnboardingFragment.kt

@@ -413,6 +413,9 @@ sealed class CardReaderFlowParam : Parcelable {
         }
     }
 
+    @Parcelize
+    data object WooPosConnection : CardReaderFlowParam()
+
     sealed class PaymentOrRefund : CardReaderFlowParam() {
         abstract val orderId: Long
 
@@ -426,6 +429,7 @@ sealed class CardReaderFlowParam : Parcelable {
                 ORDER,
                 ORDER_CREATION,
                 TRY_TAP_TO_PAY,
+                WOO_POS,
             }
         }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/onboarding/CardReaderOnboardingViewModel.kt

@@ -438,6 +438,9 @@ class CardReaderOnboardingViewModel @Inject constructor(
                     CardReaderOnboardingEvent.ContinueToConnection(params, requireNotNull(arguments.cardReaderType))
                 )
             }
+            is CardReaderFlowParam.WooPosConnection -> {
+                error("Unsupported flow param: $params")
+            }
         }
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/statuschecker/CardReaderStatusCheckerViewModel.kt

@@ -69,6 +69,7 @@ class CardReaderStatusCheckerViewModel
                     handleOnboardingStatus(param)
                 }
             }
+            is CardReaderFlowParam.WooPosConnection -> handleOnboardingStatus(param)
         }
     }
 
@@ -87,6 +88,7 @@ class CardReaderStatusCheckerViewModel
                     triggerEvent(StatusCheckerEvent.NavigateToWelcome(param, arguments.cardReaderType))
                 }
             }
+
             else -> triggerEvent(
                 StatusCheckerEvent.NavigateToOnboarding(
                     CardReaderOnboardingParams.Failed(param, state),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/tutorial/CardReaderTutorialDialogFragment.kt

@@ -15,6 +15,7 @@ import com.woocommerce.android.extensions.navigateSafely
 import com.woocommerce.android.ui.payments.PaymentsBaseDialogFragment
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderType.BUILT_IN
+import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -58,7 +59,13 @@ class CardReaderTutorialDialogFragment : PaymentsBaseDialogFragment(R.layout.car
 
     private fun navigateNext() {
         when (val param = args.cardReaderFlowParam) {
-            is CardReaderFlowParam.CardReadersHub -> findNavController().popBackStack()
+            is CardReaderFlowParam.CardReadersHub,
+            is CardReaderFlowParam.WooPosConnection -> {
+                parentFragmentManager.setFragmentResult(
+                    WooPosCardReaderActivity.WOO_POS_CARD_CONNECTION_REQUEST_KEY,
+                    Bundle(),
+                )
+            }
             is CardReaderFlowParam.PaymentOrRefund -> {
                 val action = CardReaderTutorialDialogFragmentDirections
                     .actionCardReaderTutorialDialogFragmentToCardReaderPaymentDialogFragment(param, args.cardReaderType)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/hub/PaymentsHubViewModel.kt

@@ -507,6 +507,7 @@ class PaymentsHubViewModel @Inject constructor(
             is PaymentOrRefund -> {
                 // no-op
             }
+            is CardReaderFlowParam.WooPosConnection -> error("Unsupported card reader flow param $params")
         }
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/methodselection/SelectPaymentMethodEvent.kt

@@ -36,6 +36,8 @@ data class NavigateToOrderDetails(
     val orderId: Long
 ) : MultiLiveEvent.Event()
 
+object ReturnResultToWooPos : MultiLiveEvent.Event()
+
 data class NavigateToTapToPaySummary(
     val order: Order
 ) : MultiLiveEvent.Event()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/methodselection/SelectPaymentMethodFragment.kt

@@ -33,6 +33,8 @@ import com.woocommerce.android.ui.payments.methodselection.SelectPaymentMethodVi
 import com.woocommerce.android.ui.payments.methodselection.SelectPaymentMethodViewState.Success
 import com.woocommerce.android.ui.payments.scantopay.ScanToPayDialogFragment
 import com.woocommerce.android.ui.payments.taptopay.summary.TapToPaySummaryFragment
+import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity
+import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderPaymentResult
 import com.woocommerce.android.util.ChromeCustomTabUtils
 import com.woocommerce.android.util.UiHelpers
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowDialog
@@ -58,10 +60,14 @@ class SelectPaymentMethodFragment : BaseFragment(R.layout.fragment_select_paymen
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
+    ): View? {
         _binding = FragmentSelectPaymentMethodBinding.inflate(inflater, container, false)
-        setupToolbar()
-        return binding.root
+        return if (viewModel.displayUi) {
+            setupToolbar()
+            binding.root
+        } else {
+            View(requireContext())
+        }
     }
 
     private fun setupToolbar() {
@@ -273,6 +279,18 @@ class SelectPaymentMethodFragment : BaseFragment(R.layout.fragment_select_paymen
                             )
                     )
                 }
+
+                is ReturnResultToWooPos -> {
+                    parentFragmentManager.setFragmentResult(
+                        WooPosCardReaderActivity.WOO_POS_CARD_PAYMENT_REQUEST_KEY,
+                        Bundle().apply {
+                            putParcelable(
+                                WooPosCardReaderActivity.WOO_POS_CARD_PAYMENT_RESULT_KEY,
+                                WooPosCardReaderPaymentResult.Success,
+                            )
+                        }
+                    )
+                }
             }
         }
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/methodselection/SelectPaymentMethodViewModel.kt

@@ -27,7 +27,9 @@ import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowP
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Payment.PaymentType.ORDER_CREATION
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Payment.PaymentType.SIMPLE
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Payment.PaymentType.TRY_TAP_TO_PAY
+import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Payment.PaymentType.WOO_POS
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Refund
+import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.WooPosConnection
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderType.BUILT_IN
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderType.EXTERNAL
 import com.woocommerce.android.ui.payments.cardreader.payment.CardReaderPaymentCollectibilityChecker
@@ -86,6 +88,9 @@ class SelectPaymentMethodViewModel @Inject constructor(
     private val cardReaderPaymentFlowParam
         get() = navArgs.cardReaderFlowParam as Payment
 
+    val displayUi: Boolean
+        get() = isWooPOSPaymentFlow()
+
     init {
         checkStatus()
         if (FeatureFlag.OTHER_PAYMENT_METHODS.isEnabled()) {
@@ -100,7 +105,6 @@ class SelectPaymentMethodViewModel @Inject constructor(
                 when (param) {
                     is Payment -> {
                         launch {
-                            // stay on screen
                             cardReaderTrackingInfoKeeper.setCountry(
                                 wooCommerceStore.getStoreCountryCode(selectedSite.get())
                             )
@@ -112,14 +116,19 @@ class SelectPaymentMethodViewModel @Inject constructor(
                                 cardReaderTrackingInfoKeeper.setCurrency(order.currency)
                             }
 
-                            showPaymentState()
+                            when (param.paymentType) {
+                                SIMPLE, ORDER, ORDER_CREATION, TRY_TAP_TO_PAY -> showPaymentState()
+                                WOO_POS -> onBtReaderClicked()
+                            }
                         }
                         Unit
                     }
 
                     is Refund -> triggerEvent(NavigateToCardReaderRefundFlow(param, EXTERNAL))
                 }
             }
+
+            is WooPosConnection -> error("Unsupported card reader flow param: $param")
         }
     }
 
@@ -247,6 +256,7 @@ class SelectPaymentMethodViewModel @Inject constructor(
                 val messageIdForPaymentType = when (cardReaderPaymentFlowParam.paymentType) {
                     SIMPLE, TRY_TAP_TO_PAY -> R.string.simple_payments_cash_dlg_message
                     ORDER, ORDER_CREATION -> R.string.existing_order_cash_dlg_message
+                    WOO_POS -> error("Unsupported card reader flow param: $cardReaderPaymentFlowParam")
                 }
                 triggerEvent(
                     MultiLiveEvent.Event.ShowDialog(
@@ -446,6 +456,7 @@ class SelectPaymentMethodViewModel @Inject constructor(
                 SIMPLE -> NavigateBackToHub(CardReadersHub())
                 TRY_TAP_TO_PAY -> NavigateToTapToPaySummary(order.first())
                 ORDER, ORDER_CREATION -> NavigateBackToOrderList(order.first())
+                WOO_POS -> ReturnResultToWooPos
             }
         )
     }
@@ -455,7 +466,8 @@ class SelectPaymentMethodViewModel @Inject constructor(
             SIMPLE -> AnalyticsTracker.VALUE_SIMPLE_PAYMENTS_FLOW
             ORDER -> AnalyticsTracker.VALUE_ORDER_PAYMENTS_FLOW
             TRY_TAP_TO_PAY -> AnalyticsTracker.VALUE_TTP_TRY_PAYMENT_FLOW
-            Payment.PaymentType.ORDER_CREATION -> AnalyticsTracker.VALUE_ORDER_CREATION_PAYMENTS_FLOW
+            ORDER_CREATION -> AnalyticsTracker.VALUE_ORDER_CREATION_PAYMENTS_FLOW
+            WOO_POS -> AnalyticsTracker.VALUE_WOO_POS_PAYMENTS_FLOW
         }
 
     private fun onLearnMoreIppClicked() {
@@ -474,6 +486,12 @@ class SelectPaymentMethodViewModel @Inject constructor(
         return currencyFormatter.formatCurrency(total, currencyCode)
     }
 
+    private fun isWooPOSPaymentFlow() = if (navArgs.cardReaderFlowParam is Payment) {
+        (navArgs.cardReaderFlowParam as Payment).paymentType != WOO_POS
+    } else {
+        true
+    }
+
     companion object {
         private const val DELAY_MS = 1L
         const val UTM_CAMPAIGN = "feature_announcement_card"