Show cash payment button for more order preparation and card payment states

Author: staskus

WooCommerce/Classes/POS/ViewHelpers/TotalsViewHelper.swift

@@ -42,7 +42,20 @@ final class TotalsViewHelper {
 
     func shouldShowCollectCashPaymentButton(orderState: PointOfSaleOrderState,
                                             paymentState: PointOfSalePaymentState) -> Bool {
-        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)
+    }
 }