[Woo POS - payments onboarding] Enable POS for stores with incomplete payments onboarding

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -86,6 +86,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .favoriteProducts:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .paymentsOnboardingInPointOfSale:
+            return buildConfig == .localDeveloper
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -188,4 +188,8 @@ public enum FeatureFlag: Int {
     /// Allows marking product as favorite
     ///
     case favoriteProducts
+
+    /// Supports Woo Payments onboarding in POS so that merchants who have not completed onboarding can access POS.
+    ///
+    case paymentsOnboardingInPointOfSale
 }

WooCommerce/Classes/POS/ViewModels/TotalsViewModel.swift

@@ -20,7 +20,6 @@ final class TotalsViewModel: ObservableObject, TotalsViewModelProtocol {
         case cardPaymentSuccessful
     }
 
-    @Published private(set) var cardPresentPaymentEvent: CardPresentPaymentEvent = .idle
     @Published var cardPresentPaymentAlertViewModel: PointOfSaleCardPresentPaymentAlertType?
     @Published private(set) var cardPresentPaymentInlineMessage: PointOfSaleCardPresentPaymentMessageType?
     @Published private(set) var isShowingCardReaderStatus: Bool = false
@@ -88,7 +87,6 @@ final class TotalsViewModel: ObservableObject, TotalsViewModelProtocol {
     var orderStatePublisher: Published<OrderState>.Publisher { $orderState }
     var paymentStatePublisher: Published<PaymentState>.Publisher { $paymentState }
     private var cardPresentPaymentAlertViewModelPublisher: Published<PointOfSaleCardPresentPaymentAlertType?>.Publisher { $cardPresentPaymentAlertViewModel }
-    private var cardPresentPaymentEventPublisher: Published<CardPresentPaymentEvent>.Publisher { $cardPresentPaymentEvent }
     private var connectionStatusPublisher: Published<CardPresentPaymentReaderConnectionStatus>.Publisher { $connectionStatus }
     private var formattedCartTotalPricePublisher: Published<String?>.Publisher { $formattedCartTotalPrice }
     private var formattedOrderTotalPricePublisher: Published<String?>.Publisher { $formattedOrderTotalPrice }
@@ -313,8 +311,6 @@ private extension TotalsViewModel {
     }
 
     func observeCardPresentPaymentEvents() {
-        cardPresentPaymentService.paymentEventPublisher.assign(to: &$cardPresentPaymentEvent)
-
         cardPresentPaymentService.paymentEventPublisher
             .map { [weak self] event -> PointOfSaleCardPresentPaymentAlertType? in
                 guard let self else { return nil }

WooCommerce/Classes/POS/ViewModels/TotalsViewModelProtocol.swift

@@ -4,7 +4,6 @@ import protocol Yosemite.POSItem
 
 protocol TotalsViewModelProtocol {
     var paymentState: TotalsViewModel.PaymentState { get }
-    var cardPresentPaymentEvent: CardPresentPaymentEvent { get }
     var connectionStatus: CardPresentPaymentReaderConnectionStatus { get }
 
     var orderStatePublisher: Published<TotalsViewModel.OrderState>.Publisher { get }

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/CardPresentPaymentsOnboardingViewController.swift

@@ -32,7 +32,6 @@ final class CardPresentPaymentsOnboardingViewController: UIHostingController<Car
 
 struct CardPresentPaymentsOnboardingView: View {
     @StateObject var viewModel: CardPresentPaymentsOnboardingViewModel
-    var shouldShowMenuOnCompletion: Bool = true
 
     var body: some View {
         Group {

WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSEligibilityChecker.swift

@@ -24,8 +24,13 @@ final class POSEligibilityChecker: POSEligibilityCheckerProtocol {
                 .eraseToAnyPublisher()
         }
 
-        return Publishers.CombineLatest3(isOnboardingComplete, isWooCommerceVersionSupported, isPointOfSaleFeatureFlagEnabled)
-            .map { $0 && $1 && $2 }
+        guard featureFlagService.isFeatureFlagEnabled(.paymentsOnboardingInPointOfSale) else {
+            return Publishers.CombineLatest3(isOnboardingComplete, isWooCommerceVersionSupported, isPointOfSaleFeatureFlagEnabled)
+                .map { $0 && $1 && $2 }
+                .eraseToAnyPublisher()
+        }
+        return Publishers.CombineLatest(isWooCommerceVersionSupported, isPointOfSaleFeatureFlagEnabled)
+            .map { $0 && $1 }
             .eraseToAnyPublisher()
     }
 

WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

@@ -22,6 +22,7 @@ struct MockFeatureFlagService: FeatureFlagService {
     private let revampedShippingLabelCreation: Bool
     private let viewEditCustomFieldsInProductsAndOrders: Bool
     private let favoriteProducts: Bool
+    private let paymentsOnboardingInPointOfSale: Bool
 
     init(isInboxOn: Bool = false,
          isShowInboxCTAEnabled: Bool = false,
@@ -42,7 +43,8 @@ struct MockFeatureFlagService: FeatureFlagService {
          blazeCampaignObjective: Bool = false,
          revampedShippingLabelCreation: Bool = false,
          viewEditCustomFieldsInProductsAndOrders: Bool = false,
-         favoriteProducts: Bool = false) {
+         favoriteProducts: Bool = false,
+         paymentsOnboardingInPointOfSale: Bool = false) {
         self.isInboxOn = isInboxOn
         self.isShowInboxCTAEnabled = isShowInboxCTAEnabled
         self.isUpdateOrderOptimisticallyOn = isUpdateOrderOptimisticallyOn
@@ -63,6 +65,7 @@ struct MockFeatureFlagService: FeatureFlagService {
         self.revampedShippingLabelCreation = revampedShippingLabelCreation
         self.viewEditCustomFieldsInProductsAndOrders = viewEditCustomFieldsInProductsAndOrders
         self.favoriteProducts = favoriteProducts
+        self.paymentsOnboardingInPointOfSale = paymentsOnboardingInPointOfSale
     }
 
     func isFeatureFlagEnabled(_ featureFlag: FeatureFlag) -> Bool {
@@ -107,6 +110,8 @@ struct MockFeatureFlagService: FeatureFlagService {
             return viewEditCustomFieldsInProductsAndOrders
         case .favoriteProducts:
             return favoriteProducts
+        case .paymentsOnboardingInPointOfSale:
+            return paymentsOnboardingInPointOfSale
         default:
             return false
         }

WooCommerce/WooCommerceTests/ViewRelated/Settings/POS/POSEligibilityCheckerTests.swift

@@ -192,6 +192,26 @@ final class POSEligibilityCheckerTests: XCTestCase {
         XCTAssertFalse(isEligible)
     }
 
+    func test_is_eligible_when_onboarding_state_is_not_completed_and_onboarding_feature_enabled_then_returns_true() throws {
+        // Given
+        let featureFlagService = MockFeatureFlagService(isPointOfSaleEnabled: true, paymentsOnboardingInPointOfSale: true)
+        setupCountry(country: .us)
+        accountWhitelistedInBackend(true)
+        let checker = POSEligibilityChecker(userInterfaceIdiom: .pad,
+                                            cardPresentPaymentsOnboarding: onboardingUseCase,
+                                            siteSettings: siteSettings,
+                                            currencySettings: Fixtures.usdCurrencySettings,
+                                            stores: stores,
+                                            featureFlagService: featureFlagService)
+        checker.isEligible.assign(to: &$isEligible)
+
+        // When
+        onboardingUseCase.state = .pluginNotInstalled
+
+        // Then
+        XCTAssertTrue(isEligible)
+    }
+
     func test_is_eligible_when_WooCommerce_version_is_below_6_6_then_returns_false() throws {
         // Given
         let featureFlagService = MockFeatureFlagService(isPointOfSaleEnabled: true)