[POS][Custom payment UI] – Switch to Payment Controller in POS Totals | Base PR

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

@@ -256,10 +256,10 @@ class CardReaderConnectDialogFragment : PaymentsBaseDialogFragment(R.layout.card
                         result = event.data as Boolean,
                     )
                 }
-                is CardReaderConnectEvent.PopBackStackForWooPOS -> {
+                is CardReaderConnectEvent.ReturnToWooPos -> {
                     parentFragmentManager.setFragmentResult(
-                        WooPosCardReaderActivity.WOO_POS_CARD_CONNECTION_REQUEST_KEY,
-                        Bundle(),
+                        WooPosCardReaderActivity.WOO_POS_CARD_PAYMENT_REQUEST_KEY,
+                        Bundle()
                     )
                 }
                 is CardReaderConnectEvent.ShowToast ->

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

@@ -47,5 +47,5 @@ sealed class CardReaderConnectEvent : MultiLiveEvent.Event() {
 
     data class OpenGenericWebView(val url: String) : CardReaderConnectEvent()
 
-    data object PopBackStackForWooPOS : CardReaderConnectEvent()
+    data object ReturnToWooPos : MultiLiveEvent.Event()
 }

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

@@ -35,10 +35,10 @@ 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
+import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.ReturnToWooPos
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.ShowCardReaderTutorial
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.ShowToast
 import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectEvent.ShowToastString
@@ -59,9 +59,7 @@ import com.woocommerce.android.ui.payments.cardreader.connect.CardReaderConnectV
 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.CardReaderFlowParam.CardReadersHub
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Payment
-import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Refund
 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
@@ -527,25 +525,23 @@ class CardReaderConnectViewModel @Inject constructor(
     }
 
     private fun exitFlow(connected: Boolean) {
-        if (!connected) {
-            when (val param = arguments.cardReaderFlowParam) {
-                is CardReadersHub, is Refund -> triggerEvent(ExitWithResult(false))
-                is Payment -> {
-                    if (param.paymentType == Payment.PaymentType.WOO_POS) {
-                        returnToWooPos()
-                    } else {
-                        triggerEvent(ExitWithResult(false))
-                    }
-                }
-                CardReaderFlowParam.WooPosConnection -> returnToWooPos()
-            }
+        val param = arguments.cardReaderFlowParam
+        if (param is CardReaderFlowParam.WooPosConnection) {
+            returnToWooPos()
+        } else if (!connected) {
+            triggerEvent(ExitWithResult(false))
         } else {
-            triggerEvent(ShowCardReaderTutorial(arguments.cardReaderFlowParam, arguments.cardReaderType))
+            triggerEvent(
+                ShowCardReaderTutorial(
+                    arguments.cardReaderFlowParam,
+                    arguments.cardReaderType
+                )
+            )
         }
     }
 
     private fun returnToWooPos() {
-        triggerEvent(PopBackStackForWooPOS)
+        triggerEvent(ReturnToWooPos)
     }
 
     private fun storeConnectedReader(cardReader: CardReader) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/payment/controller/CardReaderPaymentController.kt

@@ -123,10 +123,6 @@ class CardReaderPaymentController(
 
     private var refetchOrderJob: Job? = null
 
-    private val CardReaderFlowParam.PaymentOrRefund.isPOS: Boolean
-        get() = this is CardReaderFlowParam.PaymentOrRefund.Payment &&
-            this.paymentType == CardReaderFlowParam.PaymentOrRefund.Payment.PaymentType.WOO_POS
-
     private val _event: MutableSharedFlow<CardReaderPaymentEvent> = MutableSharedFlow()
     val event: Flow<CardReaderPaymentEvent> = _event
 
@@ -459,20 +455,10 @@ class CardReaderPaymentController(
     ) {
         paymentReceiptHelper.storeReceiptUrl(orderId, paymentStatus.receiptUrl)
         appPrefs.setCardReaderSuccessfulPaymentTime()
-        if (paymentOrRefund.isPOS) {
-            scope.launch {
-                syncOrderStatus(orderId)
-                triggerEvent(CardReaderPaymentEvent.Exit)
-            }
-        } else {
-            triggerEvent(CardReaderPaymentEvent.PlaySuccessfulPaymentSound)
-            showPaymentSuccessfulState()
-            reFetchOrder()
-        }
-    }
 
-    private suspend fun syncOrderStatus(orderId: Long) {
-        orderRepository.fetchOrderById(orderId)
+        triggerEvent(CardReaderPaymentEvent.PlaySuccessfulPaymentSound)
+        showPaymentSuccessfulState()
+        reFetchOrder()
     }
 
     @VisibleForTesting

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

@@ -8,6 +8,8 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.payments.PaymentsBaseDialogFragment
+import com.woocommerce.android.ui.payments.cardreader.statuschecker.CardReaderStatusCheckerViewModel.StatusCheckerEvent.ReturnToWooPos
+import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -66,6 +68,12 @@ class CardReaderStatusCheckerDialogFragment : PaymentsBaseDialogFragment(R.layou
                                 )
                         )
                 }
+                is ReturnToWooPos -> {
+                    parentFragmentManager.setFragmentResult(
+                        WooPosCardReaderActivity.WOO_POS_CARD_PAYMENT_REQUEST_KEY,
+                        Bundle()
+                    )
+                }
                 else -> event.isHandled = false
             }
         }

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

@@ -8,13 +8,15 @@ import com.woocommerce.android.cardreader.connection.CardReader
 import com.woocommerce.android.cardreader.connection.CardReaderStatus.Connected
 import com.woocommerce.android.cardreader.connection.ReaderType
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam
+import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderFlowParam.PaymentOrRefund.Payment
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingChecker
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingParams
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderOnboardingState
 import com.woocommerce.android.ui.payments.cardreader.onboarding.CardReaderType
 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.statuschecker.CardReaderStatusCheckerViewModel.StatusCheckerEvent.NavigateToConnection
+import com.woocommerce.android.ui.payments.cardreader.statuschecker.CardReaderStatusCheckerViewModel.StatusCheckerEvent.ReturnToWooPos
 import com.woocommerce.android.ui.payments.tracking.PaymentsFlowTracker
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
@@ -38,12 +40,17 @@ class CardReaderStatusCheckerViewModel
     override val _event = SingleLiveEvent<MultiLiveEvent.Event>()
     override val event: LiveData<MultiLiveEvent.Event> = _event
 
+    private val CardReaderFlowParam.isPOS: Boolean
+        get() = this is Payment && paymentType == Payment.PaymentType.WOO_POS ||
+            this is CardReaderFlowParam.WooPosConnection
+
     init {
         launch {
             checkStatus()
         }
     }
 
+    @Suppress("NestedBlockDepth")
     private suspend fun checkStatus() {
         when (val param = arguments.cardReaderFlowParam) {
             is CardReaderFlowParam.CardReadersHub -> triggerEvent(
@@ -58,12 +65,16 @@ class CardReaderStatusCheckerViewModel
                     if (cardReaderStatus.cardReader.toCardReaderType() != arguments.cardReaderType) {
                         handleNotSelectedReaderTypeConnected(param)
                     } else {
-                        triggerEvent(
-                            StatusCheckerEvent.NavigateToPayment(
-                                param,
-                                cardReaderStatus.cardReader.toCardReaderType()
+                        if (param.isPOS) {
+                            triggerEvent(ReturnToWooPos)
+                        } else {
+                            triggerEvent(
+                                StatusCheckerEvent.NavigateToPayment(
+                                    param,
+                                    cardReaderStatus.cardReader.toCardReaderType()
+                                )
                             )
-                        )
+                        }
                     }
                 } else {
                     handleOnboardingStatus(param)
@@ -127,5 +138,7 @@ class CardReaderStatusCheckerViewModel
             val cardReaderOnboardingParams: CardReaderOnboardingParams,
             val cardReaderType: CardReaderType,
         ) : MultiLiveEvent.Event()
+
+        data object ReturnToWooPos : MultiLiveEvent.Event()
     }
 }

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

@@ -15,7 +15,6 @@ 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
 
@@ -60,12 +59,7 @@ class CardReaderTutorialDialogFragment : PaymentsBaseDialogFragment(R.layout.car
     private fun navigateNext() {
         when (val param = args.cardReaderFlowParam) {
             is CardReaderFlowParam.CardReadersHub -> findNavController().popBackStack()
-            is CardReaderFlowParam.WooPosConnection -> {
-                parentFragmentManager.setFragmentResult(
-                    WooPosCardReaderActivity.WOO_POS_CARD_CONNECTION_REQUEST_KEY,
-                    Bundle(),
-                )
-            }
+            is CardReaderFlowParam.WooPosConnection -> error("Not supported param: $param")
             is CardReaderFlowParam.PaymentOrRefund -> {
                 val action = CardReaderTutorialDialogFragmentDirections
                     .actionCardReaderTutorialDialogFragmentToCardReaderPaymentDialogFragment(param, args.cardReaderType)

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

@@ -23,11 +23,6 @@ data class NavigateToCardReaderPaymentFlow(
     val cardReaderType: CardReaderType
 ) : MultiLiveEvent.Event()
 
-data class SkipScreenInPosAndNavigateToCardReaderPaymentFlow(
-    val cardReaderFlowParam: CardReaderFlowParam.PaymentOrRefund.Payment,
-    val cardReaderType: CardReaderType
-) : MultiLiveEvent.Event()
-
 data class NavigateToCardReaderRefundFlow(
     val cardReaderFlowParam: CardReaderFlowParam.PaymentOrRefund.Refund,
     val cardReaderType: CardReaderType

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

@@ -35,7 +35,6 @@ import com.woocommerce.android.ui.payments.methodselection.SelectPaymentMethodVi
 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.WooPosCardReaderPaymentStatus
 import com.woocommerce.android.util.ChromeCustomTabUtils
 import com.woocommerce.android.util.UiHelpers
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowDialog
@@ -209,18 +208,6 @@ class SelectPaymentMethodFragment : BaseFragment(R.layout.fragment_select_paymen
                     findNavController().navigate(action)
                 }
 
-                is SkipScreenInPosAndNavigateToCardReaderPaymentFlow -> {
-                    if (findNavController().currentDestination?.id == R.id.selectPaymentMethodFragment) {
-                        findNavController().navigate(
-                            SelectPaymentMethodFragmentDirections
-                                .actionSelectPaymentMethodFragmentToCardReaderPaymentFlow(
-                                    event.cardReaderFlowParam,
-                                    event.cardReaderType
-                                )
-                        )
-                    }
-                }
-
                 is NavigateToCardReaderHubFlow -> {
                     val action =
                         SelectPaymentMethodFragmentDirections.actionSelectPaymentMethodFragmentToCardReaderHubFlow(
@@ -293,24 +280,13 @@ 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,
-                                event.asWooPosCardReaderPaymentResult(),
-                            )
-                        }
+                        Bundle()
                     )
                 }
             }
         }
     }
 
-    private fun ReturnResultToWooPos.asWooPosCardReaderPaymentResult() =
-        when (this) {
-            is ReturnResultToWooPos.Success -> WooPosCardReaderPaymentStatus.Success
-            else -> WooPosCardReaderPaymentStatus.Failure
-        }
-
     private fun setupResultHandlers() {
         handleDialogResult<Boolean>(
             key = CardReaderConnectDialogFragment.KEY_CONNECT_TO_READER_RESULT,

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

@@ -120,7 +120,7 @@ class SelectPaymentMethodViewModel @Inject constructor(
 
                             when (param.paymentType) {
                                 SIMPLE, ORDER, ORDER_CREATION, TRY_TAP_TO_PAY -> showPaymentState()
-                                WOO_POS -> skipScreenDuringPosFlow()
+                                WOO_POS -> error("Unsupported card reader flow param: $param")
                             }
                         }
                         Unit
@@ -306,10 +306,6 @@ class SelectPaymentMethodViewModel @Inject constructor(
         }
     }
 
-    private fun skipScreenDuringPosFlow() {
-        triggerEvent(SkipScreenInPosAndNavigateToCardReaderPaymentFlow(cardReaderPaymentFlowParam, EXTERNAL))
-    }
-
     fun onTapToPayClicked() {
         launch {
             trackPaymentMethodSelection(VALUE_SIMPLE_PAYMENTS_COLLECT_CARD, VALUE_CARD_READER_TYPE_BUILT_IN)
@@ -325,6 +321,10 @@ class SelectPaymentMethodViewModel @Inject constructor(
                 flow = cardReaderPaymentFlowParam.toAnalyticsFlowName(),
             )
         }
+        if (cardReaderPaymentFlowParam.paymentType == WOO_POS) {
+            val result = if (connected) ReturnResultToWooPos.Success else ReturnResultToWooPos.Failure
+            triggerEvent(result)
+        }
     }
 
     fun onCardReaderPaymentCompleted() {
@@ -342,19 +342,10 @@ class SelectPaymentMethodViewModel @Inject constructor(
                     source = AnalyticsTracker.VALUE_SIMPLE_PAYMENTS_SOURCE_PAYMENT_METHOD,
                     flow = cardReaderPaymentFlowParam.toAnalyticsFlowName(),
                 )
-                handleWooPosPaymentFailure()
             }
         }
     }
 
-    private fun handleWooPosPaymentFailure() {
-        // In case payment was initiated from the Woo POS mode, we need to propagate the payment
-        // result back, to close the SelectPaymentMethodFragment and handle failure on the Woo POS end.
-        if (cardReaderPaymentFlowParam.paymentType == WOO_POS) {
-            triggerEvent(ReturnResultToWooPos.Failure)
-        }
-    }
-
     fun onScanToPayClicked() {
         launch {
             trackPaymentMethodSelection(AnalyticsTracker.VALUE_SCAN_TO_PAY_PAYMENT_FLOW)
@@ -478,7 +469,7 @@ class SelectPaymentMethodViewModel @Inject constructor(
                 SIMPLE -> NavigateBackToHub(CardReadersHub())
                 TRY_TAP_TO_PAY -> NavigateToTapToPaySummary(order.first())
                 ORDER, ORDER_CREATION -> NavigateBackToOrderList(order.first())
-                WOO_POS -> ReturnResultToWooPos.Success
+                WOO_POS -> error("Woo POS is expected to use CardReaderPaymentController directly")
             }
         )
     }