[Woo POS] Show cash payment button for more card payment states (#15160)

Author: staskus

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -89,8 +89,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .sendReceiptsForPointOfSale:
             return true
-        case .acceptCashForPointOfSale:
-            return true
         case .hideSitesInStorePicker:
             return true
         case .filterHistoryOnOrderAndProductLists:

Experiments/Experiments/FeatureFlag.swift

@@ -193,10 +193,6 @@ public enum FeatureFlag: Int {
     ///
     case sendReceiptsForPointOfSale
 
-    /// Adds support for  accepting cash as payment for POS
-    ///
-    case acceptCashForPointOfSale
-
     /// Supports hiding sites from the store picker
     ///
     case hideSitesInStorePicker

WooCommerce/Classes/POS/Presentation/Card Present Payments/Reader Messages/PointOfSaleCardPresentPaymentDisconnectedMessageViewModel.swift

@@ -1,12 +1,10 @@
 import Foundation
 
 struct PointOfSaleCardPresentPaymentReaderDisconnectedMessageViewModel {
-    let isPOSCashEnabled = ServiceLocator.featureFlagService.isFeatureFlagEnabled(.acceptCashForPointOfSale)
-
     let title = Localization.title
     let connectReaderButtonTitle = Localization.collectPayment
     var instruction: String {
-        isPOSCashEnabled ? Localization.instruction : Localization.cardOnlyInstruction
+        Localization.instruction
     }
 }
 
@@ -18,12 +16,6 @@ private extension PointOfSaleCardPresentPaymentReaderDisconnectedMessageViewMode
             comment: "Error message. Presented to users when card reader is not connected on the Point of Sale Checkout"
         )
 
-        static let cardOnlyInstruction = NSLocalizedString(
-            "pointOfSale.cardPresent.readerNotConnected.instruction",
-            value: "To process this payment, please connect your reader.",
-            comment: "Instruction to merchants shown on the Point of Sale Checkout, so they can take a card payment."
-        )
-
         static let instruction = NSLocalizedString(
             "pointOfSale.cardPresent.readerNotConnectedOrCash.instruction",
             value: "To process this payment, please connect your reader or choose cash.",

WooCommerce/Classes/POS/ViewHelpers/TotalsViewHelper.swift

@@ -42,8 +42,20 @@ final class TotalsViewHelper {
 
     func shouldShowCollectCashPaymentButton(orderState: PointOfSaleOrderState,
                                             paymentState: PointOfSalePaymentState) -> Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.acceptCashForPointOfSale) &&
-        orderState != .syncing &&
-        (paymentState == .card(.idle) || paymentState == .card(.acceptingCard) || paymentState == .card(.validatingOrderError))
+        guard orderState != .syncing,
+              case .card(let cardState) = paymentState else {
+            return false
+        }
+
+        switch cardState {
+        case .idle,
+             .validatingOrder,
+             .validatingOrderError,
+             .preparingReader,
+             .acceptingCard:
+            return true
+        default:
+            return false
+        }
     }
 }

WooCommerce/WooCommerceTests/POS/ViewHelpers/TotalsViewHelperTests.swift

@@ -46,4 +46,32 @@ struct TotalsViewHelperTests {
                                                                      paymentState: paymentState) == false)
     }
 
+    @Test(arguments: [
+        (PointOfSaleOrderState.idle, PointOfSalePaymentState.card(.idle)),
+        (PointOfSaleOrderState.idle, PointOfSalePaymentState.card(.validatingOrder)),
+        (PointOfSaleOrderState.idle, PointOfSalePaymentState.card(.validatingOrderError)),
+        (PointOfSaleOrderState.idle, PointOfSalePaymentState.card(.preparingReader)),
+        (PointOfSaleOrderState.idle, PointOfSalePaymentState.card(.acceptingCard))
+    ])
+    func test_shouldShowCollectCashPaymentButton_returns_true_for_supported_states(
+        orderState: PointOfSaleOrderState,
+        paymentState: PointOfSalePaymentState) {
+            #expect(TotalsViewHelper().shouldShowCollectCashPaymentButton(orderState: orderState,
+                                                                         paymentState: paymentState))
+    }
+
+
+    @Test(arguments: [
+        (PointOfSaleOrderState.syncing, PointOfSalePaymentState.card(.idle)),
+        (PointOfSaleOrderState.syncing, PointOfSalePaymentState.card(.validatingOrder)),
+        (PointOfSaleOrderState.syncing, PointOfSalePaymentState.card(.validatingOrderError)),
+        (PointOfSaleOrderState.syncing, PointOfSalePaymentState.card(.preparingReader)),
+        (PointOfSaleOrderState.syncing, PointOfSalePaymentState.card(.acceptingCard))
+    ])
+    func test_shouldShowCollectCashPaymentButton_returns_false_when_order_syncing(
+        orderState: PointOfSaleOrderState,
+        paymentState: PointOfSalePaymentState) {
+            #expect(TotalsViewHelper().shouldShowCollectCashPaymentButton(orderState: orderState,
+                                                                         paymentState: paymentState) == false)
+    }
 }