Merge branch 'trunk' into woomob-619-xcode-warnings-performing-io-on-the-main-thread-can-cause

Author: itsmeichigo

RELEASE-NOTES.txt

@@ -7,6 +7,7 @@
 - [*] Fix initialization of authenticator to avoid crashes during login [https://github.com/woocommerce/woocommerce-ios/pull/15953]
 - [*] Shipping Labels: Made HS tariff number field required in customs form for EU destinations [https://github.com/woocommerce/woocommerce-ios/pull/15946]
 - [*] Order Details: Attempt to improve performance by using a simplified version of product objects. [https://github.com/woocommerce/woocommerce-ios/pull/15959]
+- [*] Order Creation: Prevent subscription products to be added to an order [https://github.com/woocommerce/woocommerce-ios/pull/15960]
 - [internal] Replace COTS_DEVICE reader model name with TAP_TO_PAY_DEVICE. [https://github.com/woocommerce/woocommerce-ios/pull/15961]
 
 22.9

WooCommerce/Classes/POS/Models/Cart+BarcodeScanError.swift

@@ -121,9 +121,9 @@ extension PointOfSaleBarcodeScanError {
         )
 
         static let incompleteScan = NSLocalizedString(
-            "pointOfSale.barcodeScan.error.incompleteScan",
-            value: "Partial barcode scan",
-            comment: "Error message shown when scan is incomplete."
+            "pointOfSale.barcodeScan.error.incompleteScan.2",
+            value: "The scanner did not send an end-of-line character",
+            comment: "Error message shown when scanner times out without sending end-of-line character."
         )
 
         static let parsingError = NSLocalizedString(

WooCommerce/Classes/POS/Presentation/Barcode Scanning/GameControllerBarcodeParser.swift

@@ -15,6 +15,7 @@ final class GameControllerBarcodeParser {
     private var buffer = ""
     private var lastKeyPressTime: Date?
     private var scanStartTime: Date?
+    private var timeoutTimer: Timer?
 
     init(configuration: HIDBarcodeParserConfiguration,
          onScan: @escaping (HIDBarcodeParserResult) -> Void,
@@ -49,6 +50,7 @@ final class GameControllerBarcodeParser {
             }
 
             buffer.append(character)
+            scheduleTimeoutTimer()
         }
     }
 
@@ -186,6 +188,31 @@ final class GameControllerBarcodeParser {
         buffer = ""
         lastKeyPressTime = nil
         scanStartTime = nil
+        cancelTimeoutTimer()
+    }
+
+    private func scheduleTimeoutTimer() {
+        cancelTimeoutTimer()
+        timeoutTimer = timeProvider.scheduleTimer(
+            timeInterval: configuration.maximumInterCharacterTime,
+            target: self,
+            selector: #selector(handleTimeoutExpiry)
+        )
+    }
+
+    private func cancelTimeoutTimer() {
+        timeoutTimer?.invalidate()
+        timeoutTimer = nil
+    }
+
+    @objc private func handleTimeoutExpiry() {
+        guard !buffer.isEmpty else { return }
+
+        let scanDurationMs = calculateScanDurationMs()
+        let result = HIDBarcodeParserResult.failure(error: HIDBarcodeParserError.timedOut(barcode: buffer), scanDurationMs: scanDurationMs)
+
+        onScan(result)
+        resetScan()
     }
 
     private func calculateScanDurationMs() -> Int {
@@ -194,6 +221,7 @@ final class GameControllerBarcodeParser {
     }
 
     private func processScan() {
+        cancelTimeoutTimer()
         checkForTimeoutBetweenKeystrokes()
         let scanDurationMs = calculateScanDurationMs()
 

WooCommerce/Classes/POS/Presentation/Barcode Scanning/TimeProvider.swift

@@ -2,10 +2,15 @@ import Foundation
 
 protocol TimeProvider {
     func now() -> Date
+    func scheduleTimer(timeInterval: TimeInterval, target: Any, selector: Selector) -> Timer
 }
 
 struct DefaultTimeProvider: TimeProvider {
     func now() -> Date {
         Date()
     }
+
+    func scheduleTimer(timeInterval: TimeInterval, target: Any, selector: Selector) -> Timer {
+        return Timer.scheduledTimer(timeInterval: timeInterval, target: target, selector: selector, userInfo: nil, repeats: false)
+    }
 }

WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorView.swift

@@ -216,16 +216,21 @@ struct ProductSelectorView: View {
                 ProductRow(multipleSelectionsEnabled: true,
                            viewModel: rowViewModel,
                            onCheckboxSelected: {
-                    viewModel.variationCheckboxTapped(for: rowViewModel.productOrVariationID)
+                    if rowViewModel.selectionEnabled {
+                        viewModel.variationCheckboxTapped(for: rowViewModel.productOrVariationID)
+                    }
                 })
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .onTapGesture {
-                    viewModel.variationRowTapped(for: rowViewModel.productOrVariationID)
+                    if rowViewModel.selectionEnabled {
+                        viewModel.variationRowTapped(for: rowViewModel.productOrVariationID)
+                    }
                 }
                 .redacted(reason: viewModel.showPlaceholders ? .placeholder : [])
                 .disabled(viewModel.selectionDisabled)
 
                 DisclosureIndicator()
+                    .renderedIf(rowViewModel.selectionEnabled)
             }
             .accessibilityHint(configuration.variableProductRowAccessibilityHint)
         } else {

WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorViewModel.swift

@@ -848,6 +848,8 @@ private extension ProductSelectorViewModel {
                 switch (source, product.productType, product.variations) {
                 case (.orderForm, .booking, _):
                     return .unsupported(reason: Localization.bookableProductUnsupportedReason)
+                case (.orderForm, .subscription, _), (.orderForm, .variableSubscription, _):
+                    return .unsupported(reason: Localization.subscriptionProductUnsupportedReason)
                 case (_, _, let variations) where variations.isEmpty:
                     return selectedItemsIDs.contains(product.productID) ? .selected : .notSelected
                 default:
@@ -981,6 +983,11 @@ private extension ProductSelectorViewModel {
             value: "Bookable products are not supported for order creation",
             comment: "Message explaining unsupported bookable products for order creation"
         )
+        static let subscriptionProductUnsupportedReason = NSLocalizedString(
+            "productSelectorViewModel.subscriptionProductUnsupportedReason",
+            value: "Subscription products are not supported for order creation",
+            comment: "Message explaining unsupported subscription products for order creation"
+        )
     }
 }